From 40e5655fc6bc6735da7650cb2daa76312c3798c0 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Thu, 13 Jun 2024 15:16:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E7=8A=B6=E6=80=81=E5=92=8C=E5=88=B6=E5=93=81=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/scan/winCheckFgLabel.vue | 4 ++-- src/mycomponents/scan/winScanPackAndLocationNoBalance.vue | 4 ++-- src/pages/deliver/coms/comScanDeliverPack.vue | 7 +++++-- src/pages/deliver/job/deliverDetail.vue | 3 ++- src/pages/issue/coms/comScanIssuePack.vue | 3 ++- src/pages/package/coms/comScanPackagePack.vue | 3 ++- src/pages/repleinsh/coms/comScanReplishPack.vue | 3 ++- src/pages/stockUp/coms/comScanStockUpPack.vue | 3 ++- 8 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/mycomponents/scan/winCheckFgLabel.vue b/src/mycomponents/scan/winCheckFgLabel.vue index 38037dcb..de831830 100644 --- a/src/mycomponents/scan/winCheckFgLabel.vue +++ b/src/mycomponents/scan/winCheckFgLabel.vue @@ -110,7 +110,7 @@ } else { this.locationGetFocus(); } - this.fromInventoryStatuses = this.businessType.outInventoryStatuses + this.fromInventoryStatuses = getDirectoryItemArray(this.businessType.outInventoryStatuses) this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //出库库存状态 this.fromLocationAreaTypeList = getDirectoryItemArray(this.businessType.fromLocationAreaTypeList); //出库库区 setTimeout(res => { @@ -134,7 +134,7 @@ setTimeout(res => { this.$refs.popup.open('bottom') }, 500) - this.fromInventoryStatuses = jobContent.outInventoryStatuses + this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses) this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态 this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态 }, diff --git a/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue index 8b8f0510..216f6dcd 100644 --- a/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue +++ b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue @@ -136,7 +136,7 @@ } else { this.locationGetFocus(); } - this.fromInventoryStatuses = this.businessType.outInventoryStatuses + this.fromInventoryStatuses = getDirectoryItemArray(this.businessType.outInventoryStatuses) this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //出库库存状态 this.fromLocationTypeArray = getDirectoryItemArray(this.businessType.outLocationTypes); //出库库存状态 setTimeout(res => { @@ -160,7 +160,7 @@ setTimeout(res => { this.$refs.popup.open('bottom') }, 500) - this.fromInventoryStatuses = jobContent.outInventoryStatuses + this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses) this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态 this.fromLocationTypeArray = getDirectoryItemArray(jobContent.fromLocationTypes); //出库库存状态 }, diff --git a/src/pages/deliver/coms/comScanDeliverPack.vue b/src/pages/deliver/coms/comScanDeliverPack.vue index 30305545..d8f19b12 100644 --- a/src/pages/deliver/coms/comScanDeliverPack.vue +++ b/src/pages/deliver/coms/comScanDeliverPack.vue @@ -109,6 +109,9 @@ getDetailEditRemoveOption } from '@/common/array.js'; + import { + getDirectoryItemArray, + } from '@/common/directory.js'; import { calc @@ -161,7 +164,7 @@ positionList: [], defaultValueList: [], label: {}, - fromInventoryStatuses: "", + fromInventoryStatuses: [], packageInfo: {} } }, @@ -197,7 +200,7 @@ let that = this; that.fromLocationList = []; if (that.dataContent != null) { - that.fromInventoryStatuses = this.jobContent.outInventoryStatuses + that.fromInventoryStatuses = getDirectoryItemArray(this.jobContent.outInventoryStatuses) that.toLocation = that.dataContent[0]; that.toLocationCode = that.dataContent[0].toLocationCode; that.fromLocationList = that.getFromLocationList(); diff --git a/src/pages/deliver/job/deliverDetail.vue b/src/pages/deliver/job/deliverDetail.vue index 39d4a47e..e534e8d7 100644 --- a/src/pages/deliver/job/deliverDetail.vue +++ b/src/pages/deliver/job/deliverDetail.vue @@ -60,6 +60,7 @@ cancleTakeDeliverJob, deliverJobSubmit } from '@/api/request2.js'; + import { calc @@ -70,7 +71,6 @@ navigateBack, getRemoveOption, getCurrDateTime, - getDirectoryItemArray, getPackingNumberAndBatch, } from '@/common/basic.js'; @@ -298,6 +298,7 @@ .packingNumber; record.toBatch = info.batch; } + record.fromPackingNumber =r.packingNumber subItem.recordList.push(record); }) subList.push(subItem); diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue index cfbc27ea..7051d9b2 100644 --- a/src/pages/issue/coms/comScanIssuePack.vue +++ b/src/pages/issue/coms/comScanIssuePack.vue @@ -119,6 +119,7 @@ import { getBalanceByManagementPrecision } from '@/common/balance.js'; +import { getDirectoryItemArray } from '../../../common/directory.js'; export default { name: 'winScanPack', @@ -191,7 +192,7 @@ let that = this; that.fromLocationList = []; if (that.dataContent != null) { - that.fromInventoryStatuses = this.jobContent.outInventoryStatuses + that.fromInventoryStatuses = getDirectoryItemArray(this.jobContent.outInventoryStatuses) that.toLocation = that.dataContent[0]; that.toLocationCode = that.dataContent[0].toLocationCode; that.fromLocationList = that.getFromLocationList(); diff --git a/src/pages/package/coms/comScanPackagePack.vue b/src/pages/package/coms/comScanPackagePack.vue index 29cb3297..dee3d843 100644 --- a/src/pages/package/coms/comScanPackagePack.vue +++ b/src/pages/package/coms/comScanPackagePack.vue @@ -119,6 +119,7 @@ import { getBalanceByManagementPrecision } from '@/common/balance.js'; +import { getDirectoryItemArray } from '../../../common/directory'; export default { name: 'winScanPack', @@ -190,7 +191,7 @@ let that = this; that.fromLocationList = []; if (that.dataContent != null) { - that.fromInventoryStatuses = this.jobContent.outInventoryStatuses + that.fromInventoryStatuses = getDirectoryItemArray(this.jobContent.outInventoryStatuses) that.toLocation = that.dataContent[0]; that.toLocationCode = that.dataContent[0].toLocationCode; that.fromLocationList = that.getFromLocationList(); diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue index c5333765..43ca82bc 100644 --- a/src/pages/repleinsh/coms/comScanReplishPack.vue +++ b/src/pages/repleinsh/coms/comScanReplishPack.vue @@ -113,6 +113,7 @@ import { getBalanceByManagementPrecision } from '@/common/balance.js'; +import { getDirectoryItemArray } from '../../../common/directory.js'; export default { name: 'winScanPack', @@ -184,7 +185,7 @@ let that = this; that.fromLocationList = []; if (that.dataContent != null) { - that.fromInventoryStatuses = this.jobContent.outInventoryStatuses + that.fromInventoryStatuses = getDirectoryItemArray(this.jobContent.outInventoryStatuses) that.toLocation = that.dataContent[0]; that.toLocationCode = that.dataContent[0].toLocationCode; that.fromLocationList = that.getFromLocationList(); diff --git a/src/pages/stockUp/coms/comScanStockUpPack.vue b/src/pages/stockUp/coms/comScanStockUpPack.vue index eecd97d4..6e2942e8 100644 --- a/src/pages/stockUp/coms/comScanStockUpPack.vue +++ b/src/pages/stockUp/coms/comScanStockUpPack.vue @@ -120,6 +120,7 @@ import { getBalanceByManagementPrecision } from '@/common/balance.js'; +import { getDirectoryItemArray } from '../../../common/directory.js'; export default { name: 'winScanPack', @@ -197,7 +198,7 @@ let that = this; that.fromLocationList = []; if (that.dataContent != null) { - that.fromInventoryStatuses = this.jobContent.outInventoryStatuses + that.fromInventoryStatuses = getDirectoryItemArray(this.jobContent.outInventoryStatuses) that.toLocation = that.dataContent[0]; that.toLocationCode = that.dataContent[0].toLocationCode; that.fromLocationList = that.getFromLocationList();