diff --git a/src/mycomponents/scan/winComScanBalance.vue b/src/mycomponents/scan/winComScanBalance.vue
index f9bb581c..b8f165a8 100644
--- a/src/mycomponents/scan/winComScanBalance.vue
+++ b/src/mycomponents/scan/winComScanBalance.vue
@@ -297,6 +297,7 @@
 				// this.closeScanPopup()
 			},
 			closeScanPopup() {
+				this.losefocus();
 				this.$refs.popup.close()
 			},
 			getfocus() {
diff --git a/src/mycomponents/scan/winComScanBalanceLocation.vue b/src/mycomponents/scan/winComScanBalanceLocation.vue
index 8e80ff8f..8c857800 100644
--- a/src/mycomponents/scan/winComScanBalanceLocation.vue
+++ b/src/mycomponents/scan/winComScanBalanceLocation.vue
@@ -277,6 +277,7 @@
 				// this.closeScanPopup()
 			},
 			closeScanPopup() {
+				this.packLoseFocus()
 				this.$refs.popup.close()
 				this.$emit("onCloseScanPopup")
 			},
diff --git a/src/mycomponents/scan/winScanAsnNumber.vue b/src/mycomponents/scan/winScanAsnNumber.vue
index d01b5cbd..100a1c68 100644
--- a/src/mycomponents/scan/winScanAsnNumber.vue
+++ b/src/mycomponents/scan/winScanAsnNumber.vue
@@ -60,6 +60,10 @@
 				}, 500)
 			},
 			closeScanPopup() {
+				if(this.$refs.scan){
+					this.$refs.scan.losefocus()
+				}
+				
 				this.$refs.popup.close()
 			},
 			getfocus() {
diff --git a/src/mycomponents/scan/winScanContainer.vue b/src/mycomponents/scan/winScanContainer.vue
index 806a650b..d7323344 100644
--- a/src/mycomponents/scan/winScanContainer.vue
+++ b/src/mycomponents/scan/winScanContainer.vue
@@ -12,8 +12,8 @@
 			</view>
 			<view class="">
 				<view class="">
-					<win-com-scan ref="scan" headerType='HCQ' @getResult="getScanResult" :placeholder='title' :clearResult="true"
-						:boxFocus="true" :isShowHistory="isShowHistory">
+					<win-com-scan ref="scan" headerType='HCQ' @getResult="getScanResult" :placeholder='title'
+						:clearResult="true" :boxFocus="true" :isShowHistory="isShowHistory">
 					</win-com-scan>
 				</view>
 			</view>
@@ -59,6 +59,7 @@
 				}, 500)
 			},
 			closeScanPopup() {
+				this.losefocus()
 				this.$refs.popup.close()
 			},
 			scanClick() {
@@ -81,7 +82,8 @@
 						if (this.containerInfo.containerStatus == 'USED') {
 							this.callBack();
 						} else {
-							this.showErrorMessage("器具[" + this.code + "]状态是[" + this.containerInfo.status + "],不可以绑定")
+							this.showErrorMessage("器具[" + this.code + "]状态是[" + this.containerInfo.status +
+								"],不可以绑定")
 						}
 					} else {
 						this.showErrorMessage("未查找到器具[" + this.code + "]")
@@ -97,10 +99,16 @@
 				this.$emit("getContainer", this.containerInfo);
 			},
 			getfocus() {
-				this.$refs.scan.getfocus();
+				if (this.$refs.scan) {
+					this.$refs.scan.getfocus();
+				}
+
 			},
 			losefocus() {
-				this.$refs.scan.losefocus();
+				if (this.$refs.scan) {
+					this.$refs.scan.losefocus();
+				}
+
 			},
 			showErrorMessage(message) {
 				setTimeout(r => {
@@ -116,4 +124,4 @@
 </script>
 
 <style>
-</style>
+</style>
\ No newline at end of file
diff --git a/src/mycomponents/scan/winScanItem.vue b/src/mycomponents/scan/winScanItem.vue
index abda6b65..aee8b8d7 100644
--- a/src/mycomponents/scan/winScanItem.vue
+++ b/src/mycomponents/scan/winScanItem.vue
@@ -81,6 +81,7 @@
 				}, 500)
 			},
 			closeScanPopup() {
+				this.losefocus();
 				this.$refs.popup.close()
 			},
 			scanClick() {
diff --git a/src/mycomponents/scan/winScanJobNumber.vue b/src/mycomponents/scan/winScanJobNumber.vue
index 21679a53..e12dfbfe 100644
--- a/src/mycomponents/scan/winScanJobNumber.vue
+++ b/src/mycomponents/scan/winScanJobNumber.vue
@@ -66,6 +66,9 @@
 				}, 500)
 			},
 			closeScanPopup() {
+				if(this.$refs.scan){
+					this.$refs.scan.losefocus()
+				}
 				this.$refs.popup.close()
 			},
 			getfocus() {
diff --git a/src/mycomponents/scan/winScanLocation.vue b/src/mycomponents/scan/winScanLocation.vue
index 66531474..70f3aeea 100644
--- a/src/mycomponents/scan/winScanLocation.vue
+++ b/src/mycomponents/scan/winScanLocation.vue
@@ -74,6 +74,7 @@
 				this.$refs.comscansimulate.clickScanMsg();
 			},
 			closeScanPopup() {
+				this.losefocus()
 				if(this.$refs.popup){
 					this.$refs.popup.close()
 				}
diff --git a/src/mycomponents/scan/winScanPack.vue b/src/mycomponents/scan/winScanPack.vue
index 9c0108bf..4fa855f5 100644
--- a/src/mycomponents/scan/winScanPack.vue
+++ b/src/mycomponents/scan/winScanPack.vue
@@ -76,6 +76,7 @@
 			},
 
 			closeScanPopup() {
+				this.losefocus();
 				this.$refs.popup.close();
 				this.$emit("close", '');
 			},
diff --git a/src/mycomponents/scan/winScanPackAndCont.vue b/src/mycomponents/scan/winScanPackAndCont.vue
index fdccde6a..e71b2eaf 100644
--- a/src/mycomponents/scan/winScanPackAndCont.vue
+++ b/src/mycomponents/scan/winScanPackAndCont.vue
@@ -67,6 +67,7 @@
 			},
 
 			closeScanPopup() {
+				this.losefocus()
 				this.$refs.popup.close();
 				this.$emit("close", '');
 			},
diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index 33f087ec..d155e0a7 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -218,6 +218,7 @@
 			},
 
 			closeScanPopup(content) {
+				this.packLoseFocus()
 				this.$refs.popup.close();
 				this.$emit("close", '');
 			},
diff --git a/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue
index 843346f0..48412d12 100644
--- a/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue
+++ b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue
@@ -166,6 +166,7 @@
 			},
 
 			closeScanPopup(content) {
+				this.packLoseFocus()
 				this.$refs.popup.close();
 				this.$emit("close", '');
 			},
diff --git a/src/mycomponents/scan/winScanPackAndPosition.vue b/src/mycomponents/scan/winScanPackAndPosition.vue
index a23b342a..1ee6edc6 100644
--- a/src/mycomponents/scan/winScanPackAndPosition.vue
+++ b/src/mycomponents/scan/winScanPackAndPosition.vue
@@ -127,6 +127,7 @@
 			},
 
 			closeScanPopup() {
+				this.losefocus()
 				this.$refs.popup.close();
 				this.$emit("close", '');
 			},
diff --git a/src/mycomponents/scan/winScanPackLevel.vue b/src/mycomponents/scan/winScanPackLevel.vue
index dec3bf0b..6c78f008 100644
--- a/src/mycomponents/scan/winScanPackLevel.vue
+++ b/src/mycomponents/scan/winScanPackLevel.vue
@@ -102,6 +102,7 @@
 			},
 
 			closeScanPopup() {
+				this.losefocus()
 				this.$refs.popup.close();
 				this.$emit("close", '');
 			},
diff --git a/src/mycomponents/scan/winScanPackage.vue b/src/mycomponents/scan/winScanPackage.vue
index a710f171..ffb26638 100644
--- a/src/mycomponents/scan/winScanPackage.vue
+++ b/src/mycomponents/scan/winScanPackage.vue
@@ -83,6 +83,7 @@
 
 
 			closeScanPopup() {
+				this.losefocus()
 				this.$refs.popup.close();
 				this.$emit("close", '');
 			},
diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue
index c7bcd734..b3be171d 100644
--- a/src/pages/issue/coms/comScanIssuePack.vue
+++ b/src/pages/issue/coms/comScanIssuePack.vue
@@ -218,6 +218,7 @@
 			},
 
 			closeScanPopup() {
+				this.losefocus()
 				this.$refs.popup.close();
 				this.$emit("closeScan")
 				//清除数据，恢复默认值
@@ -317,9 +318,9 @@
 								result.balance = res.data[0]
 
 								if (result.label.packingNumber != result.balance.packingNumber) {
-									result.balance.handleQty = Number(result.label.qty)
+									result.balance.qty = Number(result.label.qty)
 								} else {
-									result.balance.handleQty = Number(result.balance.qty)
+									result.balance.qty = Number(result.balance.qty)
 								}
 								this.afterGetBalance(result.label, result.balance, result.package);
 							} else {
diff --git a/src/pages/package/coms/comScanPackagePack.vue b/src/pages/package/coms/comScanPackagePack.vue
index d8909f22..08a54ef8 100644
--- a/src/pages/package/coms/comScanPackagePack.vue
+++ b/src/pages/package/coms/comScanPackagePack.vue
@@ -81,6 +81,7 @@ import { getDirectoryItemArray } from '@/common/directory';
 			},
 
 			closeScanPopup() {
+				this.packLoseFocus()
 				this.$emit("closeScan")
 			},
 
@@ -343,17 +344,17 @@ import { getDirectoryItemArray } from '@/common/directory';
 				this.getfocus();
 			},
 
-			getfocus() {
-				if (this.$refs.scanPopup ) {
-					this.$refs.scanPopup.getfocus();
-				}
-			},
+			// getfocus() {
+			// 	if (this.$refs.scanPopup ) {
+			// 		this.$refs.scanPopup.packGetFocus();
+			// 	}
+			// },
 
-			losefocus() {
-				if (this.$refs.scanPopup ) {
-					this.$refs.scanPopup.losefocus();
-				}
-			},
+			// losefocus() {
+			// 	if (this.$refs.scanPopup ) {
+			// 		this.$refs.scanPopup.packLoseFocus();
+			// 	}
+			// },
 
 			swipeClick(e, item, index) {
 				if (e.content.text == "详情") {
@@ -399,10 +400,15 @@ import { getDirectoryItemArray } from '@/common/directory';
 			},
 
 			packGetFocus() {
-				this.$refs.scanPopup.getfocus();
+				if(this.$refs.scanPopup){
+					this.$refs.scanPopup.packGetFocus();
+				}
 			},
 			packLoseFocus() {
-				this.$refs.scanPopup.packLoseFocus();
+				if(this.$refs.scanPopup){
+					this.$refs.scanPopup.packLoseFocus();
+				}
+				
 			},
 			showMessage(message, callback) {
 				setTimeout(r => {
diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue
index 4e2e0b27..e15632fc 100644
--- a/src/pages/package/record/overPackageRecord.vue
+++ b/src/pages/package/record/overPackageRecord.vue
@@ -322,6 +322,7 @@
 			},
 
 			showErrorMessage(message) {
+				this.scanPopupLoseFocus();
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
 						this.scanPopupGetFocus()
@@ -361,6 +362,11 @@
 					this.$refs.scanPopup.getfocus();
 				}
 			},
+			scanPopupLoseFocus() {
+				if (this.$refs.scanPopup) {
+					this.$refs.scanPopup.losefocus();
+				}
+			},
 			commit() {
 				// if(!this.dataContent.printerUuid){
 				// 	this.showErrorMessage("请选择打印机")
diff --git a/src/pages/productionReturn/coms/comScanReturnPack.vue b/src/pages/productionReturn/coms/comScanReturnPack.vue
index 3e3b0115..290b934d 100644
--- a/src/pages/productionReturn/coms/comScanReturnPack.vue
+++ b/src/pages/productionReturn/coms/comScanReturnPack.vue
@@ -174,6 +174,7 @@
 			},
 
 			closeScanPopup() {
+				this.losefocus();
 				this.$refs.popup.close();
 				this.$emit("closeScan")
 				//清除数据，恢复默认值
@@ -467,13 +468,13 @@
 			},
 			showMessage(message, callback) {
 				setTimeout(r => {
-					this.packLoseFocus();
+					this.losefocus();
 					this.$refs.comMessage.showMessage(message, callback);
 				})
 			},
 			showErrorMessage(message, callback) {
 				setTimeout(r => {
-					this.packLoseFocus();
+					this.losefocus();
 					this.$refs.comMessage.showErrorMessage(message, callback);
 
 				})
diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue
index c4fc1f3d..b65006d4 100644
--- a/src/pages/repleinsh/coms/comScanReplishPack.vue
+++ b/src/pages/repleinsh/coms/comScanReplishPack.vue
@@ -180,6 +180,7 @@
 			},
 
 			closeScanPopup() {
+				this.losefocus()
 				this.$refs.popup.close();
 				this.$emit("closeScan")
 				//清除数据，恢复默认值
@@ -310,9 +311,9 @@
 								result.balance = res.data[0]
 
 								if (result.label.packingNumber != result.balance.packingNumber) {
-									result.balance.handleQty = Number(result.label.qty)
+									result.balance.qty = Number(result.label.qty)
 								} else {
-									result.balance.handleQty = Number(result.balance.qty)
+									result.balance.qty = Number(result.balance.qty)
 								}
 								this.afterGetBalance(result.label, result.balance, result.package);
 							} else {
diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue
index 05da5644..54c654d0 100644
--- a/src/pages/repleinsh/job/repleinshJob.vue
+++ b/src/pages/repleinsh/job/repleinshJob.vue
@@ -10,7 +10,7 @@
 			:productionline="productionlineList" ref="filter" otherTitle="" @switchChangeToday="switchChangeToday"
 			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
 			:checkedWaitTask="checkedWaitTask" :isShowItemCode="true" @productionLineCode="productionLineCode"
-			@fromLocationCode="fromLocationCode" :isShowQurery='true' @onQuery="getListByFilter">
+			@fromLocationCode="fromLocationCodeQuery" :isShowQurery='true' @onQuery="getListByFilter">
 		</job-filter>
 		<view v-if="jobList.length>0">
 			<uni-swipe-action ref="swipeAction">
@@ -328,7 +328,7 @@
 
 
 
-			fromLocationCode(fromLocationCode) {
+			fromLocationCodeQuery(fromLocationCode) {
 				console.log('fromLocationCode', fromLocationCode)
 				this.fromLocationCode = fromLocationCode
 				this.getList('refresh', this.fromLocationCode, this.filterItemCode)
diff --git a/src/pages/stockUp/coms/comScanStockUpPack.vue b/src/pages/stockUp/coms/comScanStockUpPack.vue
index 5d72bcb0..038b5849 100644
--- a/src/pages/stockUp/coms/comScanStockUpPack.vue
+++ b/src/pages/stockUp/coms/comScanStockUpPack.vue
@@ -188,6 +188,7 @@ import { getDirectoryItemArray } from '../../../common/directory.js';
 			},
 
 			closeScanPopup() {
+				this.losefocus();
 				this.$refs.popup.close();
 				this.$emit("closeScan")
 				//清除数据，恢复默认值