修改查询库存状态

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)
 	})
-}
+}

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); //出库库存状态
 			},

src/pages/productPutaway/job/productPutawayJob.vue

@@ -22,7 +22,7 @@
 			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
 		</view>
 		<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button>
-		<winScanPackJob ref="scanPopup" @getResult='getScanResult' :allowNullBalance="true">
+		<winScanPackJob ref="scanPopup" @getResult='getScanResult' >
 		</winScanPackJob>
 		<jobList ref="jobList" @selectItem="selectItem"></jobList>
 		<comMessage ref="comMessage"></comMessage>

src/pages/purchaseReceipt/job/receiptJob.vue

@@ -20,7 +20,7 @@
 			<receipt-job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></receipt-job-list-popup>
 		</view>
 		<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button>
-		<winScanPackJob :title="scanTitle" ref="scanPopup" @getResult='getScanResult' :allowNullBalance="true">
+		<winScanPackJob :title="scanTitle" ref="scanPopup" @getResult='getScanResult' >
 		</winScanPackJob>
 		<jobList ref="jobList" @selectItem="selectItem"></jobList>
 		<comMessage ref="comMessage"></comMessage>

src/pages/putaway/job/putawayJob.vue

@@ -23,7 +23,7 @@
 		</view>
 		<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button>
 
-		<winScanPackJob ref="scanPopup" @getResult='getScanResult' :allowNullBalance="true">
+		<winScanPackJob ref="scanPopup" @getResult='getScanResult'>
 		</winScanPackJob>
 		<jobList ref="jobList" @selectItem="selectItem"></jobList>