diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
index 83b4b55b..9370fb2a 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
@@ -94,7 +94,7 @@
@@ -103,7 +103,7 @@
-
+
编码退料
数量退料
撤回
@@ -612,7 +612,7 @@ export default {
this.codeQuery.parentId = row.id
this.codeQuery.typeId = row.modelId
this.dialogIsView = true
- this.returnNum = Number(row.partNum)
+ this.returnNum = Number(row.num)
this.handleCodeQuery()
} else if (row.manageType == '2') {
this.handleNumReturn(row)
@@ -656,7 +656,7 @@ export default {
this.codeQuery.taskId = row.taskId
this.codeQuery.typeId = row.modelId
this.dialogIsView = false
- this.returnNum = Number(row.partNum)
+ this.returnNum = Number(row.num)
this.handleCodeQuery()
},
//数量退料
@@ -664,8 +664,8 @@ export default {
this.title = '数量退料'
this.openNum = true
this.dialogIsView = false
- this.$set(row, 'backNum', row.partNum) //退料数量
- this.returnNum = Number(row.partNum)
+ this.$set(row, 'backNum', row.num) //退料数量
+ this.returnNum = Number(row.num)
this.dialogData.typeMange = row.manageType
this.dialogData.typeName = row.typeName
this.dialogData.typeCode = row.typeCode
@@ -751,7 +751,7 @@ export default {
let arr = []
for (const item of data) {
let sumUnmber = (item.qualifiedNum || 0) + (item.serviceNum || 0) + (item.scrapNum || 0)
- if (sumUnmber > item.partNum) {
+ if (sumUnmber > item.partNum&&sumUnmber > item.num) {
this.$modal.msgError('退料总量已大于待退料数量!')
return
} else {