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 |   32 +++++++++++++++-----------------
 1 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index f839a05..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 {
@@ -49,21 +52,9 @@
 
 <!-- 鎼滅储鏍� -->
 <div id="search-box" class="layui-form layui-card-header">
-    <!--<div class="layui-inline">-->
-        <!--<label class="layui-form-label">宸� 浣� 鍙凤細</label>-->
-        <!--<div class="layui-input-inline">-->
-            <!--<input class="layui-input" type="text" name="wrk_no" placeholder="璇疯緭鍏�" autocomplete="off">-->
-        <!--</div>-->
-    <!--</div>-->
     <div class="layui-inline">
-        <div class="layui-input-inline cool-auto-complete">
-            <input id="wrkNo" name="wrk_no" class="layui-input" type="text" placeholder="宸ヤ綔鍙�" autocomplete="off" style="display: none">
-            <input id="wrkNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="宸ヤ綔鍙�" onfocus=this.blur()>
-            <div class="cool-auto-complete-window">
-                <input class="cool-auto-complete-window-input" data-key="wrkMastQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">
-                <select class="cool-auto-complete-window-select" data-key="wrkMastQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
-                </select>
-            </div>
+        <div class="layui-input-inline">
+            <input class="layui-input" type="text" name="wrk_no" placeholder="宸ヤ綔鍙�" autocomplete="off">
         </div>
     </div>
     <div class="layui-inline">
@@ -122,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