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

src/mycomponents/scan/winCheckFgLabel.vue

@@ -110,7 +110,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 => {
@@ -134,7 +134,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/mycomponents/scan/winScanPackAndLocationNoBalance.vue

@@ -136,7 +136,7 @@
 				} else {
 					this.locationGetFocus();
 				}
-				this.fromInventoryStatuses = this.businessType.outInventoryStatuses
+				this.fromInventoryStatuses = getDirectoryItemArray(this.businessType.outInventoryStatuses)
 				this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //出库库存状态
 				this.fromLocationTypeArray = getDirectoryItemArray(this.businessType.outLocationTypes); //出库库存状态
 				setTimeout(res => {
@@ -160,7 +160,7 @@
 				setTimeout(res => {
 					this.$refs.popup.open('bottom')
 				}, 500)
-				this.fromInventoryStatuses = jobContent.outInventoryStatuses
+				this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses)
 				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
 				this.fromLocationTypeArray = getDirectoryItemArray(jobContent.fromLocationTypes); //出库库存状态
 			},

src/pages/deliver/coms/comScanDeliverPack.vue

@@ -109,6 +109,9 @@
 		getDetailEditRemoveOption
 	} from '@/common/array.js';
 
+	import {
+		getDirectoryItemArray,
+	} from '@/common/directory.js';
 
 	import {
 		calc
@@ -161,7 +164,7 @@
 				positionList: [],
 				defaultValueList: [],
 				label: {},
-				fromInventoryStatuses: "",
+				fromInventoryStatuses: [],
 				packageInfo: {}
 			}
 		},
@@ -197,7 +200,7 @@
 				let that = this;
 				that.fromLocationList = [];
 				if (that.dataContent != null) {
-					that.fromInventoryStatuses = this.jobContent.outInventoryStatuses
+					that.fromInventoryStatuses = getDirectoryItemArray(this.jobContent.outInventoryStatuses) 
 					that.toLocation = that.dataContent[0];
 					that.toLocationCode = that.dataContent[0].toLocationCode;
 					that.fromLocationList = that.getFromLocationList();

src/pages/deliver/job/deliverDetail.vue

@@ -60,6 +60,7 @@
 		cancleTakeDeliverJob,
 		deliverJobSubmit
 	} from '@/api/request2.js';
+	
 
 	import {
 		calc
@@ -70,7 +71,6 @@
 		navigateBack,
 		getRemoveOption,
 		getCurrDateTime,
-		getDirectoryItemArray,
 		getPackingNumberAndBatch,
 	} from '@/common/basic.js';
 
@@ -298,6 +298,7 @@
 												.packingNumber;
 											record.toBatch = info.batch;
 										}
+										record.fromPackingNumber =r.packingNumber
 										subItem.recordList.push(record);
 									})
 									subList.push(subItem);

src/pages/issue/coms/comScanIssuePack.vue

@@ -119,6 +119,7 @@
 	import {
 		getBalanceByManagementPrecision
 	} from '@/common/balance.js';
+import { getDirectoryItemArray } from '../../../common/directory.js';
 
 	export default {
 		name: 'winScanPack',
@@ -191,7 +192,7 @@
 				let that = this;
 				that.fromLocationList = [];
 				if (that.dataContent != null) {
-					that.fromInventoryStatuses = this.jobContent.outInventoryStatuses
+					that.fromInventoryStatuses = getDirectoryItemArray(this.jobContent.outInventoryStatuses)  
 					that.toLocation = that.dataContent[0];
 					that.toLocationCode = that.dataContent[0].toLocationCode;
 					that.fromLocationList = that.getFromLocationList();

src/pages/package/coms/comScanPackagePack.vue

@@ -119,6 +119,7 @@
 	import {
 		getBalanceByManagementPrecision
 	} from '@/common/balance.js';
+import { getDirectoryItemArray } from '../../../common/directory';
 
 	export default {
 		name: 'winScanPack',
@@ -190,7 +191,7 @@
 				let that = this;
 				that.fromLocationList = [];
 				if (that.dataContent != null) {
-					that.fromInventoryStatuses = this.jobContent.outInventoryStatuses
+					that.fromInventoryStatuses = getDirectoryItemArray(this.jobContent.outInventoryStatuses) 
 					that.toLocation = that.dataContent[0];
 					that.toLocationCode = that.dataContent[0].toLocationCode;
 					that.fromLocationList = that.getFromLocationList();

src/pages/productReceipt/job/productReceiptDetail.vue

@@ -53,7 +53,7 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<locationCompare title="收货库位" :isShowEdit="jobContent.allowModifyLocation=='TRUE'" :recommendLocationCode="jobToLocationCode"
+					<locationCompare ref="comScanLocation" title="收货库位" :isShowEdit="jobContent.allowModifyLocation=='TRUE'" :recommendLocationCode="jobToLocationCode"
 						:locationCode="toLocationCode" @getLocation='scanLocationCode'
 						:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
 				</view>

src/pages/repleinsh/coms/comScanReplishPack.vue

@@ -113,6 +113,7 @@
 	import {
 		getBalanceByManagementPrecision
 	} from '@/common/balance.js';
+import { getDirectoryItemArray } from '../../../common/directory.js';
 
 	export default {
 		name: 'winScanPack',
@@ -184,7 +185,7 @@
 				let that = this;
 				that.fromLocationList = [];
 				if (that.dataContent != null) {
-					that.fromInventoryStatuses = this.jobContent.outInventoryStatuses
+					that.fromInventoryStatuses = getDirectoryItemArray(this.jobContent.outInventoryStatuses)  
 					that.toLocation = that.dataContent[0];
 					that.toLocationCode = that.dataContent[0].toLocationCode;
 					that.fromLocationList = that.getFromLocationList();

src/pages/stockUp/coms/comScanStockUpPack.vue

@@ -120,6 +120,7 @@
 	import {
 		getBalanceByManagementPrecision
 	} from '@/common/balance.js';
+import { getDirectoryItemArray } from '../../../common/directory.js';
 
 	export default {
 		name: 'winScanPack',
@@ -197,7 +198,7 @@
 				let that = this;
 				that.fromLocationList = [];
 				if (that.dataContent != null) {
-					that.fromInventoryStatuses = this.jobContent.outInventoryStatuses
+					that.fromInventoryStatuses = getDirectoryItemArray(this.jobContent.outInventoryStatuses)  
 					that.toLocation = that.dataContent[0];
 					that.toLocationCode = that.dataContent[0].toLocationCode;
 					that.fromLocationList = that.getFromLocationList();