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

src/pages/issue/job/issueDetailBatch.vue

@@ -39,7 +39,7 @@
 			@afterScan='afterScan' :locationCode='fromLocationCode'>
 		</com-scan-issue-pack> -->
 	
-		<winScanPackAndLocation :balanceFromInventoryStatuses="false"  ref="scanPopup"
+		<winScanPackAndLocation :balanceFromInventoryStatuses="true"  ref="scanPopup"
 			@getResult='getScanResult' :noShowBalanceMessage="false" @confirm='confirmFromLocation'>
 		</winScanPackAndLocation>
 		<balance-select ref="balanceSelect" ></balance-select>
@@ -300,6 +300,7 @@
 				
 			},
 			setDataBatch(result) {
+				console.log(result)
 				try {
 					let that = this
 					this.balanceinfo =  result.balance