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

src/pages/count/job/fuzzyCountDetail.vue

@@ -64,8 +64,8 @@
 		<win-scan-button v-if="fromLocationCode!=''" @goScan='openScanPopup'></win-scan-button>
 		<win-scan-pack ref="scanPopup" @getResult='getScanResult'></win-scan-pack>
 		<win-scan-location ref="scanLocationCode" title="盘点库位" @getLocation='getLocation'></win-scan-location>
-		<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true" :isShowDesc="false"
+		<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true"
-			:allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount=='TRUE'">
+			:isShowDesc="false" :allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount=='TRUE'">
 		</count-qty-edit>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
@@ -326,9 +326,10 @@
 				if (this.itemRangeValue != '') {
 					let index = this.itemRangeValue.indexOf(packInfo.itemCode)
 					if (index < 0) {
-						this.afterScanLocation("物料代码【" + packInfo.itemCode + "】,不在盘点范围【" + this.itemRangeValue + "】内");
+						this.showErrorMessage("物料代码【"+ packInfo.itemCode + "】,不在盘点范围【" + this.itemRangeValue + "】内")
 							return;
-					} else {
+						}
+						else {
 							this.onScan(packInfo);
 						}
 					} else {
@@ -337,14 +338,16 @@
 				},
 
 				onScan(packInfo) {
-				let detail = this.detailSource.find(r => r.itemCode == packInfo.itemCode && r.packingNumber == packInfo
+						let detail = this.detailSource.find(r => r.itemCode == packInfo.itemCode && r.packingNumber ==
+							packInfo
 							.number && r.batch == packInfo.batch && r.inventoryStatus == "OK");
 						if (detail == undefined) {
 							detail = this.createDetailInfo(packInfo);
 							this.detailSource.unshift(detail)
 							this.scanPopupGetFocus();
 						} else {
-					let index = this.detailSource.findIndex(r => r.itemCode == packInfo.itemCode && r.packingNumber ==
+							let index = this.detailSource.findIndex(r => r.itemCode == packInfo.itemCode && r
+								.packingNumber ==
 								packInfo
 								.number && r.batch == packInfo.batch && r.inventoryStatus == "OK");
 							if (index >= 0) {