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/basCrnp/basCrnp.html |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/views/basCrnp/basCrnp.html b/src/main/webapp/views/basCrnp/basCrnp.html
index 5e51e99..0a3afbf 100644
--- a/src/main/webapp/views/basCrnp/basCrnp.html
+++ b/src/main/webapp/views/basCrnp/basCrnp.html
@@ -39,10 +39,9 @@
         <!--</div>-->
     <!--</div>-->
     <div class="layui-inline">
-        <label class="layui-form-label">婧� 搴� 浣嶏細</label>
         <div class="layui-input-inline cool-auto-complete">
             <input id="frmLocno" class="layui-input" name="frm_locno" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
-            <input id="frmLocno$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�" onfocus=this.blur()>
+            <input id="frmLocno$" 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="locMastQueryByfrmLocno" onkeyup="autoLoad(this.getAttribute('data-key'))">
                 <select class="cool-auto-complete-window-select" data-key="locMastQueryByfrmLocnoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
@@ -51,10 +50,9 @@
         </div>
     </div>
     <div class="layui-inline">
-        <label class="layui-form-label">婧愩��銆�绔欙細</label>
         <div class="layui-input-inline cool-auto-complete">
             <input id="frmSta" class="layui-input" name="frm_sta" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
-            <input id="frmSta$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�" onfocus=this.blur()>
+            <input id="frmSta$" 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="basDevpQueryByfrmSta" onkeyup="autoLoad(this.getAttribute('data-key'))">
                 <select class="cool-auto-complete-window-select" data-key="basDevpQueryByfrmStaSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
@@ -63,10 +61,9 @@
         </div>
     </div>
     <div class="layui-inline">
-        <label class="layui-form-label">鐩� 鏍� 绔欙細</label>
         <div class="layui-input-inline cool-auto-complete">
             <input id="toSta" class="layui-input" name="to_sta" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
-            <input id="toSta$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�" onfocus=this.blur()>
+            <input id="toSta$" 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="basDevpQueryBytoSta" onkeyup="autoLoad(this.getAttribute('data-key'))">
                 <select class="cool-auto-complete-window-select" data-key="basDevpQueryBytoStaSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
@@ -75,10 +72,9 @@
         </div>
     </div>
     <div class="layui-inline">
-        <label class="layui-form-label">鐩爣搴撲綅锛�</label>
         <div class="layui-input-inline cool-auto-complete">
             <input id="toLocno" class="layui-input" name="to_locno" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
-            <input id="toLocno$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�" onfocus=this.blur()>
+            <input id="toLocno$" 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="locMastQueryBytoLocno" onkeyup="autoLoad(this.getAttribute('data-key'))">
                 <select class="cool-auto-complete-window-select" data-key="locMastQueryBytoLocnoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
@@ -88,7 +84,7 @@
     </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>
@@ -101,7 +97,6 @@
 <script type="text/html" id="toolbar">
     <div class="layui-btn-container">
         <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
-        <!--<button class="layui-btn layui-btn-sm" id="btn-refresh" lay-event="refreshData">鍒锋柊</button>-->
         <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
         <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
     </div>

--
Gitblit v1.9.1