退料接收时,检查结算表拿到待退料数量,防止多退
This commit is contained in:
parent
1920adbeed
commit
6ea3fc22c5
|
|
@ -151,12 +151,24 @@
|
||||||
prop="typeCode"
|
prop="typeCode"
|
||||||
:show-overflow-tooltip="true"
|
:show-overflow-tooltip="true"
|
||||||
/>
|
/>
|
||||||
|
<el-table-column
|
||||||
|
label="退料人员"
|
||||||
|
align="center"
|
||||||
|
prop="backPerson"
|
||||||
|
show-overflow-tooltip
|
||||||
|
/>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="申请数量"
|
label="申请数量"
|
||||||
align="center"
|
align="center"
|
||||||
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"
|
||||||
|
|
@ -164,7 +176,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"
|
||||||
>
|
>
|
||||||
|
|
@ -174,7 +186,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.num
|
? scope.row.maxBackNum
|
||||||
: scope.row.partNum)
|
: scope.row.partNum)
|
||||||
}}
|
}}
|
||||||
</span>
|
</span>
|
||||||
|
|
@ -210,7 +222,7 @@
|
||||||
v-if="
|
v-if="
|
||||||
!isView &&
|
!isView &&
|
||||||
scope.row.manageType == '0' &&
|
scope.row.manageType == '0' &&
|
||||||
scope.row.num > 0 &&
|
scope.row.maxBackNum > 0 &&
|
||||||
(userId == scope.row.userId || userId == 1)
|
(userId == scope.row.userId || userId == 1)
|
||||||
"
|
"
|
||||||
>
|
>
|
||||||
|
|
@ -224,7 +236,7 @@
|
||||||
!isView &&
|
!isView &&
|
||||||
(scope.row.manageType == '1' ||
|
(scope.row.manageType == '1' ||
|
||||||
scope.row.manageType == '2') &&
|
scope.row.manageType == '2') &&
|
||||||
scope.row.num > 0 &&
|
scope.row.maxBackNum > 0 &&
|
||||||
(userId == scope.row.userId || userId == 1)
|
(userId == scope.row.userId || userId == 1)
|
||||||
"
|
"
|
||||||
>
|
>
|
||||||
|
|
@ -236,7 +248,7 @@
|
||||||
@click="handleBackup(scope.row)"
|
@click="handleBackup(scope.row)"
|
||||||
v-if="
|
v-if="
|
||||||
!isView &&
|
!isView &&
|
||||||
scope.row.num < scope.row.preNum - scope.row.finishedBackNum &&
|
scope.row.inCompletedBackNum > 0 &&
|
||||||
(userId == scope.row.userId || userId == 1)
|
(userId == scope.row.userId || userId == 1)
|
||||||
"
|
"
|
||||||
>
|
>
|
||||||
|
|
@ -542,7 +554,7 @@
|
||||||
:show-overflow-tooltip="true"
|
:show-overflow-tooltip="true"
|
||||||
/>
|
/>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="退料数量"
|
label="最大退料数量"
|
||||||
align="center"
|
align="center"
|
||||||
prop="backNum"
|
prop="backNum"
|
||||||
:show-overflow-tooltip="true"
|
:show-overflow-tooltip="true"
|
||||||
|
|
@ -870,7 +882,7 @@ export default {
|
||||||
this.codeQuery.parentId = row.id
|
this.codeQuery.parentId = row.id
|
||||||
this.codeQuery.typeId = row.modelId
|
this.codeQuery.typeId = row.modelId
|
||||||
this.dialogIsView = true
|
this.dialogIsView = true
|
||||||
this.returnNum = Number(row.num)
|
this.returnNum = Number(row.maxBackNum)
|
||||||
this.handleCodeQuery()
|
this.handleCodeQuery()
|
||||||
} else if (row.manageType == '2') {
|
} else if (row.manageType == '2') {
|
||||||
this.handleNumReturn(row)
|
this.handleNumReturn(row)
|
||||||
|
|
@ -920,7 +932,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.num)
|
this.returnNum = Number(row.maxBackNum)
|
||||||
this.handleCodeQuery()
|
this.handleCodeQuery()
|
||||||
},
|
},
|
||||||
//数量退料
|
//数量退料
|
||||||
|
|
@ -928,8 +940,8 @@ export default {
|
||||||
this.title = '数量退料'
|
this.title = '数量退料'
|
||||||
this.openNum = true
|
this.openNum = true
|
||||||
this.dialogIsView = false
|
this.dialogIsView = false
|
||||||
this.$set(row, 'backNum', row.num) //退料数量
|
this.$set(row, 'backNum', row.maxBackNum) //退料数量
|
||||||
this.returnNum = Number(row.num)
|
this.returnNum = Number(row.maxBackNum)
|
||||||
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
|
||||||
|
|
|
||||||
Reference in New Issue