From 40f10baf3c06dd88427fc46a3729651e9dfc3edd Mon Sep 17 00:00:00 2001
From: LSH <brook_w@163.com>
Date: 星期三, 10 八月 2022 16:52:10 +0800
Subject: [PATCH] Default Changelist

---
 src/main/webapp/views/locDetl/locDetl.html |  139 ++++++++++++++--------------------------------
 1 files changed, 43 insertions(+), 96 deletions(-)

diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index eb21eaa..6248d71 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -7,114 +7,61 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
-    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
     <link rel="stylesheet" href="../../static/css/cool.css" media="all">
-    <link rel="stylesheet" href="../../static/css/tree.css" media="all">
-    <style>
-        body {
-            color: #595959;
-            background-color: #f5f7f9;
-        }
-        .layui-fluid {
-            padding: 15px;
-        }
-        .layui-form.layui-border-box.layui-table-view {
-            /*margin: 15px 0 35px 0;*/
-            width: 100%;
-            border-width: 1px;
-        }
-        .layui-form.layui-border-box.layui-table-view {
-            height: calc(100vh - 160px);
-        }
-        .layui-form.layui-border-box.layui-table-view {
-            margin: 0;
-        }
-        #search-box {
-            padding: 30px 30px 10px 0px;
-            margin-left: 0px;
-        }
-        .layui-form.layui-border-box.layui-table-view {
-            height: 100%;
-        }
-    </style>
+    <link rel="stylesheet" href="../../static/css/common.css" media="all">
 </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>
-                    <!-- 鏍� -->
-                    <div class="layui-form toolbar" id="organizationTree"></div>
-                </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" 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" 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" 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>
+<!-- 鎼滅储鏍� -->
+<div id="search-box" class="layui-form layui-card-header">
+    <div class="layui-inline">
+        <div class="layui-input-inline">
+            <input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
         </div>
     </div>
+    <div class="layui-inline">
+        <div class="layui-input-inline">
+            <input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鐮�" autocomplete="off">
+        </div>
+    </div>
+    <div class="layui-inline">
+        <div class="layui-input-inline">
+            <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+        </div>
+    </div>
+<!--    <div class="layui-inline">-->
+<!--        <div class="layui-input-inline">-->
+<!--            <input class="layui-input" type="text" name="row" placeholder="鎺掓暟" autocomplete="off">-->
+<!--        </div>-->
+<!--    </div>-->
+    <div class="layui-inline">
+        <div class="layui-input-inline">
+            <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+        </div>
+
+    </div>
+
+    <!-- 寰呮坊鍔� -->
+    <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>
+<!--        <button id="unreason" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="unreason">鏌ョ湅寮傚父鏁版嵁</button>-->
+    </div>
+
 </div>
 
+<!-- 琛ㄦ牸 -->
+<div class="layui-form">
+    <table class="layui-hide" id="locDetl" lay-filter="locDetl"></table>
+</div>
 <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 layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
-        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right;margin-right: -10px">瀵煎嚭</button>
+        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="margin-top: 10px">瀵煎嚭</button>
     </div>
 </script>
-<script type="text/html" id="locNoTpl">
-    <span name="locNo" class="layui-badge layui-badge-gray">{{d.locNo}}</span>
-</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-xs btn-edit" lay-event="edit">缂栬緫</a>-->
 </script>
 
 <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -122,8 +69,8 @@
 <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/locDetl/locDetl.js" charset="utf-8"></script>
-<!--<script type="text/javascript" src="../../static/js/tagTree.js" charset="utf-8"></script>-->
-<script type="text/javascript" src="../../static/js/nodeTree.js" charset="utf-8"></script>
+
+<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
 
 </body>
 </html>

--
Gitblit v1.9.1