diff --git a/src/mycomponents/location/locationCompare.vue b/src/mycomponents/location/locationCompare.vue index 05720566..76c47399 100644 --- a/src/mycomponents/location/locationCompare.vue +++ b/src/mycomponents/location/locationCompare.vue @@ -3,18 +3,18 @@ - {{ title }} + {{ title }} -   {{ recommendLocationCode }} -  / {{ locationCode }} +   {{ recommendLocationCode }} +  / {{ locationCode }} - + - {{ title }} -   {{ recommendLocationCode }} + {{ title }} +   {{ recommendLocationCode }} diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue index 2755c1d6..935649ba 100644 --- a/src/mycomponents/scan/winScanPackAndLocation.vue +++ b/src/mycomponents/scan/winScanPackAndLocation.vue @@ -6,7 +6,7 @@ 扫描{{ title }} - + @@ -79,6 +79,11 @@ const props = defineProps({ queryBalance: { type: Boolean, default: true + }, + balanceFromInventoryStatuses: { + // 是否传fromInventoryStatuses + type: Boolean, + default: true } }) const scanResult = ref({}) @@ -215,7 +220,7 @@ const checkPackage = (result) => { // mask: true // }) if (props.queryBalance == true) { - getBalanceByManagementPrecision(result.label, fromLocationCode.value, fromInventoryStatuses.value, (res) => { + getBalanceByManagementPrecision(result.label, fromLocationCode.value, props.balanceFromInventoryStatuses ? fromInventoryStatuses.value : undefined, (res) => { uni.hideLoading() if (res.success) { managementPrecision.value = res.managementPrecision diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue index b7c72d1d..12b9e921 100644 --- a/src/pages/productPutaway/job/productPutawayDetail.vue +++ b/src/pages/productPutaway/job/productPutawayDetail.vue @@ -29,7 +29,7 @@ - + diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue index 09b84c65..3fc56e4d 100644 --- a/src/pages/productPutaway/record/productPutawayRecord.vue +++ b/src/pages/productPutaway/record/productPutawayRecord.vue @@ -29,7 +29,7 @@ - + diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue index 0f76c858..10824c40 100644 --- a/src/pages/putaway/job/putawayDetail.vue +++ b/src/pages/putaway/job/putawayDetail.vue @@ -33,7 +33,7 @@ - + diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue index 9aa74b39..9e3c952b 100644 --- a/src/pages/repleinsh/coms/comScanReplishPack.vue +++ b/src/pages/repleinsh/coms/comScanReplishPack.vue @@ -140,7 +140,7 @@ const closeScanPopup = () => { const initData = () => { fromLocationList.value = [] if (dataContent.value != null) { - fromInventoryStatuses.value = getDirectoryItemArray(jobContent.value.outInventoryStatuses) + fromInventoryStatuses.value = jobContent.value.outInventoryStatuses toLocation.value = dataContent.value[0] toLocationCode.value = dataContent.value[0].toLocationCode fromLocationList.value = getFromLocationList() diff --git a/src/pages/repleinsh/job/repleinshDetail.vue b/src/pages/repleinsh/job/repleinshDetail.vue index a5b3054b..c7f08e9b 100644 --- a/src/pages/repleinsh/job/repleinshDetail.vue +++ b/src/pages/repleinsh/job/repleinshDetail.vue @@ -350,6 +350,7 @@ const updateData = (record) => { }) batch.handleQty = handleQty itemHandleQty = calc.add(itemHandleQty, handleQty) + comScanIssuePackRef.value.calcBatchHandleQty(batch) } }) }