bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev

This commit is contained in:
FrancisHu 2024-03-04 17:23:35 +08:00
parent c296fc3bbd 5ef155faaa
commit e066ccce92
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sgzb-ui/src/views/base/section/index.vue
View File

@ -150,8 +150,7 @@
<el-form-item label="标段工程名称" prop="lotName"> <el-form-item label="标段工程名称" prop="lotName">
<el-input v-model="form.lotName" placeholder="请输入标段工程名称" /> <el-input v-model="form.lotName" placeholder="请输入标段工程名称" />
</el-form-item> </el-form-item>
<el-form-item label="所属工程项目" prop="ownPro"> <!-- <el-form-item label="所属工程项目" prop="ownPro">
<!-- <el-input v-model="form.ownPro" placeholder="请输入所属工程项目" /> -->
<el-select <el-select
v-model="form.ownPro" filterable v-model="form.ownPro" filterable
placeholder="请选择所属工程项目" placeholder="请选择所属工程项目"
@ -165,7 +164,7 @@
v-if="item.status != '1'" v-if="item.status != '1'"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="工程类型" prop="typeId"> <el-form-item label="工程类型" prop="typeId">
<!-- <el-input v-model="form.typeId" placeholder="请选择工程类型" /> --> <!-- <el-input v-model="form.typeId" placeholder="请选择工程类型" /> -->
<el-select <el-select

8
sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
View File

@ -572,11 +572,11 @@ export default {
checkNum(row){ checkNum(row){
if(row.preNum>=0){ if(row.preNum>=0){
if(row.preNum>=row.num){ // if(row.preNum>=row.num){
row.preNum = row.num // row.preNum = row.num
}else{ // }else{
row.preNum = row.preNum row.preNum = row.preNum
} // }
}else{ }else{
row.preNum = 0 row.preNum = 0
} }