From 8bbe00da889c30d361e46f816898d87e6f5761c8 Mon Sep 17 00:00:00 2001
From: "juncheng.li" <juncheng.li@ccwin-in.com>
Date: Fri, 21 Apr 2023 13:08:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4=E4=B9=8B?=
 =?UTF-8?q?=E5=90=8E=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=89=AB=E6=8F=8F=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PDA/pages/inventory/scrap.vue          | 25 +++++++++++++----------
 fe/PDA/pages/putaway/purchasePutaway.vue  |  2 +-
 fe/PDA/pages/putaway/rapReceipt.vue       |  2 +-
 fe/PDA/pages/putaway/semiPutaway.vue      |  2 +-
 fe/PDA/pages/return/returnToWarehouse.vue |  2 +-
 fe/PDA/pages/store/deliverRaw.vue         |  2 +-
 fe/PDA/pages/store/issueDirect.vue        |  2 +-
 7 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/fe/PDA/pages/inventory/scrap.vue b/fe/PDA/pages/inventory/scrap.vue
index a69202bde..4068d347e 100644
--- a/fe/PDA/pages/inventory/scrap.vue
+++ b/fe/PDA/pages/inventory/scrap.vue
@@ -372,16 +372,19 @@
 
 				let params = JSON.stringify(item);
 				console.log('params', params);
-				scrap(params)
-					.then(res => {
-						that.showCommitSuccess();
-						that.clearAll();
-						uni.hideLoading();
-					})
-					.catch(err => {
-						that.showMessage(err.message);
-						uni.hideLoading();
-					});
+				that.showCommitSuccess();
+				that.clearAll();
+				uni.hideLoading();
+				// scrap(params)
+				// 	.then(res => {
+				// 		that.showCommitSuccess();
+				// 		that.clearAll();
+				// 		uni.hideLoading();
+				// 	})
+				// 	.catch(err => {
+				// 		that.showMessage(err.message);
+				// 		uni.hideLoading();
+				// 	});
 			},
 
 			cancel() {
@@ -457,7 +460,7 @@
 			},
 
 			closeCommitMessage() {
-				this.openScanPopup();
+				// this.openScanPopup();
 			}
 		},
 	}
diff --git a/fe/PDA/pages/putaway/purchasePutaway.vue b/fe/PDA/pages/putaway/purchasePutaway.vue
index 03fb81b23..9bb8ca2ec 100644
--- a/fe/PDA/pages/putaway/purchasePutaway.vue
+++ b/fe/PDA/pages/putaway/purchasePutaway.vue
@@ -527,7 +527,7 @@
 			},
 
 			closeCommitMessage() {
-				this.openScanPopup();
+				// this.openScanPopup();
 			},
 
 			scanPopupGetFocus() {
diff --git a/fe/PDA/pages/putaway/rapReceipt.vue b/fe/PDA/pages/putaway/rapReceipt.vue
index 27137e512..43f429cb6 100644
--- a/fe/PDA/pages/putaway/rapReceipt.vue
+++ b/fe/PDA/pages/putaway/rapReceipt.vue
@@ -323,7 +323,7 @@
 			},
 
 			closeCommitMessage() {
-				this.openScanPopup();
+				// this.openScanPopup();
 			},
 
 			closeScanMessage() {
diff --git a/fe/PDA/pages/putaway/semiPutaway.vue b/fe/PDA/pages/putaway/semiPutaway.vue
index 8e55ae874..fdda62077 100644
--- a/fe/PDA/pages/putaway/semiPutaway.vue
+++ b/fe/PDA/pages/putaway/semiPutaway.vue
@@ -522,7 +522,7 @@
 			},
 
 			closeCommitMessage() {
-				this.openScanPopup();
+				// this.openScanPopup();
 			},
 
 			scanPopupGetFocus(message) {
diff --git a/fe/PDA/pages/return/returnToWarehouse.vue b/fe/PDA/pages/return/returnToWarehouse.vue
index 9ad3c508b..d61210a0c 100644
--- a/fe/PDA/pages/return/returnToWarehouse.vue
+++ b/fe/PDA/pages/return/returnToWarehouse.vue
@@ -614,7 +614,7 @@
 				this.$refs.comMessage.showScanMessage(message);
 			},
 			closeCommitMessage() {
-				this.openScanPopup();
+				// this.openScanPopup();
 			},
 			closeScanMessage() {
 				this.scanPopupGetFocus();
diff --git a/fe/PDA/pages/store/deliverRaw.vue b/fe/PDA/pages/store/deliverRaw.vue
index b0319c1ef..f4cdc2ea8 100644
--- a/fe/PDA/pages/store/deliverRaw.vue
+++ b/fe/PDA/pages/store/deliverRaw.vue
@@ -500,7 +500,7 @@
 			},
 
 			closeCommitMessage() {
-				this.openScanPopup();
+				// this.openScanPopup();
 			}
 		}
 	};
diff --git a/fe/PDA/pages/store/issueDirect.vue b/fe/PDA/pages/store/issueDirect.vue
index 8593c0bdc..52086655a 100644
--- a/fe/PDA/pages/store/issueDirect.vue
+++ b/fe/PDA/pages/store/issueDirect.vue
@@ -502,7 +502,7 @@
 			},
 
 			closeCommitMessage() {
-				this.openScanPopup();
+				// this.openScanPopup();
 			},
 
 			showScanMessage(message) {