From d759220378927d1481882de1c7c476ac47ce2dea Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期二, 29 十一月 2022 21:35:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs

---
 src/main/webapp/views/wrkMast/wrkMast.html |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index 440449f..6677987 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -99,6 +99,7 @@
     <div class="layui-btn-container">
         <button class="layui-btn layui-btn-normal" id="btn-pri-add" lay-event="priAdd"><i class="layui-icon">&#xe624;</i>澧炲姞浼樺厛绾�</button>
         <button class="layui-btn layui-btn-normal" id="btn-pri-red" lay-event="priRed"><i class="layui-icon">&#xe67e;</i>闄嶄綆浼樺厛绾�</button>
+<!--        <button class="layui-btn layui-btn-normal" id="btn-wrk-mast" lay-event="priWrkMast"><i class="layui-icon"></i>缁存姢宸ヤ綔妗�</button>-->
         <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
     </div>
 </script>
@@ -122,6 +123,7 @@
     <a class="layui-btn layui-btn-xs btn-detlShow" lay-event="detlShow">鏄庣粏</a>
     <a class="layui-btn layui-btn-danger layui-btn-xs btn-complete" lay-event="complete">瀹屾垚</a>
     <a class="layui-btn layui-btn-primary layui-btn-xs btn-cancel" lay-event="cancel">鍙栨秷</a>
+    <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="priWrkMast">缁存姢宸ヤ綔鐘舵��</a>
     {{#if (d.ioType === 103) { }}
         <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">鎷�</a>
     {{# } }}

--
Gitblit v1.9.1