From 07e193f3e263c6270206e88c1e6d634fabb658dd Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 9 Aug 2024 15:10:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BF=BB=E5=8C=85=E7=84=A6?=
 =?UTF-8?q?=E7=82=B9=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/package/coms/comScanPackagePack.vue | 30 ++++++-------------
 .../repleinsh/coms/comScanReplishPack.vue     |  1 +
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/pages/package/coms/comScanPackagePack.vue b/src/pages/package/coms/comScanPackagePack.vue
index 08a54ef8..e1e04d3d 100644
--- a/src/pages/package/coms/comScanPackagePack.vue
+++ b/src/pages/package/coms/comScanPackagePack.vue
@@ -133,7 +133,7 @@ import { getDirectoryItemArray } from '@/common/directory';
 				if (item == undefined) {
 					this.showErrorMessage('未查找到物料【' + itemCode + '】的翻包明细',
 						res => {
-							this.getfocus();
+							this.packGetFocus();
 						}
 					)
 				} else {
@@ -162,7 +162,7 @@ import { getDirectoryItemArray } from '@/common/directory';
 					if (item == undefined) {
 						that.showErrorMessage('未查找到物料【' + itemCode + '】的翻包明细',
 							res => {
-								that.getfocus();
+								that.packGetFocus();
 							}
 						)
 						return;
@@ -170,7 +170,7 @@ import { getDirectoryItemArray } from '@/common/directory';
 						// if(that.packageInfo.packUnit!=item.Locations[0].Batchs[0].fromPackUnit){
 						// 	that.showErrorMessage("扫描包装规格【"+that.packageInfo.packUnit+"】与任务包装规格【"+item.Locations[0].Batchs[0].fromPackUnit+"】不一致",
 						// 		res => {
-						// 			that.getfocus();
+						// 			that.packGetFocus();
 						// 		}
 						// 	)
 						// 	return;
@@ -241,7 +241,7 @@ import { getDirectoryItemArray } from '@/common/directory';
 										} else {
 											that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
 												res => {
-													that.getfocus();
+													that.packGetFocus();
 												}
 											)
 										}
@@ -252,7 +252,7 @@ import { getDirectoryItemArray } from '@/common/directory';
 							} else {
 								that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
 									res => {
-										that.getfocus();
+										that.packGetFocus();
 									}
 								)
 							}
@@ -272,21 +272,21 @@ import { getDirectoryItemArray } from '@/common/directory';
 							} else {
 								that.showErrorMessage('未查找到批次【' + lot + '】的翻包明细',
 									res => {
-										that.getfocus();
+										that.packGetFocus();
 									});
 							}
 						}
 					} else {
 						that.showErrorMessage('未查找到推荐库位【' + that.fromLocationCode + '】的翻包明细',
 							res => {
-								that.getfocus();
+								that.packGetFocus();
 							}
 						)
 					}
 				} catch (e) {
 					that.showErrorMessage(e.stack,
 						res => {
-							that.getfocus();
+							that.packGetFocus();
 						}
 					)
 				}
@@ -341,21 +341,9 @@ import { getDirectoryItemArray } from '@/common/directory';
 				let record = this.creatRecord(label, balance, packageInfo);
 				batch.Records.push(record);
 				this.calcBatchHandleQty(batch);
-				this.getfocus();
+				this.packGetFocus();
 			},
 
-			// getfocus() {
-			// 	if (this.$refs.scanPopup ) {
-			// 		this.$refs.scanPopup.packGetFocus();
-			// 	}
-			// },
-
-			// losefocus() {
-			// 	if (this.$refs.scanPopup ) {
-			// 		this.$refs.scanPopup.packLoseFocus();
-			// 	}
-			// },
-
 			swipeClick(e, item, index) {
 				if (e.content.text == "详情") {
 					this.detail(item)
diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue
index 58a21ce1..d33794e2 100644
--- a/src/pages/repleinsh/coms/comScanReplishPack.vue
+++ b/src/pages/repleinsh/coms/comScanReplishPack.vue
@@ -316,6 +316,7 @@
 					}
 					// callback(res.data)
 				}).catch(err => {
+					uni.hideLoading()
 					this.showErrorMessage(err.message);
 				})
 			},