From 5d334b60d958c9ea3ba8411df901d9c28e81c5f7 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 31 十月 2025 16:05:05 +0800
Subject: [PATCH] 修改问题

---
 HTML/views/ASNSetting/LabelBox.html |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/HTML/views/ASNSetting/LabelBox.html b/HTML/views/ASNSetting/LabelBox.html
index 0c14273..35fc10f 100644
--- a/HTML/views/ASNSetting/LabelBox.html
+++ b/HTML/views/ASNSetting/LabelBox.html
@@ -125,6 +125,14 @@
 							style="margin-left: 5px;" lay-event="BuDaLabel" id="BuDaLabel">
 							<i class="layui-icon layui-icon-print layuiadmin-button-btn"></i>琛ユ墦鏍囩
 						</button>
+						<button class="layui-btn layui-btn-sm layuiadmin-btn-list layui-btn-normal buDaLabelClass"
+							style="margin-left: 5px;" lay-event="ChaiLabel" id="ChaiLabel">
+							<i class="layui-icon layui-icon-edit layuiadmin-button-btn"></i>鎷嗗垎鏍囩
+						</button>
+						<button class="layui-btn layui-btn-sm layuiadmin-btn-list layui-btn-normal buDaLabelClass"
+							style="margin-left: 5px;" lay-event="MergeLabel" id="MergeLabel">
+							<i class="layui-icon layui-icon-edit layuiadmin-button-btn"></i>鍚堝苟鏍囩
+						</button>
 						<button class="layui-btn layui-btn-sm layuiadmin-btn-list layui-btn-danger delLabelClass"
 							style="margin-left: 5px;" lay-event="delLabel" id="delLabel">
 							<i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>鍒犻櫎鏍囩
@@ -330,6 +338,27 @@
 					// btn: ['鍙栨秷']
 				});
 			});
+			//鎷嗗垎鏍囩
+			$('#ChaiLabel').on('click', function () {
+				layer.open({
+					type: 2,
+					title: '鎷嗗垎鏍囩',
+					content: 'LabelChai.html',
+					maxmin: true,
+					area: ['430px', '290px'],
+					// btn: ['鍙栨秷']
+				});
+			});
+			$('#MergeLabel').on('click', function () {
+				layer.open({
+					type: 2,
+					title: '鍚堝苟鏍囩',
+					content: 'LabelMerge.html',
+					maxmin: true,
+					area: ['430px', '290px'],
+					// btn: ['鍙栨秷']
+				});
+			});
 			$("#AsnNoSelect").on('input', function () {
 
 				if ($("#AsnNoSelect").val() == "" || $("#AsnNoSelect").val().length < 16) {

--
Gitblit v1.8.0