From 975f8a73fca4a07459385ebbbb976f0f2c590ffe Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 20 Nov 2024 09:00:04 +0800 Subject: [PATCH] =?UTF-8?q?YT-1085=20=E9=9A=90=E8=97=8F=E8=AF=A6=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionReturn/coms/comReturnDetailCard.vue | 12 +++++++++--- src/pages/productionReturn/job/okToReturnDetail.vue | 3 ++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/pages/productionReturn/coms/comReturnDetailCard.vue b/src/pages/productionReturn/coms/comReturnDetailCard.vue index 304ee867..2842a230 100644 --- a/src/pages/productionReturn/coms/comReturnDetailCard.vue +++ b/src/pages/productionReturn/coms/comReturnDetailCard.vue @@ -95,12 +95,18 @@ }, mounted() { - if (this.detailOptions.length == 0) { - this.detailOptions = getDetailOption(); - } + if (this.scanOptions.length == 0) { this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty,this.settingParam.allowModifyLocation) } + + if(import.meta.env.VITE_MANAGE_MODEL=="BY_PACKAGING"){ + if (this.detailOptions.length == 0) { + this.detailOptions = getDetailOption(); + } + }else { + this.scanOptions.splice(0,1) + } }, methods: { diff --git a/src/pages/productionReturn/job/okToReturnDetail.vue b/src/pages/productionReturn/job/okToReturnDetail.vue index e4e4b1a1..a3ef48d3 100644 --- a/src/pages/productionReturn/job/okToReturnDetail.vue +++ b/src/pages/productionReturn/job/okToReturnDetail.vue @@ -371,8 +371,9 @@ var qty = result.label.qty; var itemCode = result.label.itemCode; var detail = this.detailSource.find(r => r.itemCode == itemCode); + let itemcodes = this.detailSource.map(item=>item.itemCode).join(',') if (detail == undefined) { - this.showErrorMessage("物料号【" + itemCode + "】不在列表中") + this.showErrorMessage(`扫描的物料【 ${ result.label.itemCode} 】与任务明细中的物料【 ${itemcodes} 】不一致`) } else { var itemDetail = detail.subList.find(r => { return r.batch == batch