From 9dbe73d0b5b26c9405826e649d4a04b0af23128e Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 5 Sep 2024 14:35:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=89=AB=E6=8F=8F=E5=85=B6=E4=BB=96=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E9=80=89=E4=B8=8D=E4=B8=AD=202024/7/4=2019:18:30?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/balance/balanceSelect.vue | 62 +++++++++---------- .../scan/winScanPackAndLocation.vue | 2 +- src/pages/deliver/coms/comScanDeliverPack.vue | 2 +- .../coms/comScanReturnPack.vue | 8 +-- .../record/directRepleinshRecord.vue | 1 - src/pages/stockUp/coms/comScanStockUpPack.vue | 10 +-- 6 files changed, 40 insertions(+), 45 deletions(-) diff --git a/src/mycomponents/balance/balanceSelect.vue b/src/mycomponents/balance/balanceSelect.vue index a238f8f8..5bc6c0b2 100644 --- a/src/mycomponents/balance/balanceSelect.vue +++ b/src/mycomponents/balance/balanceSelect.vue @@ -1,41 +1,37 @@ - \ No newline at end of file + diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue index fb3d1192..ad705a04 100644 --- a/src/mycomponents/scan/winScanPackAndLocation.vue +++ b/src/mycomponents/scan/winScanPackAndLocation.vue @@ -128,7 +128,7 @@ const openScanPopupForType = (fromLocationCodeParams, businessTypeParams) => { } fromInventoryStatuses.value = getDirectoryItemArray(businessType.value.outInventoryStatuses) inventoryStatus.value = getDirectoryItemArray(businessType.value.outInventoryStatuses) // 出库库存状态 - fromLocationAreaTypeList.value = getDirectoryItemArray(businessType.value.fromLocationAreaTypeList) // 出库库区 + fromLocationAreaTypeList.value = getDirectoryItemArray(businessType.value.outAreaTypes) // 出库库区 if (!show.value) { setTimeout((res) => { show.value = true diff --git a/src/pages/deliver/coms/comScanDeliverPack.vue b/src/pages/deliver/coms/comScanDeliverPack.vue index 60fcc553..8ca0891e 100644 --- a/src/pages/deliver/coms/comScanDeliverPack.vue +++ b/src/pages/deliver/coms/comScanDeliverPack.vue @@ -263,7 +263,7 @@ const afterGetBalance = (label, balance, packageInfo) => { getfocus() }) } - } else if (jobContent.value.AllowModifyBatch == null) { + } else if (jobContent.value.allowModifyBatch == 'TRUE') { showQuestionMessage(`在【${fromLocationCode.value}】库位下,未查找到批次【${lot}】的发货明细,是否要继续发货?`, (res) => { if (res) { const batch = createBatchInfo(label, balance, packageInfo) diff --git a/src/pages/productionReturn/coms/comScanReturnPack.vue b/src/pages/productionReturn/coms/comScanReturnPack.vue index 06f10d27..3ba0df81 100644 --- a/src/pages/productionReturn/coms/comScanReturnPack.vue +++ b/src/pages/productionReturn/coms/comScanReturnPack.vue @@ -238,10 +238,10 @@ const afterGetBalance = (label, balance, packageInfo) => { getfocus() }) } - } else if (jobContent.value.AllowModifyBatch == null) { + } else if (jobContent.value.allowModifyBatch == "TRUE") { showQuestionMessage(`在【${fromLocationCode.value}】库位下,未查找到批次【${lot}】的发料明细,是否要继续发料?`, (res) => { if (res) { - const batch = createBatchInfo(label, balance) + const batch = createBatchInfo(label, balance,packageInfo)) fromLocation.Batchs.unshift(batch) } }) @@ -261,7 +261,7 @@ const afterGetBalance = (label, balance, packageInfo) => { }) } } -const createBatchInfo = (data, balance) => { +const createBatchInfo = (data, balance,packageInfo) => { const batch = { batch: data.batch, qty: 0, @@ -269,7 +269,7 @@ const createBatchInfo = (data, balance) => { handleQty: Number(data.qty), Records: [] } - const record = creatRecord(data, balance) + const record = creatRecord(data, balance,packageInfo) batch.Records.push(record) issueRecord.value.unshift(record) return batch diff --git a/src/pages/repleinsh/record/directRepleinshRecord.vue b/src/pages/repleinsh/record/directRepleinshRecord.vue index f5d80d64..4f2e975d 100644 --- a/src/pages/repleinsh/record/directRepleinshRecord.vue +++ b/src/pages/repleinsh/record/directRepleinshRecord.vue @@ -96,7 +96,6 @@ onLoad((option) => { getBusinessType(businessTypeCode.value, (res) => { if (res.success) { businessType.value = res.businessType - res.fromLocationAreaTypeList.push('INSPECT', 'SUPPER') fromLocationAreaTypeList.value = res.fromLocationAreaTypeList toLocationAreaTypeList.value = res.toLocationAreaTypeList showFromLocationPopup() diff --git a/src/pages/stockUp/coms/comScanStockUpPack.vue b/src/pages/stockUp/coms/comScanStockUpPack.vue index eed297fa..2bcf273b 100644 --- a/src/pages/stockUp/coms/comScanStockUpPack.vue +++ b/src/pages/stockUp/coms/comScanStockUpPack.vue @@ -218,12 +218,12 @@ const onScan = (result) => { showBalanceSelect(balanceRes.data.list, packageInfo) } } else { - showErrorMessage(balanceRes.message.message) + showErrorMessage(balanceRes.message) } uni.hideLoading() }) - } catch (e) { - showErrorMessage(e.stack) + } catch (error) { + showErrorMessage(error) uni.hideLoading() } } @@ -270,7 +270,7 @@ const afterGetBalance = (label, balance, packageInfo) => { getfocus() }) } - } else if (jobContent.value.AllowModifyBatch == null) { + } else if (jobContent.value.allowModifyBatch == 'TRUE') { showQuestionMessage(`在【${fromLocationCode.value}】库位下,未查找到批次【${lot}】的发货明细,是否要继续发货?`, (res) => { if (res) { const batch = createBatchInfo(label, balance, packageInfo) @@ -295,7 +295,7 @@ const afterGetBalance = (label, balance, packageInfo) => { } const createBatchInfo = (data, balance, packageInfo) => { const batch = { - batch: data.lot, + batch: data.batch, qty: 0, uom: data.uom, handleQty: Number(data.qty),