diff --git a/src/common/balance.js b/src/common/balance.js
index 1a53c9f6..30ee40ad 100644
--- a/src/common/balance.js
+++ b/src/common/balance.js
@@ -211,15 +211,21 @@ export function byPacking(label, locationCode, fromInventoryStatuses, callback)
action: "==",
value: locationCode
})
- if (fromInventoryStatuses != null && fromInventoryStatuses != "") {
+ if (fromInventoryStatuses) {
+ var status = ""
+ fromInventoryStatuses.forEach(res => {
+ status = res + ","
+ })
+
filters.push({
column: "inventoryStatus",
action: "in",
- value: fromInventoryStatuses
+ value: status
})
}
+
var params = {
filters: filters,
pageNo: 1,
@@ -274,11 +280,16 @@ export function byBatch(label, locationCode, fromInventoryStatuses, callback) {
value: locationCode
})
- if (fromInventoryStatuses != null && fromInventoryStatuses != "") {
+ if (fromInventoryStatuses) {
+ var status = ""
+ fromInventoryStatuses.forEach(res => {
+ status = res + ","
+ })
+
filters.push({
column: "inventoryStatus",
action: "in",
- value: fromInventoryStatuses
+ value: status
})
}
@@ -346,11 +357,16 @@ export function byQuantity(label, locationCode, fromInventoryStatuses, callback)
value: locationCode
})
- if (fromInventoryStatuses != null && fromInventoryStatuses != "") {
+ if (fromInventoryStatuses) {
+ var status = ""
+ fromInventoryStatuses.forEach(res => {
+ status = res + ","
+ })
+
filters.push({
column: "inventoryStatus",
action: "in",
- value: fromInventoryStatuses
+ value: status
})
}
@@ -400,11 +416,16 @@ export function byUniqueId(label, locationCode, fromInventoryStatuses, callback)
value: label.packingNumber
})
- if (fromInventoryStatuses != null && fromInventoryStatuses != "") {
+ if (fromInventoryStatuses) {
+ var status = ""
+ fromInventoryStatuses.forEach(res => {
+ status = res + ","
+ })
+
filters.push({
column: "inventoryStatus",
action: "in",
- value: fromInventoryStatuses
+ value: status
})
}
@@ -474,4 +495,4 @@ export function balanceByLocation(locationCode, callback) {
result.message = err.message;
callback(result)
})
-}
+}
\ No newline at end of file
diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index 636b7c56..d8181552 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -140,7 +140,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 => {
@@ -164,7 +164,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/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue
index f2b2592b..b68fdafe 100644
--- a/src/pages/productPutaway/job/productPutawayJob.vue
+++ b/src/pages/productPutaway/job/productPutawayJob.vue
@@ -22,7 +22,7 @@
-
+
diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue
index 1966414c..677e643e 100644
--- a/src/pages/purchaseReceipt/job/receiptJob.vue
+++ b/src/pages/purchaseReceipt/job/receiptJob.vue
@@ -20,7 +20,7 @@
-
+
diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue
index fc22b4de..ef54b650 100644
--- a/src/pages/putaway/job/putawayJob.vue
+++ b/src/pages/putaway/job/putawayJob.vue
@@ -23,7 +23,7 @@
-
+