From 55f0be610b3adae8cc0d83e6d33ff71075f1b9de Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期六, 09 八月 2025 11:15:01 +0800
Subject: [PATCH] 扫码优化

---
 manifest.json             |    4 ++--
 pages/QC/LLJ/Add.vue      |   20 ++++++++++++++++----
 pages/QC/LLJ/ScanCode.vue |    4 ++--
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/manifest.json b/manifest.json
index bcc7349..6b15b35 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,8 +1,8 @@
 {
     "name" : "GS-MES-AP",
-    "appid" : "__UNI__CFD9E8B",
+    "appid" : "__UNI__B38B152",
     "description" : "",
-    "versionName" : "1.1.1.6",
+    "versionName" : "1.1.2.0001",
     "versionCode" : 1,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
diff --git a/pages/QC/LLJ/Add.vue b/pages/QC/LLJ/Add.vue
index 2bd8db3..6882055 100644
--- a/pages/QC/LLJ/Add.vue
+++ b/pages/QC/LLJ/Add.vue
@@ -158,7 +158,8 @@
 		},
       tableData: [],
 	  remarksPopup: false,
-	  current:true
+	  current:true,
+	  type:""
     }
   },
   onLoad(options) {
@@ -170,6 +171,7 @@
   		this.formData.releaseNo = params["releaseNo"];
   		this.formData.lotNo = params["lotNo"];
   		this.msgId = params["msgId"];
+		this.type = params["type"];
   		
 		if(params["current"]==='A')
 		{
@@ -285,9 +287,19 @@
      	})  
      	 // 濡傛灉鏈夐〉闈㈣烦杞紝闇�瑕佺敤瀹氭椂鍣ㄥ欢杩�
      	        setTimeout(() => {
-     	            uni.navigateTo({
-     	            	url: 'List'
-     	            });
+					if(this.type==="A"){
+						uni.navigateTo({
+							url: 'ScanCode'
+						});
+					}else{
+						uni.navigateTo({
+							url: 'List'
+						});
+					}
+					// uni.navigateTo({
+					// 	url: 'List'
+					// });
+     	           
      	        }, 2000); // 淇濇寔涓� duration 鐩稿悓鐨勬椂闀�
      	
      } else {
diff --git a/pages/QC/LLJ/ScanCode.vue b/pages/QC/LLJ/ScanCode.vue
index cb3e460..983367d 100644
--- a/pages/QC/LLJ/ScanCode.vue
+++ b/pages/QC/LLJ/ScanCode.vue
@@ -72,14 +72,14 @@
 									url: 'Add?id=' + ress.data.tbBillList[0].id + '&lotNo=' + ress.data
 										.tbBillList[0].lotNo + '&releaseNo=' + ress.data.tbBillList[0]
 										.releaseNo +
-										'&current=B'
+										'&current=B&type=A'
 								})
 							} else {
 								uni.navigateTo({
 									url: 'Add?id=' + ress.data.tbBillList[0].id + '&lotNo=' + ress.data
 										.tbBillList[0].lotNo + '&releaseNo=' + ress.data.tbBillList[0]
 										.releaseNo +
-										'&current=A'
+										'&current=A&type=A'
 								})
 
 

--
Gitblit v1.9.3