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

This commit is contained in:
liang.chao 2024-05-06 17:07:50 +08:00
commit faab921dae
1 changed files with 30 additions and 27 deletions

View File

@ -610,21 +610,24 @@ export default {
this.dialogIsView = true
this.numList = res.data.rows
this.numList.forEach(item => {
if (item.backStatus == '1') {
item.qualifiedNum = item.backNum
item.serviceNum = 0
item.scrapNum = 0
}
if (item.backStatus == '2') {
item.serviceNum = item.backNum
item.qualifiedNum = 0
item.scrapNum = 0
}
if (item.backStatus == '3') {
item.scrapNum = item.backNum
item.qualifiedNum = 0
item.serviceNum = 0
}
item.qualifiedNum = item.hgNum
item.serviceNum = item.wxNum
item.scrapNum = item.bfNum
// if (item.backStatus == '1') {
// item.qualifiedNum = item.backNum
// item.serviceNum = 0
// item.scrapNum = 0
// }
// if (item.backStatus == '2') {
// item.serviceNum = item.backNum
// item.qualifiedNum = 0
// item.scrapNum = 0
// }
// if (item.backStatus == '3') {
// item.scrapNum = item.backNum
// item.qualifiedNum = 0
// item.serviceNum = 0
// }
})
}
})
@ -652,18 +655,18 @@ export default {
this.dialogData.maTypeDetails.map(itemA => {
const matchingItemB = res.data.rows.find(itemB => itemA.modelId === itemB.modelId)
if (matchingItemB) {
switch (matchingItemB.backStatus) {
case '1':
itemA.qualifiedNum = matchingItemB.backNum
break
case '2':
itemA.serviceNum = matchingItemB.backNum
break
case '3':
itemA.scrapNum = matchingItemB.backNum
break
default:
}
// switch (matchingItemB.backStatus) {
// case '1':
itemA.qualifiedNum = matchingItemB.hgNum
// break
// case '2':
itemA.serviceNum = matchingItemB.wxNum
// break
// case '3':
itemA.scrapNum = matchingItemB.bfNum
// break
// default:
// }
}
})
}