From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/views/wrkMast/wrkMast.html | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index 1b52743..aed8900 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -25,6 +25,9 @@
.btn-cancel {
display: none;
}
+ .btn-pick {
+ display: none;
+ }
/*鏄庣粏琛�*/
#detlTable {
@@ -110,9 +113,16 @@
</div>
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-sm btn-detlShow" lay-event="detlShow">鏄庣粏</a>
- <a class="layui-btn layui-btn-danger layui-btn-sm btn-complete" lay-event="complete">瀹屾垚</a>
- <a class="layui-btn layui-btn-primary layui-btn-sm btn-cancel" lay-event="cancel">鍙栨秷</a>
+ <div class="dropdown-menu">
+ <button class="layui-btn layui-btn-primary layui-border-black icon-btn layui-btn-sm"><i class="layui-icon layui-icon-shrink-right"></i></button>
+ <ul class="dropdown-menu-nav" style="margin-left: -35px">
+ <li><a lay-event="detlShow">鏄庣粏</a></li>
+ <li><a lay-event="complete">瀹屾垚</a></li>
+ <li><a lay-event="cancel">鍙栨秷</a></li>
+ <li><a lay-event="shuttleCommand">绌挎杞︽寚浠�</a></li>
+ <li><a lay-event="liftCommand">鎻愬崌鏈烘寚浠�</a></li>
+ </ul>
+ </div>
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
--
Gitblit v1.9.1