From a8067b4e52272979dc1c682515e0b80fc39159e4 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Sun, 5 Apr 2026 12:20:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E8=A2=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/hdyy/zpgl/mater-zudai.vue  | 34 +++++++++++++++++++++-----------
 pages/hdyy/zpgl/mater-zutong.vue | 20 +++++++++++++++----
 2 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/pages/hdyy/zpgl/mater-zudai.vue b/pages/hdyy/zpgl/mater-zudai.vue
index a21b8e0..4c4c926 100644
--- a/pages/hdyy/zpgl/mater-zudai.vue
+++ b/pages/hdyy/zpgl/mater-zudai.vue
@@ -319,11 +319,19 @@
 			},
 			toEmpty () {
 				this.val1 = ''
-				this.index1 = ''
+				this.recordNo = ''
 				this.materialData = {}
-				this.pcsn = ''
 				this.num = ''
 				this.unit = 'KG'
+				this.pcsn = ''
+				this.flag = false
+				this.dialogVisible = false
+				this.reasons = {
+					full: false,          // 物料卡标签填满更换
+					broken: false,        // 标签破损更换
+					other: false          // 其他
+				}
+				this.otherRemark = ''
 				this.disabled = false
 				this.disabled1 = false
 			},
@@ -483,6 +491,7 @@
 					title: '操作成功',
 					icon: 'none'
 				})
+				this.toEmpty()
 				this.disabled1 = false
 			},
 			printTwo (row) {
@@ -683,21 +692,24 @@
 }
 
 .confirm-btn {
-  color: #007aff;
-  font-weight: 500;
+  height: 48px;
+  line-height: 48px;
+  font-size: 16px;
+  color: #007aff !important;
+//   font-weight: 500;
 }
 
 .confirm-btn::after {
   border: none;
 }
 
-/* 分隔线样式 */
-.button-divider {
-  width: 1px;
-  height: 24px;
-  background-color: #e5e5e5;
-  flex-shrink: 0;
-}
+// /* 分隔线样式 */
+// .button-divider {
+//   width: 1px;
+//   height: 24px;
+//   background-color: #e5e5e5;
+//   flex-shrink: 0;
+// }
 
 /* 针对 checkbox 组件样式微调（可选，保证在不同平台显示一致） */
 checkbox {
diff --git a/pages/hdyy/zpgl/mater-zutong.vue b/pages/hdyy/zpgl/mater-zutong.vue
index 35fbb29..96650a8 100644
--- a/pages/hdyy/zpgl/mater-zutong.vue
+++ b/pages/hdyy/zpgl/mater-zutong.vue
@@ -265,13 +265,22 @@
 			},
 			toEmpty () {
 				this.val1 = ''
-				this.index1 = ''
+				this.recordNo = ''
 				this.materialData = {}
-				this.pcsn = ''
+				this.weight = ''
 				this.num = null
 				this.unit = 'KG'
+				this.pcsn = ''
+				this.flag = false
 				this.disabled = false
 				this.disabled1 = false
+				this.dialogVisible = false
+				this.reasons = {
+					full: false,          // 物料卡标签填满更换
+					broken: false,        // 标签破损更换
+					other: false          // 其他
+				}
+				this.otherRemark = ''
 			},
 			toZtPrint () {
 				if (this.flag) {
@@ -290,6 +299,7 @@
 							icon: 'none'
 						})
 					}
+					this.toEmpty()
 					this.disabled = false
 				} catch (e) {
 					this.disabled = false
@@ -534,8 +544,10 @@
 }
 
 .confirm-btn {
-  color: #007aff;
-  font-weight: 500;
+  height: 48px;
+  line-height: 48px;
+  font-size: 16px;
+  color: #007aff !important;
 }
 
 .confirm-btn::after {