From cef8e66cb922daa7a0c742193b1c57ec59a2c271 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 7 Nov 2024 13:41:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E6=A0=BC=E8=BD=AC=E9=9A=94=E7=A6=BB?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=20=20=20YT-734pda=E6=89=80=E6=9C=89=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=8F=90=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8C=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E5=BA=93=E4=BD=8D=E7=9A=84=EF=BC=8C=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?=E7=9A=84=E6=98=AF=E7=AE=B1=E7=A0=81=EF=BC=8C=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E5=BA=93=E4=BD=8D=E4=B8=BA=E7=A9=BA=EF=BC=9B?=
 =?UTF-8?q?=E6=89=AB=E6=8F=8F=E7=AE=B1=E7=A0=81=EF=BC=8C=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?=E7=9A=84=E6=98=AF=E5=BA=93=E4=BD=8D=EF=BC=8C=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E7=9A=84=E7=AE=B1=E7=A0=81=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/scan/winScanLocation.vue     |    8 +-
 .../scan/winScanPackAndLocation.vue           |    5 +
 .../inventoryMove/coms/comMoveRecord.vue      | 1271 +++++++++--------
 .../inventoryMove/coms/okToHoldRecordPack.vue |   58 +-
 4 files changed, 697 insertions(+), 645 deletions(-)

diff --git a/src/mycomponents/scan/winScanLocation.vue b/src/mycomponents/scan/winScanLocation.vue
index 26e2b201..a7f363c5 100644
--- a/src/mycomponents/scan/winScanLocation.vue
+++ b/src/mycomponents/scan/winScanLocation.vue
@@ -38,7 +38,7 @@
 		components: {
 			winComScan,
 		},
-		emits: ["getLocation"],
+		emits: ["getLocation","clearFromLocation"],
 		props: {
 			title: {
 				type: String,
@@ -101,10 +101,10 @@
 				}
 				if(this.code==undefined){
 					uni.hideLoading();
-					this.showErrorMessage("扫描库位[" + this.code + "]为空,请输入正确的库位")
+					this.showErrorMessage("扫描库位为空,请输入正确的库位")
 					return 
 				}
-				
+				console.log(888,this.code)
 				getBasicLocationByCode(this.code).then(res => {
 					
 					uni.hideLoading();
@@ -112,6 +112,7 @@
 						let result = res.data.list[0];
 						if(result.code!=this.code){
 							this.showErrorMessage('未查询到库位[' + this.code + ']')
+							this.$emit('clearFromLocation',this.code)
 							return;
 						}
 						var type = result.type;
@@ -131,6 +132,7 @@
 						}
 					} else {
 						this.showErrorMessage('未查询到库位[' + this.code + ']')
+						this.$emit('clearFromLocation',this.code)
 					}
 					
 				}).catch(error => {
diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index 43b14388..2ae6adda 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -337,6 +337,11 @@
 										})
 									}
 									this.chooseWhich = '2'
+									if(!result.label.itemCode){
+										this.showErrorMessage('扫描标签不对，请重新扫描')
+										this.$emit('clearItemCode',result.label.code)
+										return
+									}
 									if (res.data && res.data.list && res.data.list.length > 1) {
 										this.showBalanceSelect(res.data.list);
 									} else {
diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue
index bf25e86c..d4408686 100644
--- a/src/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecord.vue
@@ -1,632 +1,641 @@
-<template>
-	<view class="page-wraper">
-		<view class="">
-			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
-		</view>
-		<view class="page-wraper" v-if="detailSource.length>0">
-			<view class='split_line'></view>
-			<view class="page-main">
-				<scroll-view scroll-y="true" class="page-main-scroll">
-					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
-						<view class="">
-							<com-move-record-card :dataContent="item" :index="index" @removeData="removeData"
-								:isShowStatus="isShowStatus" @updateData="updateData" @removePack='removePack'
-								:allowEditQty="true"
-								:allowEditStatus="allowEditStatus">
-							</com-move-record-card>
-						</view>
-					</view>
-				</scroll-view>
-			</view>
-
-			<view class="page-footer">
-				<view class="uni-flex u-col-center space-between padding_10"
-					style="background-color:ghostwhite; width: 100%; ">
-					<view class="">
-						<!-- :isShowEdit="isShowEditLocation" -->
-						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocation'
-							:locationAreaTypeList="toLocationAreaTypeList" :isShowEdit='true'></requiredLocation>
-					</view>
-					<view class=" uni-flex uni-row">
-						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
-					</view>
-				</view>
-			</view>
-			<win-scan-button @goScan='openScanPopup'></win-scan-button>
-		</view>
-		<!-- 合格转隔离单独的弹窗-->
-		<okToHoldRecordPack ref="okToHoldRecordPackRef" :fromLocationCodeProps='fromLocationCode' :itemCodeProps='itemCode' :batchProps='batch' :showOnePop='showOnePop' @showFromLocationPopup='showFromLocationPopup'  @itemCodeClick='openScanPopup' @confirm='okToHoldRecordPackConfirm'   @getInputMsgResult="getInputMsgResult" @itemCodeScanMsg='itemCodeScanMsg'></okToHoldRecordPack>
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'" >
-		</win-scan-pack-and-location>
-		<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getFromLocation'
-			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
-		<comMessage ref="comMessage"></comMessage>
-	</view>
-</template>
-
-<script>
-	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
-	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
-	import comMoveRecordCard from '@/pages/inventoryMove/coms/comMoveRecordCard.vue'
-	import comBlankView from '@/mycomponents/common/comBlankView.vue'
-	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
-	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
-	import okToHoldRecordPack from '@/pages/inventoryMove/coms/okToHoldRecordPack.vue'
-
-	import {
-		getInventoryStatusName
-	} from '@/common/directory.js';
-	import {
-		inventoryMoveRecordSubmit,
-		getBasicLocationByCode,
-	} from '@/api/request2.js';
-
-	import {
-		getDirectoryItemArray
-	} from '@/common/directory.js';
-
-	import {
-		getPrecisionStrategyList
-	} from '@/common/balance.js';
-
-	import {
-		getPackingNumberAndBatchByList,
-		deepCopyData
-	} from '@/common/basic.js';
-
-	import {
-		getBusinessType,
-		createItemInfo,
-		createDetailInfo,
-		calcHandleQty,
-	} from '@/common/record.js';
-	
-	import {
-		calc
-	} from '@/common/calc.js';
-
-	export default {
-		components: {
-			comEmptyView,
-			winScanButton,
-			requiredLocation,
-			comMoveRecordCard,
-			comBlankView,
-			winScanLocation,
-			winScanPackAndLocation,
-			okToHoldRecordPack
-		},
-		props: {
-			// fromInventoryStatus: {
-			// 	type: String,
-			// 	default: ""
-			// },
-			// toInventoryStatus: {
-			// 	type: String,
-			// 	default: ""
-			// },
-			isShowStatus: {
-				type: Boolean,
-				default: true
-			},
-			allowEditStatus: {
-				type: Boolean,
-				default: false
-			},
-			businessTypeCode: {
-				type: String,
-				default: "Move"
-			}, //业务类型
-			// toLocationCode: {
-			// 	type: String,
-			// 	default: ""
-			// },
-			myTitle: {
-				type: String,
-				default: ""
-			},
-			// 是否显示第一层弹窗
-			showOnePop: {
-				type: Boolean,
-				default: false
-			},
-		},
-		data() {
-			return {
-				fromLocationCode: "",
-				fromLocationInfo: {},
-				toLocationCode: "",
-				toLocationInfo: {},
-				toLocationTypeArray: [],
-				toInventoryStatus: "",
-				businessType: {}, //业务类型
-				detailSource: [], //绑定在页面上的数据源
-				title: "",
-				dataContent: {},
-				fromLocationAreaTypeList: [],
-				toLocationAreaTypeList: [],
-				isShowEditLocation: false,
-				itemCode:'',
-				batch:'',
-			}
-		},
-
-		mounted() {
-			getBusinessType(this.businessTypeCode, res => {
-				if (res.success) {
-					this.businessType = res.businessType;
-					this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
-					this.toLocationAreaTypeList = res.toLocationAreaTypeList;
-					if(this.showOnePop){
-						console.log(this.$refs.okToHoldRecordPackRef)
-					this.$refs.okToHoldRecordPackRef.show = true
-						
-					}else{
-						this.showFromLocationPopup();
-					}
-				} else {
-					this.showErrorMessage(res.message)
-				}
-			});
-			this.initData();
-			this.getLocationInfo();
-		},
-
-
-		methods: {
-			initData() {
-				if (this.businessTypeCode == "Move") {
-					// this.title = "库存转移记录";
-					this.toInventoryStatus = ""
-					this.toLocationCode = ""
-					this.isShowEditLocation = true;
-				} else if (this.businessTypeCode == "HoldToOk") {
-					// this.title = "隔离转合格记录";
-					this.toInventoryStatus = "OK"
-					this.toLocationCode = ""
-					this.isShowEditLocation = true;
-				} else if (this.businessTypeCode == "HoldToScrap") {
-					// this.title = "隔离转报废记录";
-					this.toInventoryStatus = "SCRAP"
-					this.toLocationCode = ""
-					// this.toLocationCode = "SCRAP"
-				} else if (this.businessTypeCode == "OkToHold") {
-					// this.title = "合格转隔离记录";
-					this.toInventoryStatus = "HOLD"
-					this.toLocationCode = ""
-					// this.toLocationCode = "HOLD"
-				} else if (this.businessTypeCode == "OkToScrap") {
-					// this.title = "合格转报废记录";
-					this.toInventoryStatus = "SCRAP"
-					this.toLocationCode = ""
-					// this.toLocationCode = "SCRAP"
-				} else if (this.businessTypeCode == "ScrapToHold") {
-					// this.title = "报废转隔离记录";
-					this.toInventoryStatus = "HOLD"
-					// this.toLocationCode = "HOLD"
-					this.toLocationCode = ""
-				}
-				this.title = this.myTitle
-				uni.setNavigationBarTitle({
-					title: this.title
-				})
-			},
-			getLocationInfo() {
-				if (this.toLocationCode != "") {
-					getBasicLocationByCode(this.toLocationCode).then(res => {
-						if (res.data.total > 0) {
-							let result = res.data.list[0];
-							if (result.code != this.toLocationCode) {
-								this.showErrorMessage('未查询到库位[' + this.toLocationCode + ']')
-								return;
-							}
-							var type = result.type;
-							var available = result.available;
-							if (available == "TRUE") {
-								this.toLocationInfo = res.data.list[0];
-							} else {
-								this.showErrorMessage("扫描库位[" + this.code + "]不可用")
-							}
-						} else {
-							this.showErrorMessage('库位[' + this.toLocationCode + ']不存在')
-						}
-
-					}).catch(error => {
-						uni.hideLoading();
-						this.showErrorMessage(error)
-					})
-				}
-			},
-
-			openScanPopup() {
-				if (this.fromLocationCode == "") {
-					this.showFromLocationPopup();
-					return
-				}
-				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
-			},
-			showFromLocationPopup() {
-				this.$nextTick(() => {
-					this.$refs.scanFromLocationCode.openScanPopup();
-				})
-			},
-			getFromLocation(location) {
-				this.fromLocationCode = location.code;
-				this.fromLocationInfo = location;
-				if(!this.showOnePop){
-						this.openScanPopup();
-				}
-			},
-			getToLocation(location, code) {
-				this.toLocationCode = code;
-				this.toLocationInfo = location;
-			},
-			getScanResult(result,managementType) {
-				console.log(result)
-				if(this.showOnePop){
-					this.itemCode= result.label.itemCode
-					this.batch =  result.label.batch
-					this.getResult = result//存储接受的结果
-					this.$refs.scanPopup.closeScanPopup()
-					
-				}else{
-					if(managementType == "BY_BATCH" ||managementType == "BY_QUANTITY" ){
-						this.getScanResultAfterBatch(result)
-					}else{
-						this.getScanResultAfter(result)
-					}
-				}
-				
-			},
-			okToHoldRecordPackConfirm(obj){
-				// this.getResult. = result//存储接受的结果
-				if(!obj.fromLocationCode){
-					this.$refs.comMessage.showErrorMessage('请选择来源库位');
-					return;
-				}
-				if(!obj.itemCode){
-					this.$refs.comMessage.showErrorMessage('请选择零件');
-					return;
-				}
-				if(!obj.handleQty){
-					this.$refs.comMessage.showErrorMessage('请输入数量');
-					return;
-				}
-				// this.getResult.fromLocationCode = obj.fromLocationCode
-				this.getResult.label.batch = obj.handleQty
-				this.getResult.label.qty = obj.handleQty
-				this.getScanResultAfterBatch(this.getResult)
-			},
-			getScanResultAfter(result){
-				var balance = result.balance;
-				var pack = result.package;
-				var item = this.detailSource.find(res => {
-					if (res.itemCode == balance.itemCode) {
-						return res
-					}
-				})
-				if (item == undefined) {
-					var itemp = createItemInfo(balance, pack);
-					let newDetail = createDetailInfo(balance, pack);
-				
-					if (newDetail.packingNumber == '') {
-						newDetail.packingNumber = pack.number;
-					}
-				
-					if (this.businessTypeCode == "Move") {
-						newDetail.toInventoryStatus = balance.inventoryStatus;
-					} else {
-						newDetail.toInventoryStatus = this.toInventoryStatus;
-					}
-					newDetail.toLocationCode = this.toLocationCode;
-					newDetail.fromLocationCode = result.fromLocationCode
-					itemp.subList.push(newDetail);
-					this.detailSource.push(itemp)
-				} else {
-					var detail = item.subList.find(r => {
-						if (r.packingNumber == pack.number &&
-							r.batch == pack.batch &&
-							r.fromLocationCode == balance.locationCode &&
-							r.toInventoryStatus == balance.inventoryStatus &&
-							r.scaned == true) {
-							return r;
-						}
-					})
-				
-					if (detail == undefined) {
-						let newDetail = createDetailInfo(balance, pack);
-						// newDetail.inventoryStatus = balance.inventoryStatus;
-						if (this.businessTypeCode == "Move") {
-							newDetail.toInventoryStatus = balance.inventoryStatus;
-						} else {
-							newDetail.toInventoryStatus = this.toInventoryStatus;
-						}
-				
-						if (newDetail.packingNumber == '') {
-							newDetail.packingNumber = pack.number;
-						}
-						newDetail.toLocationCode = this.toLocationCode;
-						newDetail.fromLocationCode = result.fromLocationCode
-						item.subList.push(newDetail);
-					} else {
-						this.showErrorMessage("包装[" + detail.packingNumber + "]\n" +
-							"批次[" + detail.batch + "]\n" + "库位[" + detail.fromLocationCode + "]\n" +
-							"库存状态[" + getInventoryStatusName(detail.toInventoryStatus) + "]\n" +
-							"重复扫描")
-					}
-				}
-				calcHandleQty(this.detailSource);
-			},
-			getScanResultAfterBatch(result){
-				var balance = result.balance;
-				this.balanceInfo = result.balance;
-				var pack = result.package;
-				var item = this.detailSource.find(res => {
-					if (res.itemCode == balance.itemCode) {
-						return res
-					}
-				})
-				if (item == undefined) {
-					var itemp = createItemInfo(balance, pack);
-					let newDetail = createDetailInfo(balance, pack);
-				
-					if (newDetail.packingNumber == '') {
-						newDetail.packingNumber = pack.number;
-					}
-				
-					if (this.businessTypeCode == "Move") {
-						newDetail.toInventoryStatus = balance.inventoryStatus;
-					} else {
-						newDetail.toInventoryStatus = this.toInventoryStatus;
-					}
-					newDetail.toLocationCode = this.toLocationCode;
-					newDetail.fromLocationCode = result.fromLocationCode
-					newDetail.handleQty = Number(result.label.qty)
-					itemp.subList.push(newDetail);
-					this.detailSource.push(itemp)
-				} else {
-					console.log(233,this.detailSource)
-					console.log(988,balance.inventoryStatus)
-					var detail = item.subList.find(r => {
-						if (r.batch == pack.batch &&
-							r.fromLocationCode == balance.locationCode &&
-							r.toInventoryStatus == balance.inventoryStatus &&
-							r.scaned == true) {
-							return r;
-						}
-					})
-					if (detail == undefined) {
-						let newDetail = createDetailInfo(balance, pack);
-						// newDetail.inventoryStatus = balance.inventoryStatus;
-						if (this.businessTypeCode == "Move") {
-							newDetail.toInventoryStatus = balance.inventoryStatus;
-						} else {
-							newDetail.toInventoryStatus = this.toInventoryStatus;
-						}
-				
-						if (newDetail.packingNumber == '') {
-							newDetail.packingNumber = pack.number;
-						}
-						newDetail.toLocationCode = this.toLocationCode;
-						newDetail.fromLocationCode = result.fromLocationCode
-						item.subList.push(newDetail);
-					} else {
-					   detail.handleQty =calc.add(detail.handleQty, result.label.qty)
-					}
-				}
-				calcHandleQty(this.detailSource);
-			},
-			getInputMsgResult(result){
-				console.log('pooo',result)
-				if(!this.fromLocationCode){
-					this.$refs.scanFromLocationCode.getScanResult(result)
-				}else{
-					result.fromLocationCode = this.fromLocationCode
-					this.$refs.scanPopup.getScanResult(result)
-				}
-			},
-			showErrorMessage(message) {
-				if (this.$refs.scanPopup) {
-					this.$refs.scanPopup.packLoseFocus()
-				}
-				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {
-						if (this.$refs.scanPopup) {
-							this.$refs.scanPopup.packGetFocus()
-						}
-					}
-				});
-			},
-			updateData() {
-				calcHandleQty(this.detailSource);
-				for (var i = 0; i < this.detailSource.length; i++) {
-					let item = this.detailSource[i];
-					if (item.qty == 0) {
-						this.detailSource.splice(i, 1)
-					}
-				}
-			},
-
-			removePack() {
-				for (var i = 0; i < this.detailSource.length; i++) {
-					var item = this.detailSource[i];
-					if (item.subList.length == 0) {
-						this.detailSource.splice(i, 1)
-					}
-				}
-				this.updateData();
-			},
-
-
-			removeData(item) {
-				for (let i = 0; i < this.detailSource.length; i++) {
-					if (this.detailSource[i].itemCode == item.itemCode) {
-						this.detailSource.splice(i, 1)
-					}
-				}
-			},
-			showCommitSuccessMessage(hint) {
-				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					this.clearData()
-				})
-			},
-			clearData() {
-				this.fromLocationCode = '';
-				this.subList = [];
-				this.detailSource = [];
-				this.toLocationCode = '';
-				this.dataContent = {}
-				this.toWarehouseCode = ""
-			},
-			commit() {
-				if (this.toLocationCode == "") {
-					this.showErrorMessage("请先选择目标库位")
-					return;
-				}
-				// if(this.fromLocationCode==this.toLocationCode){
-				// 	this.showErrorMessage("来源库位和目标库位不能一致")
-				// 	return;
-				// }
-
-				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
-					//查询管理模式
-					uni.showLoading({
-						title: "提交中....",
-						mask: true
-					});
-					this.managementList = [];
-					var precisionStrategParams = this.setPrecisionStrategParams()
-
-					getPrecisionStrategyList(precisionStrategParams, res => {
-						if (res.success) {
-							this.managementList = res.list;
-							this.submit()
-						} else {
-							uni.hideLoading();
-							this.showErrorMessage(res.message);
-						}
-
-					})
-
-				} else {
-					this.showErrorMessage("没有要提交的数据,请先扫描")
-				}
-
-			},
-
-			submit() {
-				//目标库位和状态都一致时不可以提交
-				var params = this.setParams()
-				let hint = ""
-				this.dataContent.subList.forEach(res => {
-					if (res.fromLocationCode == res.toLocationCode) {
-						if (res.fromInventoryStatus == res.toInventoryStatus) {
-							var resultHint = res.fromPackingNumber ? `包装号【${res.fromPackingNumber}】` : ""
-							hint += resultHint + `来源库位与目标库位 来源状态与目标状态一致,不可以提交\n`
-						}
-					}
-				})
-				if (hint) {
-					uni.hideLoading()
-					this.$refs.comMessage.showQuestionMessage1(hint, 'red', res => {
-						if (res) {}
-					});
-					return;
-				}
-				// if(this.balanceInfo)
-				console.log("提交" ,params)
-
-				inventoryMoveRecordSubmit(params).then(res => {
-					uni.hideLoading()
-					if (res.data) {
-						this.showCommitSuccessMessage("提交成功\n生成" + this.title + "\n" +
-							res.data)
-					} else {
-						this.showErrorMessage("提交失败[" + res.msg + "]")
-					}
-				}).catch(error => {
-					uni.hideLoading()
-					this.showErrorMessage(error)
-				})
-			},
-
-			setPrecisionStrategParams() {
-				var itemList = []
-				this.detailSource.forEach(item => {
-					item.subList.forEach(detail => {
-						if (detail.scaned) {
-							detail.toLocationCode = this.toLocationCode;
-							var filterResult = itemList.filter(res => {
-								if (res.itemCode == item.itemCode &&
-									detail.toLocationCode == res.locationCode) {
-									return res
-								}
-							})
-							//去掉重复元素
-							if (filterResult.length == 0) {
-								var result = {
-									itemCode: item.itemCode,
-									locationCode: detail.toLocationCode
-								}
-								itemList.push(result)
-							}
-
-						}
-					})
-				})
-				return itemList;
-			},
-			setParams() {
-				var subList = []
-				var creator = this.$store.state.user.id
-				this.detailSource.forEach(item => {
-					item.subList.forEach(detail => {
-						if (detail.scaned) {
-							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
-								detail.packingNumber, detail.toLocationCode, detail.batch);
-							var submitItem = deepCopyData(detail)
-							console.log(233,submitItem)
-							console.log(244,info)
-							submitItem.itemCode = detail.itemCode;
-							submitItem.itemName = detail.package.itemName;
-							submitItem.itemDesc1 = detail.package.itemDesc1;
-							submitItem.itemDesc2 = detail.package.itemDesc2;
-
-							submitItem.fromInventoryStatus = detail.inventoryStatus;
-							submitItem.toInventoryStatus = detail.toInventoryStatus;
-
-							submitItem.fromPackingNumber = info.packingNumber;
-							submitItem.toPackingNumber = info.packingNumber;
-							submitItem.packingNumber = info.packingNumber;
-							submitItem.fromContainerNumber = detail.containerNumber;
-							submitItem.toContainerNumber = detail.containerNumber
-
-							submitItem.fromBatch = info.batch;
-							submitItem.toBatch = info.batch;
-
-							submitItem.fromLocationCode = detail.fromLocationCode;
-							submitItem.toLocationCode = detail.toLocationCode;
-
-							submitItem.package = null;
-							submitItem.Records = null;
-
-							submitItem.qty = detail.handleQty;
-
-							subList.push(submitItem)
-						}
-					})
-				})
-				this.dataContent.subList = subList;
-				this.dataContent.creator = creator;
-				this.dataContent.fromWarehouseCode = this.fromLocationInfo.warehouseCode;
-				this.dataContent.toWarehouseCode = this.toLocationInfo.warehouseCode;
-				this.dataContent.businessType = this.businessTypeCode;
-				return this.dataContent;
-			}
-		}
-	}
-</script>
-
-<style>
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class='split_line'></view>
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<com-move-record-card :dataContent="item" :index="index" @removeData="removeData"
+								:isShowStatus="isShowStatus" @updateData="updateData" @removePack='removePack'
+								:allowEditQty="true"
+								:allowEditStatus="allowEditStatus">
+							</com-move-record-card>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+						<!-- :isShowEdit="isShowEditLocation" -->
+						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocation'
+							:locationAreaTypeList="toLocationAreaTypeList" :isShowEdit='true'></requiredLocation>
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+		<!-- 合格转隔离单独的弹窗-->
+		<okToHoldRecordPack ref="okToHoldRecordPackRef" :fromLocationCodeProps='fromLocationCode' :itemCodeProps='itemCode' :batchProps='batch' :showOnePop='showOnePop'  :isClearFromLocationCode='isClearFromLocationCode' :isClearItemCode='isClearItemCode' @showFromLocationPopup='showFromLocationPopup'  @itemCodeClick='openScanPopup' @confirm='okToHoldRecordPackConfirm'   @getInputMsgResult="getInputMsgResult" @itemCodeScanMsg='itemCodeScanMsg'></okToHoldRecordPack>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' @clearItemCode='clearItemCode' :title="'箱码'" >
+		</win-scan-pack-and-location>
+		<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getFromLocation'
+			:locationAreaTypeList="fromLocationAreaTypeList" @clearFromLocation='clearFromLocation'></win-scan-location>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comMoveRecordCard from '@/pages/inventoryMove/coms/comMoveRecordCard.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import okToHoldRecordPack from '@/pages/inventoryMove/coms/okToHoldRecordPack.vue'
+
+	import {
+		getInventoryStatusName
+	} from '@/common/directory.js';
+	import {
+		inventoryMoveRecordSubmit,
+		getBasicLocationByCode,
+	} from '@/api/request2.js';
+
+	import {
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getPrecisionStrategyList
+	} from '@/common/balance.js';
+
+	import {
+		getPackingNumberAndBatchByList,
+		deepCopyData
+	} from '@/common/basic.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty,
+	} from '@/common/record.js';
+	
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	export default {
+		components: {
+			comEmptyView,
+			winScanButton,
+			requiredLocation,
+			comMoveRecordCard,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			okToHoldRecordPack
+		},
+		props: {
+			// fromInventoryStatus: {
+			// 	type: String,
+			// 	default: ""
+			// },
+			// toInventoryStatus: {
+			// 	type: String,
+			// 	default: ""
+			// },
+			isShowStatus: {
+				type: Boolean,
+				default: true
+			},
+			allowEditStatus: {
+				type: Boolean,
+				default: false
+			},
+			businessTypeCode: {
+				type: String,
+				default: "Move"
+			}, //业务类型
+			// toLocationCode: {
+			// 	type: String,
+			// 	default: ""
+			// },
+			myTitle: {
+				type: String,
+				default: ""
+			},
+			// 是否显示第一层弹窗
+			showOnePop: {
+				type: Boolean,
+				default: false
+			},
+		},
+		data() {
+			return {
+				fromLocationCode: "",
+				fromLocationInfo: {},
+				toLocationCode: "",
+				toLocationInfo: {},
+				toLocationTypeArray: [],
+				toInventoryStatus: "",
+				businessType: {}, //业务类型
+				detailSource: [], //绑定在页面上的数据源
+				title: "",
+				dataContent: {},
+				fromLocationAreaTypeList: [],
+				toLocationAreaTypeList: [],
+				isShowEditLocation: false,
+				itemCode:'',
+				batch:'',
+				isClearFromLocationCode:false,//是否清除输入框的来源库位
+				isClearItemCode:false,//是否清除输入框的零件和批次
+			}
+		},
+
+		mounted() {
+			getBusinessType(this.businessTypeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
+					this.toLocationAreaTypeList = res.toLocationAreaTypeList;
+					if(this.showOnePop){
+						console.log(this.$refs.okToHoldRecordPackRef)
+						this.$refs.okToHoldRecordPackRef.show = true
+					}else{
+						this.showFromLocationPopup();
+					}
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+			this.initData();
+			this.getLocationInfo();
+		},
+
+
+		methods: {
+			
+			initData() {
+				if (this.businessTypeCode == "Move") {
+					// this.title = "库存转移记录";
+					this.toInventoryStatus = ""
+					this.toLocationCode = ""
+					this.isShowEditLocation = true;
+				} else if (this.businessTypeCode == "HoldToOk") {
+					// this.title = "隔离转合格记录";
+					this.toInventoryStatus = "OK"
+					this.toLocationCode = ""
+					this.isShowEditLocation = true;
+				} else if (this.businessTypeCode == "HoldToScrap") {
+					// this.title = "隔离转报废记录";
+					this.toInventoryStatus = "SCRAP"
+					this.toLocationCode = ""
+					// this.toLocationCode = "SCRAP"
+				} else if (this.businessTypeCode == "OkToHold") {
+					// this.title = "合格转隔离记录";
+					this.toInventoryStatus = "HOLD"
+					this.toLocationCode = ""
+					// this.toLocationCode = "HOLD"
+				} else if (this.businessTypeCode == "OkToScrap") {
+					// this.title = "合格转报废记录";
+					this.toInventoryStatus = "SCRAP"
+					this.toLocationCode = ""
+					// this.toLocationCode = "SCRAP"
+				} else if (this.businessTypeCode == "ScrapToHold") {
+					// this.title = "报废转隔离记录";
+					this.toInventoryStatus = "HOLD"
+					// this.toLocationCode = "HOLD"
+					this.toLocationCode = ""
+				}
+				this.title = this.myTitle
+				uni.setNavigationBarTitle({
+					title: this.title
+				})
+			},
+			getLocationInfo() {
+				if (this.toLocationCode != "") {
+					getBasicLocationByCode(this.toLocationCode).then(res => {
+						if (res.data.total > 0) {
+							let result = res.data.list[0];
+							if (result.code != this.toLocationCode) {
+								this.showErrorMessage('未查询到库位[' + this.toLocationCode + ']')
+								return;
+							}
+							var type = result.type;
+							var available = result.available;
+							if (available == "TRUE") {
+								this.toLocationInfo = res.data.list[0];
+							} else {
+								this.showErrorMessage("扫描库位[" + this.code + "]不可用")
+							}
+						} else {
+							this.showErrorMessage('库位[' + this.toLocationCode + ']不存在')
+						}
+
+					}).catch(error => {
+						uni.hideLoading();
+						this.showErrorMessage(error)
+					})
+				}
+			},
+			
+			openScanPopup() {
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanFromLocationCode.openScanPopup();
+				})
+			},
+			getFromLocation(location) {
+				this.fromLocationCode = location.code;
+				this.fromLocationInfo = location;
+				if(!this.showOnePop){
+						this.openScanPopup();
+				}
+			},
+			getToLocation(location, code) {
+				this.toLocationCode = code;
+				this.toLocationInfo = location;
+			},
+			getScanResult(result,managementType) {
+				console.log(356,result)
+				if(this.showOnePop){
+					this.itemCode= result.balance.itemCode
+					this.batch =  result.balance.batch
+				console.log(357,this.itemCode)
+				console.log(358,this.batch )
+					this.getResult = result//存储接受的结果
+					this.$refs.scanPopup.closeScanPopup()
+					
+				}else{
+					if(managementType == "BY_BATCH" ||managementType == "BY_QUANTITY" ){
+						this.getScanResultAfterBatch(result)
+					}else{
+						this.getScanResultAfter(result)
+					}
+				}
+				
+			},
+			okToHoldRecordPackConfirm(obj){
+				// this.getResult. = result//存储接受的结果
+				if(!obj.fromLocationCode){
+					this.$refs.comMessage.showErrorMessage('请选择来源库位');
+					return;
+				}
+				if(!obj.itemCode){
+					this.$refs.comMessage.showErrorMessage('请选择零件');
+					return;
+				}
+				if(!obj.handleQty){
+					this.$refs.comMessage.showErrorMessage('请输入数量');
+					return;
+				}
+				// this.getResult.fromLocationCode = obj.fromLocationCode
+				this.getResult.label.batch = obj.handleQty
+				this.getResult.label.qty = obj.handleQty
+				this.getScanResultAfterBatch(this.getResult)
+			},
+			getScanResultAfter(result){
+				var balance = result.balance;
+				var pack = result.package;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack);
+				
+					if (newDetail.packingNumber == '') {
+						newDetail.packingNumber = pack.number;
+					}
+				
+					if (this.businessTypeCode == "Move") {
+						newDetail.toInventoryStatus = balance.inventoryStatus;
+					} else {
+						newDetail.toInventoryStatus = this.toInventoryStatus;
+					}
+					newDetail.toLocationCode = this.toLocationCode;
+					newDetail.fromLocationCode = result.fromLocationCode
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == pack.number &&
+							r.batch == pack.batch &&
+							r.fromLocationCode == balance.locationCode &&
+							r.toInventoryStatus == balance.inventoryStatus &&
+							r.scaned == true) {
+							return r;
+						}
+					})
+				
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						// newDetail.inventoryStatus = balance.inventoryStatus;
+						if (this.businessTypeCode == "Move") {
+							newDetail.toInventoryStatus = balance.inventoryStatus;
+						} else {
+							newDetail.toInventoryStatus = this.toInventoryStatus;
+						}
+				
+						if (newDetail.packingNumber == '') {
+							newDetail.packingNumber = pack.number;
+						}
+						newDetail.toLocationCode = this.toLocationCode;
+						newDetail.fromLocationCode = result.fromLocationCode
+						item.subList.push(newDetail);
+					} else {
+						this.showErrorMessage("包装[" + detail.packingNumber + "]\n" +
+							"批次[" + detail.batch + "]\n" + "库位[" + detail.fromLocationCode + "]\n" +
+							"库存状态[" + getInventoryStatusName(detail.toInventoryStatus) + "]\n" +
+							"重复扫描")
+					}
+				}
+				calcHandleQty(this.detailSource);
+			},
+			getScanResultAfterBatch(result){
+				var balance = result.balance;
+				this.balanceInfo = result.balance;
+				var pack = result.package;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack);
+				
+					if (newDetail.packingNumber == '') {
+						newDetail.packingNumber = pack.number;
+					}
+				
+					if (this.businessTypeCode == "Move") {
+						newDetail.toInventoryStatus = balance.inventoryStatus;
+					} else {
+						newDetail.toInventoryStatus = this.toInventoryStatus;
+					}
+					newDetail.toLocationCode = this.toLocationCode;
+					newDetail.fromLocationCode = result.fromLocationCode
+					newDetail.handleQty = Number(result.label.qty)
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.batch == pack.batch &&
+							r.fromLocationCode == balance.locationCode &&
+							r.scaned == true) {
+							return r;
+						}
+					})
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						// newDetail.inventoryStatus = balance.inventoryStatus;
+						if (this.businessTypeCode == "Move") {
+							newDetail.toInventoryStatus = balance.inventoryStatus;
+						} else {
+							newDetail.toInventoryStatus = this.toInventoryStatus;
+						}
+				
+						if (newDetail.packingNumber == '') {
+							newDetail.packingNumber = pack.number;
+						}
+						newDetail.toLocationCode = this.toLocationCode;
+						newDetail.fromLocationCode = result.fromLocationCode
+						item.subList.push(newDetail);
+					} else {
+					   detail.handleQty =calc.add(detail.handleQty, result.label.qty)
+					}
+				}
+				calcHandleQty(this.detailSource);
+			},
+			getInputMsgResult(result,fromWitch){
+				console.log('pooo',result)
+				if(fromWitch == 'fromLocationScanMsg'){
+					this.isClearFromLocationCode = false
					this.$refs.scanFromLocationCode.getScanResult(result)
				}else if(fromWitch == 'itemCodeScanMsg'){
+				console.log(7878,this.fromLocationCode)
					result.fromLocationCode = this.fromLocationCode
					this.$refs.scanPopup.getScanResult(result)
				}
+			},
+			// 清除来源库位
+			clearFromLocation(fromLocationCodeParams){
+				this.fromLocationCode = fromLocationCodeParams
+				console.log('rwyrwey',this.fromLocationCode)
+				this.isClearFromLocationCode = true
+			},
+			// 清除零件
+			clearItemCode(itemCodeParams){
+				this.itemCode = itemCodeParams
+				this.isClearItemCode = true
+			},
+			showErrorMessage(message) {
+				if (this.$refs.scanPopup) {
+					this.$refs.scanPopup.packLoseFocus()
+				}
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						if (this.$refs.scanPopup) {
+							this.$refs.scanPopup.packGetFocus()
+						}
+					}
+				});
+			},
+			updateData() {
+				calcHandleQty(this.detailSource);
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+
+			removeData(item) {
+				for (let i = 0; i < this.detailSource.length; i++) {
+					if (this.detailSource[i].itemCode == item.itemCode) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData()
+				})
+			},
+			clearData() {
+				this.fromLocationCode = '';
+				this.subList = [];
+				this.detailSource = [];
+				this.toLocationCode = '';
+				this.dataContent = {}
+				this.toWarehouseCode = ""
+			},
+			commit() {
+				if (this.toLocationCode == "") {
+					this.showErrorMessage("请先选择目标库位")
+					return;
+				}
+				// if(this.fromLocationCode==this.toLocationCode){
+				// 	this.showErrorMessage("来源库位和目标库位不能一致")
+				// 	return;
+				// }
+
+				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
+					//查询管理模式
+					uni.showLoading({
+						title: "提交中....",
+						mask: true
+					});
+					this.managementList = [];
+					var precisionStrategParams = this.setPrecisionStrategParams()
+
+					getPrecisionStrategyList(precisionStrategParams, res => {
+						if (res.success) {
+							this.managementList = res.list;
+							this.submit()
+						} else {
+							uni.hideLoading();
+							this.showErrorMessage(res.message);
+						}
+
+					})
+
+				} else {
+					this.showErrorMessage("没有要提交的数据,请先扫描")
+				}
+
+			},
+
+			submit() {
+				//目标库位和状态都一致时不可以提交
+				var params = this.setParams()
+				let hint = ""
+				this.dataContent.subList.forEach(res => {
+					if (res.fromLocationCode == res.toLocationCode) {
+						if (res.fromInventoryStatus == res.toInventoryStatus) {
+							var resultHint = res.fromPackingNumber ? `包装号【${res.fromPackingNumber}】` : ""
+							hint += resultHint + `来源库位与目标库位 来源状态与目标状态一致,不可以提交\n`
+						}
+					}
+				})
+				if (hint) {
+					uni.hideLoading()
+					this.$refs.comMessage.showQuestionMessage1(hint, 'red', res => {
+						if (res) {}
+					});
+					return;
+				}
+				// if(this.balanceInfo)
+				console.log("提交" ,params)
+
+				inventoryMoveRecordSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功\n生成" + this.title + "\n" +
+							res.data)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			setPrecisionStrategParams() {
+				var itemList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.toLocationCode = this.toLocationCode;
+							var filterResult = itemList.filter(res => {
+								if (res.itemCode == item.itemCode &&
+									detail.toLocationCode == res.locationCode) {
+									return res
+								}
+							})
+							//去掉重复元素
+							if (filterResult.length == 0) {
+								var result = {
+									itemCode: item.itemCode,
+									locationCode: detail.toLocationCode
+								}
+								itemList.push(result)
+							}
+
+						}
+					})
+				})
+				return itemList;
+			},
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.toLocationCode, detail.batch);
+							var submitItem = deepCopyData(detail)
+							console.log(233,submitItem)
+							console.log(244,info)
+							submitItem.itemCode = detail.itemCode;
+							submitItem.itemName = detail.package.itemName;
+							submitItem.itemDesc1 = detail.package.itemDesc1;
+							submitItem.itemDesc2 = detail.package.itemDesc2;
+
+							submitItem.fromInventoryStatus = detail.inventoryStatus;
+							submitItem.toInventoryStatus = detail.toInventoryStatus;
+
+							submitItem.fromPackingNumber = info.packingNumber;
+							submitItem.toPackingNumber = info.packingNumber;
+							submitItem.packingNumber = info.packingNumber;
+							submitItem.fromContainerNumber = detail.containerNumber;
+							submitItem.toContainerNumber = detail.containerNumber
+
+							submitItem.fromBatch = info.batch;
+							submitItem.toBatch = info.batch;
+
+							submitItem.fromLocationCode = detail.fromLocationCode;
+							submitItem.toLocationCode = detail.toLocationCode;
+
+							submitItem.package = null;
+							submitItem.Records = null;
+
+							submitItem.qty = detail.handleQty;
+
+							subList.push(submitItem)
+						}
+					})
+				})
+				this.dataContent.subList = subList;
+				this.dataContent.creator = creator;
+				this.dataContent.fromWarehouseCode = this.fromLocationInfo.warehouseCode;
+				this.dataContent.toWarehouseCode = this.toLocationInfo.warehouseCode;
+				this.dataContent.businessType = this.businessTypeCode;
+				return this.dataContent;
+			}
+		}
+	}
+</script>
+
+<style>
 </style>
\ No newline at end of file
diff --git a/src/pages/inventoryMove/coms/okToHoldRecordPack.vue b/src/pages/inventoryMove/coms/okToHoldRecordPack.vue
index 3ddc1ce5..d30b9cfb 100644
--- a/src/pages/inventoryMove/coms/okToHoldRecordPack.vue
+++ b/src/pages/inventoryMove/coms/okToHoldRecordPack.vue
@@ -5,7 +5,7 @@
 				<view class="title-txt">
 						需求信息
 				</view>
-				<u-icon name="close" color="#4f4f4f" size="28"></u-icon>
+				<u-icon name="close" color="#4f4f4f" size="28"  @click="showOne = false"></u-icon>
 			</view>
 			<view class="item">
 				<view class="label">来源库位：</view>
@@ -36,7 +36,7 @@
 				</view>
 			</view>
 			<view class="uni-flex uni-row hide_border">
-				<button class="btn_edit_big_cancle" hover-class="btn_edit_big_after" @click="cancel()">取消</button>
+				<button class="btn_edit_big_cancle" hover-class="btn_edit_big_after" @click="showOne = false">取消</button>
 				<button class="btn_edit_big_confirm" hover-class="btn_edit_big_after" @click="confirm()">确认</button>
 			</view>
 		</u-popup>
@@ -91,6 +91,14 @@
 				type: String,
 				default: ''
 			},
+			isClearFromLocationCode:{
+				type: Boolean,
+				default: false
+			},
+			isClearItemCode:{
+				type: Boolean,
+				default: false
+			},
 		},
 		mounted() {
 		},
@@ -103,6 +111,10 @@
 			// 显示箱码
 			itemCodeClick(){
 				// this.$refs.scanLocationCode.openScanPopup()
+				if(!this.fromLocationCode){
+					this.$refs.comMessage.showMessage("请先扫描来源库位")
+					return
+				}
 				this.$emit("itemCodeClick");
 			},
 			confirm(){
@@ -117,12 +129,19 @@
 				this.$emit("confirm",obj);
 			},
 			fromLocationScanMsg(){
+				console.log(111,this.fromLocationCode)
 				this.scanMsg = this.fromLocationCode
+				this.fromWitch = 'fromLocationScanMsg'
 				this.handelScanMsg()
 			},
 			itemCodeScanMsg(){
-					this.scanMsg = this.itemCode
-					this.handelScanMsg()
+				if(!this.fromLocationCode){
+					this.$refs.comMessage.showMessage("请先扫描来源库位")
+					return
+				}
+				this.fromWitch = 'itemCodeScanMsg'
+				this.scanMsg = this.itemCode
+				this.handelScanMsg()
 			},
 			handelScanMsg() {
 				//点击了回车
@@ -131,7 +150,7 @@
 				// 	mask: true
 				// })
 				let that = this;
-				console.log(that.scanMsg)
+				console.log(777,that.scanMsg)
 				// if(index==-1){
 				// 	that.scanMsg =that.scanMsg + "\n";
 				// }
@@ -162,7 +181,8 @@
 							scanResult.scanMessage = content
 							if (scanResult.success) {
 								// that.getfocus();//不能自动获取焦点
-								that.$emit("getInputMsgResult", scanResult);
+								console.log(scanResult)
+								that.$emit("getInputMsgResult", scanResult,this.fromWitch);
 							} else {
 								that.losefocus();
 								this.$refs.comMessage.showErrorMessage(scanResult.message, res => {
@@ -183,12 +203,28 @@
 			},
 		},
 		watch: {
-			fromLocationCodeProps(newVal) {
-				console.log(newVal)
-				this.fromLocationCode  = newVal
+			fromLocationCodeProps:{
+				handler(newVal, oldVal) {
+					console.log('wer',this.isClearFromLocationCode)
+					console.log('wer',newVal)
+					if(this.isClearFromLocationCode){
+						this.fromLocationCode=''
+					}else{
+					this.fromLocationCode  = newVal
+					}
+				},
+				// deep: true,
+				// immediate: true
 			},
-			itemCodeProps(newVal) {
-				this.itemCode  = newVal
+			itemCodeProps: {
+				handler(newVal, oldVal) {
+					if(this.isClearItemCode){
+						this.itemCode=''
+						this.batch=''
+					}else{
+						this.itemCode  = newVal
+					}
+				},
 			},
 			batchProps(newVal) {
 				this.batch  = newVal