Revert "退料接收时,检查结算表拿到待退料数量,防止多退"

This reverts commit 624c8f7e6b.
This commit is contained in:
sxu 2024-08-28 09:22:48 +08:00
parent 8117ebee40
commit 1920adbeed
1 changed files with 7 additions and 13 deletions

View File

@ -157,12 +157,6 @@
prop="preNum" prop="preNum"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<!-- <el-table-column-->
<!-- label="最大退料数"-->
<!-- align="center"-->
<!-- prop="maxBackNum"-->
<!-- :show-overflow-tooltip="true"-->
<!-- />-->
<el-table-column <el-table-column
label="已完成退料数量" label="已完成退料数量"
align="center" align="center"
@ -170,7 +164,7 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="最大退料数量" label="退料数量"
align="center" align="center"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
@ -180,7 +174,7 @@
(scope.row.partNum = (scope.row.partNum =
scope.row.manageType == 0 || scope.row.manageType == 0 ||
scope.row.manageType == 1 scope.row.manageType == 1
? scope.row.maxBackNum ? scope.row.num
: scope.row.partNum) : scope.row.partNum)
}} }}
</span> </span>
@ -242,7 +236,7 @@
@click="handleBackup(scope.row)" @click="handleBackup(scope.row)"
v-if=" v-if="
!isView && !isView &&
scope.row.num < scope.row.maxBackNum - scope.row.finishedBackNum && scope.row.num < scope.row.preNum - scope.row.finishedBackNum &&
(userId == scope.row.userId || userId == 1) (userId == scope.row.userId || userId == 1)
" "
> >
@ -926,7 +920,7 @@ export default {
this.codeQuery.typeId = row.modelId this.codeQuery.typeId = row.modelId
this.codeQuery.agreementId = row.agreementId this.codeQuery.agreementId = row.agreementId
this.dialogIsView = false this.dialogIsView = false
this.returnNum = Number(row.maxBackNum) this.returnNum = Number(row.num)
this.handleCodeQuery() this.handleCodeQuery()
}, },
//退 //退
@ -934,8 +928,8 @@ export default {
this.title = '数量退料' this.title = '数量退料'
this.openNum = true this.openNum = true
this.dialogIsView = false this.dialogIsView = false
this.$set(row, 'backNum', row.maxBackNum) //退 this.$set(row, 'backNum', row.num) //退
this.returnNum = Number(row.maxBackNum) this.returnNum = Number(row.num)
this.dialogData.typeMange = row.manageType this.dialogData.typeMange = row.manageType
this.dialogData.typeName = row.typeName this.dialogData.typeName = row.typeName
this.dialogData.typeCode = row.typeCode this.dialogData.typeCode = row.typeCode
@ -1030,7 +1024,7 @@ export default {
(item.qualifiedNum || 0) + (item.qualifiedNum || 0) +
(item.serviceNum || 0) + (item.serviceNum || 0) +
(item.scrapNum || 0) (item.scrapNum || 0)
if (sumUnmber > item.partNum && sumUnmber > item.maxBackNum) { if (sumUnmber > item.partNum && sumUnmber > item.num) {
this.$modal.msgError('退料总量已大于待退料数量!') this.$modal.msgError('退料总量已大于待退料数量!')
return return
} else { } else {