Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
liang.chao 2024-04-12 17:22:01 +08:00
commit eafbcb5640
2 changed files with 11 additions and 5 deletions

View File

@ -957,6 +957,7 @@
/** 工地直转--打开弹窗 */
handleAdd() {
this.resetForm('dialogForm')
this.dialogParams = {}
this.deviceList = []
this.open = true
this.title = '工地直转'
@ -965,7 +966,7 @@
//
handleSelectionChange(selection) {
this.selectedList = selection.map((item) => item)
console.log(this.selectedList)
// console.log(this.selectedList)
this.single = selection.length != 1
this.multiple = !selection.length
},

View File

@ -776,7 +776,12 @@
badId: this.rowObj.badId,
}
getViewByExamine(params).then((res) => {
this.loadingList = res.rows
this.loadingList = res.rows;
this.loadingList.forEach(item=>{
if(!item.num){
item.num = item.preNum;
}
})
this.loadingTotal = res.total
})
},
@ -857,11 +862,11 @@
}
},
checkNum(row){
const maxNum = row.num;
const maxNum = row.preNum;
if(row.num<=1){
row.num = 1;
row.num = 1
}else if(row.num>=maxNum){
row.num = maxNum;
row.num = maxNum
}
},
handleExam() {