From f31c01c045be2185917457007a1cd1207e2dc73c Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Wed, 8 May 2024 17:43:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../claimAndRefund/return/returnInDetail.vue | 361 +++++++++--------- 1 file changed, 189 insertions(+), 172 deletions(-) diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue index f8b340e7..0f9e890e 100644 --- a/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue +++ b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue @@ -119,69 +119,57 @@ prop="typeName" :show-overflow-tooltip="true" /> - - - + + + + + -
-
退料数量：{{ returnNum }}
- - - - 保存 - - - - - - - - - - - - - - - - - - - -
-
+
接收抱杆类型：{{ dialogData.typeName }}，型号：{{ dialogData.typeCode @@ -596,6 +492,99 @@
+ +
+
退料数量：{{ returnNum }}
+ + + + 保存 + + + + + + + + + + + + + + + + + + + +
@@ -605,6 +594,7 @@ import { receiveView, getBackMachine, backReceiveRecordWeb, + backReceiveRecordWebPt, setNumBack, setCodeBack, getRecord, @@ -661,6 +651,7 @@ export default { unitId: undefined, modelId: undefined, typeId: undefined, + agreementId: '', }, openCode: false, //编码弹窗开关 openNum: false, //数量弹窗开关 @@ -740,6 +731,22 @@ export default { receiveView(this.queryParams) .then((response) => { this.deviceList = response.data.rows + console.log(this.deviceList, ' this.deviceList') + + // this.deviceList.forEach(item => { + // console.log(item.num, 'item.num') + // if (item.manageType == '0' || item.manageType == '1') { + // item.partNum = item.num + // } else { + // item.partNum = item.partNum + // } + // if (item.maTypeDetails.length > 0) { + // this.isPlural = true + // } + // }) + + console.log(this.deviceList, 'deviceList') + this.total = response.data.total this.loading = false }) @@ -790,31 +797,34 @@ export default { } backReceiveRecordWeb(param).then((res) => { if (res.code == 200) { - this.title = '查看' + this.title = '查看1' this.openNum = true 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 + // } }) } }) } else if (row.manageType == '0') { - this.title = '查看' + this.title = '查看0' this.openCode = true this.resetForm('codeQuery') this.codeQuery.parentId = row.id @@ -830,6 +840,7 @@ export default { let param = { parentId: row.id, typeId: modelIdsJoined, + agreementId: row.agreementId, } backReceiveRecordWeb(param).then((res) => { if (res.code == 200) { @@ -841,19 +852,18 @@ export default { (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: + // } } }) } @@ -868,6 +878,7 @@ export default { this.codeQuery.parentId = row.id this.codeQuery.taskId = row.taskId this.codeQuery.typeId = row.modelId + this.codeQuery.agreementId = row.agreementId this.dialogIsView = false this.returnNum = Number(row.num) this.handleCodeQuery() @@ -902,6 +913,12 @@ export default { manageType: row.manageType, createBy: this.createBy, } + if (row.maTypeDetails && row.maTypeDetails.length > 0) { + param.typeIds = row.maTypeDetails.map((item) => { + return item.modelId + }) + } + console.log(param) revoke(param).then((response) => { if (response.code == 200) { this.$modal.msgSuccess('操作成功') @@ -932,9 +949,9 @@ export default { }, //获取退料编码查看列表 getCodeViewList() { - backReceiveRecordWeb(this.codeQuery).then((response) => { + backReceiveRecordWebPt(this.codeQuery).then((response) => { this.codeList = response.data.rows - this.codeList + // this.codeList this.codeList.forEach((item) => { item.typeModelName = item.typeCode if (item.backStatus == '1') { @@ -1076,7 +1093,6 @@ export default { taskId: this.codeQuery.taskId, arr: arr, } - console.log(param) setCodeBack(param).then((response) => { if (response.code == 200) { @@ -1098,6 +1114,7 @@ export default { width: 60px !important; margin-bottom: 10px; } + .clickText { color: #02a7f0; cursor: pointer;