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

src/mycomponents/scan/winScanPackAndLocation.vue

@@ -162,7 +162,7 @@
 				}, 500)
 				this.fromInventoryStatuses = jobContent.outInventoryStatuses
 				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
-				this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaCodes); //出库库存状态
+				this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态
 			},
 
 			closeScanPopup(content) {
@@ -197,7 +197,7 @@
 					uni.hideLoading();
 					if (res.data.total > 0) {
 						let result = res.data.list[0];
-						var type = result.type;
+						var type = result.areaType;
 						var available = result.available;
 						if (available == "TRUE") {
 							if (checkDirectoryItemExist(this.fromLocationAreaTypeList, type)) {
@@ -206,8 +206,8 @@
 								this.checkPackage(scanResult);
 							} else {
 								var hint = getListLocationAreaTypeDesc(this.fromLocationAreaTypeList);
-								this.showErrorMessage("扫描库位[" + this.code + "]是[" +
-									getLocationAreaTypeName(areaType) + "],需要的库区是[" + hint + "]")
+								this.showErrorMessage("扫描库位[" + this.fromLocationCode + "]是[" +
+									getLocationAreaTypeName(result.areaType) + "],需要的库区是[" + hint + "]")
 							}
 						} else {
 							this.showErrorMessage("扫描库位[" + this.fromLocationCode + "]不可用", res => {