From 192834a2160e2aa0f8a4bad9b13bdd535df57e9c Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 26 九月 2023 20:14:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs

---
 src/main/webapp/views/manLocDetl/manLocDetl.html |   99 ++++++++++++++++++-------------------------------
 1 files changed, 37 insertions(+), 62 deletions(-)

diff --git a/src/main/webapp/views/manLocDetl/manLocDetl.html b/src/main/webapp/views/manLocDetl/manLocDetl.html
index 60039c9..7da6e76 100644
--- a/src/main/webapp/views/manLocDetl/manLocDetl.html
+++ b/src/main/webapp/views/manLocDetl/manLocDetl.html
@@ -40,73 +40,48 @@
 </head>
 <body>
 
-<div class="layui-fluid">
-    <!-- 宸� -->
-    <div class="layui-row layui-col-space15">
-        <div class="layui-col-md3">
-            <div class="layui-card">
-                <div class="layui-card-body" style="padding: 10px;">
-                    <!-- 鏍戝伐鍏锋爮 -->
-                    <div class="layui-form toolbar" id="organizationTreeBar">
-                        <div class="layui-inline" style="max-width: 200px;">
-                            <input id="condition" onkeyup="findData(this)" type="text" class="layui-input" placeholder="璇疯緭鍏ュ叧閿瓧" autocomplete="off">
-                        </div>
-                        <div class="layui-inline">
-                            <button class="layui-btn icon-btn  layui-btn-sm" id="treeReset" style="padding: 0 10px;">
-                                <i class="layui-icon layui-icon-close"></i>
-                            </button>
-                        </div>
+<!-- 鍙� -->
+    <div class="layui-card">
+        <div class="layui-card-body" style="padding: 10px;">
+            <!-- 琛ㄦ牸宸ュ叿鏍�2 -->
+            <div id="search-box" class="layui-form toolbar"  style="padding-top: 5px">
+                <div class="layui-inline">
+                    <label class="layui-form-label" style="padding: 8px 15px 8px 15px">璐т綅:</label>
+                    <div class="layui-input-inline">
+                        <input name="loc_no" style="width: 120px" class="layui-input" placeholder="杈撳叆璐т綅"/>
                     </div>
-                    <!-- 鏍� -->
-                    <div class="layui-form toolbar" id="organizationTree"></div>
+                </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍟嗗搧缂栧彿:</label>
+                    <div class="layui-input-inline">
+                        <input name="matnr" style="width: 120px" class="layui-input" placeholder="杈撳叆鍟嗗搧缂栧彿"/>
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍟嗗搧鍚嶇О:</label>
+                    <div class="layui-input-inline">
+                        <input name="maktx" style="width: 120px" class="layui-input" placeholder="杈撳叆鍟嗗搧鍚嶇О"/>
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鎵樼洏鐮�:</label>
+                    <div class="layui-input-inline">
+                        <input name="zpallet" style="width: 120px" class="layui-input" placeholder="杈撳叆鎵樼洏鐮�"/>
+                    </div>
+                </div>
+                <div class="layui-inline">&emsp;
+                    <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+                        <i class="layui-icon">&#xe615;</i>鎼滅储
+                    </button>
+                    <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+                        <i class="layui-icon">&#xe666;</i>閲嶇疆
+                    </button>
                 </div>
             </div>
-        </div>
-        <!-- 鍙� -->
-        <div class="layui-col-md9">
-            <div class="layui-card">
-                <div class="layui-card-body" style="padding: 10px;">
-                    <!-- 琛ㄦ牸宸ュ叿鏍�2 -->
-                    <div id="search-box" class="layui-form toolbar"  style="padding-top: 5px">
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">璐т綅:</label>
-                            <div class="layui-input-inline">
-                                <input name="loc_no" style="width: 120px" class="layui-input" placeholder="杈撳叆璐т綅"/>
-                            </div>
-                        </div>
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍟嗗搧缂栧彿:</label>
-                            <div class="layui-input-inline">
-                                <input name="matnr" style="width: 120px" class="layui-input" placeholder="杈撳叆鍟嗗搧缂栧彿"/>
-                            </div>
-                        </div>
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍟嗗搧鍚嶇О:</label>
-                            <div class="layui-input-inline">
-                                <input name="maktx" style="width: 120px" class="layui-input" placeholder="杈撳叆鍟嗗搧鍚嶇О"/>
-                            </div>
-                        </div>
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鎵樼洏鐮�:</label>
-                            <div class="layui-input-inline">
-                                <input name="zpallet" style="width: 120px" class="layui-input" placeholder="杈撳叆鎵樼洏鐮�"/>
-                            </div>
-                        </div>
-                        <div class="layui-inline">&emsp;
-                            <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
-                                <i class="layui-icon">&#xe615;</i>鎼滅储
-                            </button>
-                            <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
-                                <i class="layui-icon">&#xe666;</i>閲嶇疆
-                            </button>
-                        </div>
-                    </div>
-                    <table class="layui-hide" id="locDetl" lay-filter="locDetl"></table>
-                </div>
-            </div>
+            <table class="layui-hide" id="locDetl" lay-filter="locDetl"></table>
         </div>
     </div>
-</div>
+
 
 <script type="text/html" id="toolbar">
     <div class="layui-btn-container">

--
Gitblit v1.9.1