Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

src/mycomponents/scan/winScanPackAndLocation.vue

@@ -105,6 +105,10 @@
 			queryBalance: {
 				type: Boolean,
 				default: true
+			},
+			balanceFromInventoryStatuses:{//是否传fromInventoryStatuses
+				type: Boolean,
+				default: true
 			}
 		},
 		data() {
@@ -255,7 +259,8 @@
 						// 	title: '查询中...',
 						// 	mask: true
 						// })
-						getBalanceByManagementPrecision(result.label, this.fromLocationCode, this.fromInventoryStatuses,
+						// 采购上架任务--大哥让去掉 fromInventoryStatuses
+						getBalanceByManagementPrecision(result.label, this.fromLocationCode, this.balanceFromInventoryStatuses?this.fromInventoryStatuses:undefined,
 							res => {
 								uni.hideLoading();
 								if (res.success) {

src/pages/productPutaway/job/productPutawayDetail.vue

@@ -36,7 +36,7 @@
 		</view>
 
 		<win-scan-button @goScan='openScanPopup'></win-scan-button>
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<win-scan-pack-and-location :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
 		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
 
 		<comMessage ref="comMessage"></comMessage>

src/pages/productPutaway/record/productPutawayRecord.vue

@@ -33,7 +33,7 @@
 			<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		</view>
 
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<win-scan-pack-and-location :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
 			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
 		<comMessage ref="comMessage"></comMessage>

src/pages/putaway/job/putawayDetail.vue

@@ -41,7 +41,7 @@
 		<!-- 		<winScanPackAndLocationNoBalance ref="scanPopup" @getResult='getScanResult' :allowNullBalance="true">
 		</winScanPackAndLocationNoBalance> -->
 
-		<winScanPackAndLocation ref="scanPopup" @getResult='getScanResult' :noShowBalanceMessage="true">
+		<winScanPackAndLocation :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult='getScanResult' :noShowBalanceMessage="true">
 		</winScanPackAndLocation>
 
 		<comMessage ref="comMessage"></comMessage>