合格转隔离需求 YT-734pda所有功能提示问题，扫描库位的，扫描的是箱码，提示输入库位为空；扫描箱码，扫描的是库位，提示输入的箱码为空

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 => {

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 {

src/pages/inventoryMove/coms/comMoveRecord.vue

@@ -35,11 +35,11 @@
 			<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>
+		<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' :title="'箱码'" >
+		<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"></win-scan-location>
+			:locationAreaTypeList="fromLocationAreaTypeList" @clearFromLocation='clearFromLocation'></win-scan-location>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -149,6 +149,8 @@
 				isShowEditLocation: false,
 				itemCode:'',
 				batch:'',
+				isClearFromLocationCode:false,//是否清除输入框的来源库位
+				isClearItemCode:false,//是否清除输入框的零件和批次
 			}
 		},
 
@@ -161,7 +163,6 @@
 					if(this.showOnePop){
 						console.log(this.$refs.okToHoldRecordPackRef)
 						this.$refs.okToHoldRecordPackRef.show = true
-						
 					}else{
 						this.showFromLocationPopup();
 					}
@@ -175,6 +176,7 @@
 
 
 		methods: {
+			
 			initData() {
 				if (this.businessTypeCode == "Move") {
 					// this.title = "库存转移记录";
@@ -263,10 +265,12 @@
 				this.toLocationInfo = location;
 			},
 			getScanResult(result,managementType) {
-				console.log(result)
+				console.log(356,result)
 				if(this.showOnePop){
-					this.itemCode= result.label.itemCode
+					this.itemCode= result.balance.itemCode
-					this.batch =  result.label.batch
+					this.batch =  result.balance.batch
+				console.log(357,this.itemCode)
+				console.log(358,this.batch )
 					this.getResult = result//存储接受的结果
 					this.$refs.scanPopup.closeScanPopup()
 					
@@ -386,12 +390,9 @@
 					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;
 						}
@@ -417,14 +418,22 @@
 				}
 				calcHandleQty(this.detailSource);
 			},
-			getInputMsgResult(result){
+			getInputMsgResult(result,fromWitch){
 				console.log('pooo',result)
-				if(!this.fromLocationCode){
+				if(fromWitch == 'fromLocationScanMsg'){
-					this.$refs.scanFromLocationCode.getScanResult(result)
+					this.isClearFromLocationCode = false
					this.$refs.scanFromLocationCode.getScanResult(result)
				}else if(fromWitch == 'itemCodeScanMsg'){
-				}else{
+				console.log(7878,this.fromLocationCode)
					result.fromLocationCode = this.fromLocationCode
					this.$refs.scanPopup.getScanResult(result)
				}
-					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) {

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,10 +129,17 @@
 				this.$emit("confirm",obj);
 			},
 			fromLocationScanMsg(){
+				console.log(111,this.fromLocationCode)
 				this.scanMsg = this.fromLocationCode
+				this.fromWitch = 'fromLocationScanMsg'
 				this.handelScanMsg()
 			},
 			itemCodeScanMsg(){
+				if(!this.fromLocationCode){
+					this.$refs.comMessage.showMessage("请先扫描来源库位")
+					return
+				}
+				this.fromWitch = 'itemCodeScanMsg'
 				this.scanMsg = this.itemCode
 				this.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) {
+			fromLocationCodeProps:{
-				console.log(newVal)
+				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) {
+			itemCodeProps: {
+				handler(newVal, oldVal) {
+					if(this.isClearItemCode){
+						this.itemCode=''
+						this.batch=''
+					}else{
 						this.itemCode  = newVal
+					}
+				},
 			},
 			batchProps(newVal) {
 				this.batch  = newVal