From 3bafe7a5ed8bb14a867944e4c0c3adf583a4174b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 06 五月 2025 13:10:17 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/pda-master into devlop

---
 pages/listing/disc.vue |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pages/listing/disc.vue b/pages/listing/disc.vue
index c67d0a6..114dd16 100644
--- a/pages/listing/disc.vue
+++ b/pages/listing/disc.vue
@@ -133,10 +133,11 @@
 				container: '',
 				megreQty: '',
 				list: [],
-				range: [],
+				range: [],
 				batch: '',
 				repeatClick: false,
-				isconfirm: false
+				isconfirm: false,
+				batch:''
 			}
 		},
 		computed: {
@@ -163,9 +164,9 @@
 					code,
 					data,
 					msg
-				} = await request('/asnOrderItem/trackCode', {
-					code: this.barcode,
-					batch: this.batch
+				} = await request('/asnOrderItem/trackCode', {
+					code: this.barcode,
+					batch: this.batch
 				}, "post")
 				if (code === 200) {
 					data && this.list.push(data);
@@ -245,7 +246,7 @@
 					msg
 				} = await request('/waitPakin/merge', {
 					items: newArr,
-					barcode: this.container,
+					barcode: this.container,
 					batch: this.batch,
 				})
 				if (code === 200) {

--
Gitblit v1.9.1