From 3958693bae2806d568082f11d57702df35026453 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 17 六月 2020 15:27:02 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/wrkMast/wrkMast.html   |   53 ++++++++++++++++++++++++++++++++++++++---------------
 src/main/webapp/static/js/wrkMast/wrkMast.js |    3 ++-
 2 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 6b594d7..1b7391f 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -13,7 +13,8 @@
         headers: {token: localStorage.getItem('token')},
         url: baseUrl+'/wrkMast/list/auth',
         page: true,
-        limit: 10,
+        limit: 16,
+        limits: [16, 30, 50, 100, 200, 500],
         even: true,
         toolbar: '#toolbar',
         cellMinWidth: 50,
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index 4c14501..10f2a6f 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -30,6 +30,19 @@
         #detlTable {
             margin-top: 20px;
         }
+
+        #search-box {
+            padding: 30px 30px 10px 30px;
+        }
+        #search-box .layui-inline {
+            margin-right: 5px;
+        }
+        #data-search-btn {
+            margin-top: 10px;
+        }
+        #data-search-btn.layui-btn-container .layui-btn {
+            margin-right: 20px;
+        }
     </style>
 </head>
 <body>
@@ -43,10 +56,9 @@
         <!--</div>-->
     <!--</div>-->
     <div class="layui-inline">
-        <label class="layui-form-label">宸� 浣� 鍙凤細</label>
         <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()>
+            <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">
@@ -55,10 +67,9 @@
         </div>
     </div>
     <div class="layui-inline">
-        <label class="layui-form-label">宸ヤ綔鐘舵�侊細</label>
         <div class="layui-input-inline cool-auto-complete">
             <input id="wrkSts" class="layui-input" name="wrk_sts" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
-            <input id="wrkSts$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�" onfocus=this.blur()>
+            <input id="wrkSts$" 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="basWrkStatusQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">
                 <select class="cool-auto-complete-window-select" data-key="basWrkStatusQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
@@ -67,18 +78,30 @@
         </div>
     </div>
     <div class="layui-inline">
-        <label class="layui-form-label">鍫� 鍨� 鏈猴細</label>
-        <div class="layui-input-inline cool-auto-complete">
-            <input id="crnNo" class="layui-input" name="crn_no" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
-            <input id="crnNo$" 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="basCrnpQueryBycrnNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
-                <select class="cool-auto-complete-window-select" data-key="basCrnpQueryBycrnNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
-                </select>
-            </div>
+        <div class="layui-input-inline">
+            <input class="layui-input" type="text" name="crn_no" placeholder="鍫嗗灈鏈哄彿" autocomplete="off">
         </div>
     </div>
-
+    <div class="layui-inline">
+        <div class="layui-input-inline">
+            <input class="layui-input" type="text" name="source_sta_no" placeholder="婧愮珯" autocomplete="off">
+        </div>
+    </div>
+    <div class="layui-inline">
+        <div class="layui-input-inline">
+            <input class="layui-input" type="text" name="sta_no" placeholder="鐩爣绔�" autocomplete="off">
+        </div>
+    </div>
+    <div class="layui-inline">
+        <div class="layui-input-inline">
+            <input class="layui-input" type="text" name="source_loc_no" placeholder="婧愬簱浣�" autocomplete="off">
+        </div>
+    </div>
+    <div class="layui-inline">
+        <div class="layui-input-inline">
+            <input class="layui-input" type="text" name="loc_no" placeholder="鐩爣搴撲綅" autocomplete="off">
+        </div>
+    </div>
     <!-- 寰呮坊鍔� -->
     <div id="data-search-btn" class="layui-btn-container layui-form-item">
         <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>

--
Gitblit v1.9.1