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

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

This commit is contained in:
liang.chao 2024-04-12 17:22:01 +08:00
parent d5384b25b3 8bb53bf1d1
commit eafbcb5640
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue
View File

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

13
sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
View File

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