From 89e4ee684a51b95d4fee3e68fd7610ee511eb098 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 9 Aug 2024 10:11:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E8=B4=A7=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/deliver/coms/comScanDeliverPack.vue | 1 +
 src/pages/deliver/record/deliverRecord.vue    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/deliver/coms/comScanDeliverPack.vue b/src/pages/deliver/coms/comScanDeliverPack.vue
index a1117ff1..5592f322 100644
--- a/src/pages/deliver/coms/comScanDeliverPack.vue
+++ b/src/pages/deliver/coms/comScanDeliverPack.vue
@@ -190,6 +190,7 @@
 			},
 
 			closeScanPopup() {
+				this.losefocus()
 				this.$refs.popup.close();
 				this.$emit("closeScan")
 				//清除数据，恢复默认值
diff --git a/src/pages/deliver/record/deliverRecord.vue b/src/pages/deliver/record/deliverRecord.vue
index 743c3303..c73e5ba5 100644
--- a/src/pages/deliver/record/deliverRecord.vue
+++ b/src/pages/deliver/record/deliverRecord.vue
@@ -45,7 +45,7 @@
 			<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		</view>
 
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' headerType="HMQ"></win-scan-pack-and-location>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' headerType="HPQ,HMQ"></win-scan-pack-and-location>
 		<comMessage ref="comMessage"></comMessage>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
 			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>