From e411967d48ce92ade3abea8a1ec2dba66d7e5297 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 19 六月 2020 16:17:40 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/locMast/locMast.html |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/main/webapp/views/locMast/locMast.html b/src/main/webapp/views/locMast/locMast.html
index a468020..3727917 100644
--- a/src/main/webapp/views/locMast/locMast.html
+++ b/src/main/webapp/views/locMast/locMast.html
@@ -30,18 +30,6 @@
         </div>
     </div>
     <div class="layui-inline">
-        <label class="layui-form-label">搴撲綅绫诲瀷锛�</label>
-        <div class="layui-input-inline cool-auto-complete">
-            <input id="whsType" class="layui-input" name="whs_type" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
-            <input id="whsType$" 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="basWhsQueryBywhsType" onkeyup="autoLoad(this.getAttribute('data-key'))">
-                <select class="cool-auto-complete-window-select" data-key="basWhsQueryBywhsTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
-                </select>
-            </div>
-        </div>
-    </div>
-    <div class="layui-inline">
         <label class="layui-form-label">搴撲綅鐘舵�侊細</label>
         <div class="layui-input-inline cool-auto-complete">
             <input id="locType" class="layui-input" name="loc_type" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
@@ -53,9 +41,20 @@
             </div>
         </div>
     </div>
-
+    <div class="layui-inline">
+        <label class="layui-form-label">搴撲綅绫诲瀷锛�</label>
+        <div class="layui-input-inline cool-auto-complete">
+            <input id="whsType" class="layui-input" name="whs_type" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
+            <input id="whsType$" 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="basWhsQueryBywhsType" onkeyup="autoLoad(this.getAttribute('data-key'))">
+                <select class="cool-auto-complete-window-select" data-key="basWhsQueryBywhsTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+                </select>
+            </div>
+        </div>
+    </div>
     <!-- 寰呮坊鍔� -->
-    <div id="data-search-btn" class="layui-btn-container layui-form-item">
+    <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
         <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
         <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
     </div>
@@ -76,7 +75,7 @@
 </script>
 
 <script type="text/html" id="operate">
-    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
+<!--    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>-->
     <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>
 </script>
 
@@ -146,6 +145,9 @@
                 </select>
             </div>
         </div>
+        <div id="prompt" style="text-indent: 10px;">
+            <span class="not-null">鍒濆鍖栦細娓呴櫎搴撲綅鎵�鏈夋暟鎹紝璇疯皑鎱庢搷浣滐紒</span>
+        </div>
         <!-- 鎸夐挳 -->
         <div style="text-align: center; margin-top: 20px">
             <button class="layui-btn layui-btn-radius layui-btn-normal" id="initDo" lay-submit lay-filter="initDo">纭畾</button>

--
Gitblit v1.9.1