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.dialogIsView = true
this.numList = res.data.rows this.numList = res.data.rows
this.numList.forEach(item => { this.numList.forEach(item => {
if (item.backStatus == '1') { item.qualifiedNum = item.hgNum
item.qualifiedNum = item.backNum item.serviceNum = item.wxNum
item.serviceNum = 0 item.scrapNum = item.bfNum
item.scrapNum = 0 // if (item.backStatus == '1') {
} // item.qualifiedNum = item.backNum
if (item.backStatus == '2') { // item.serviceNum = 0
item.serviceNum = item.backNum // item.scrapNum = 0
item.qualifiedNum = 0 // }
item.scrapNum = 0 // if (item.backStatus == '2') {
} // item.serviceNum = item.backNum
if (item.backStatus == '3') { // item.qualifiedNum = 0
item.scrapNum = item.backNum // item.scrapNum = 0
item.qualifiedNum = 0 // }
item.serviceNum = 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 => { this.dialogData.maTypeDetails.map(itemA => {
const matchingItemB = res.data.rows.find(itemB => itemA.modelId === itemB.modelId) const matchingItemB = res.data.rows.find(itemB => itemA.modelId === itemB.modelId)
if (matchingItemB) { if (matchingItemB) {
switch (matchingItemB.backStatus) { // switch (matchingItemB.backStatus) {
case '1': // case '1':
itemA.qualifiedNum = matchingItemB.backNum itemA.qualifiedNum = matchingItemB.hgNum
break // break
case '2': // case '2':
itemA.serviceNum = matchingItemB.backNum itemA.serviceNum = matchingItemB.wxNum
break // break
case '3': // case '3':
itemA.scrapNum = matchingItemB.backNum itemA.scrapNum = matchingItemB.bfNum
break // break
default: // default:
} // }
} }
}) })
} }