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

src/pages/inventoryMove/coms/comMoveRecord.vue

@@ -588,7 +588,7 @@
 
 							if (checkDirectoryItemExist(this.itemTypeList, itemType)) {
 								if (checkDirectoryItemExist(this.itemStatusList, itemStatus)) {
-									this.$refs.scanPopup.getScanResult(result)
+									this.$refs.okToHoldRecordPackRef.itemCode=result.label.itemCode
 								} else {
 									this.$refs.okToHoldRecordPackRef.itemCode = ''
 									var hint = getListItemStatusDesc(this.itemStatusList);

src/pages/issue/job/issueDetailBatch.vue

@@ -485,7 +485,7 @@
 				});
 				//目前任务只到一个库位
 				var itemCodes = []
-				let locationCode = this.detailSource[0].toLocationCode
+				let locationCode = this.toLocationCode
 				this.detailSource.forEach(toLocation => {
 					itemCodes.push(toLocation.itemCode)
 				})