From 41362cf1dd25807c8c1d121230205d19e64ec92d Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期五, 25 七月 2025 11:21:17 +0800
Subject: [PATCH] 最新版本提交

---
 manifest.json             |    4 ++--
 pages/weiwaigxIn/form.vue |   13 +++++++++++--
 pages/gongxuOut/form.vue  |   16 ++++++++++++----
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/manifest.json b/manifest.json
index 4fdb9a3..b3e8b23 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "鏅轰簯LMES",
     "appid" : "__UNI__B002F49",
     "description" : "",
-    "versionName" : "1.0.18",
-    "versionCode" : 118,
+    "versionName" : "1.0.19",
+    "versionCode" : 119,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
     "app-plus" : {
diff --git a/pages/gongxuOut/form.vue b/pages/gongxuOut/form.vue
index 65c9b45..8974964 100644
--- a/pages/gongxuOut/form.vue
+++ b/pages/gongxuOut/form.vue
@@ -564,14 +564,22 @@
         methods: {
 			//鎵爜
 			toScanCode(){
-				// this.hform.HBarCode = 'GXLX00001165'
-				// this.getHBarCodeData('GXLX00001165')
+				// const str = "GXLX250603001-01@10";
 				uni.scanCode({
 				    onlyFromCamera: true,
 				    success: (res) => {
 				        console.log('鏉$爜鍐呭锛�' + res.result);
-						this.hform.HBarCode = res.result
-						this.getHBarCodeData(res.result)
+						var str = res.result
+						if(str.includes('@')) {
+						  const parts = str.split('@');
+						  this.hform.HBarCode = parts[0]
+						  this.hform.HProcNo = parts[1]
+						  this.getHBarCodeData(parts[0])
+						  this.getHProcNoData(parts[0],parts[1])
+						}else{
+							this.hform.HBarCode = res.result
+							this.getHBarCodeData(res.result)
+						}
 				    }
 				});
 			},
diff --git a/pages/weiwaigxIn/form.vue b/pages/weiwaigxIn/form.vue
index ab67434..215c274 100644
--- a/pages/weiwaigxIn/form.vue
+++ b/pages/weiwaigxIn/form.vue
@@ -408,8 +408,17 @@
 				    onlyFromCamera: true,
 				    success: (res) => {
 				        console.log('鏉$爜鍐呭锛�' + res.result);
-						this.hform.HBarCode = res.result
-						this.getHBarCodeData(res.result)
+						var str = res.result
+						if(str.includes('@')) {
+						  const parts = str.split('@');
+						  this.hform.HBarCode = parts[0]
+						  this.hform.HProcNo = parts[1]
+						  this.getHBarCodeData(parts[0])
+						  this.getHProcNoData(parts[0],parts[1])
+						}else{
+							this.hform.HBarCode = res.result
+							this.getHBarCodeData(res.result)
+						}
 				    }
 				});
 			},

--
Gitblit v1.9.1