From f63064b50164522377c5881f97b0e630217e030c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 30 三月 2022 10:39:26 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/pakStore/matQuery.html |   99 ++++++++++++++++++++-----------------------------
 1 files changed, 41 insertions(+), 58 deletions(-)

diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index ebe944e..69c9461 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -12,7 +12,7 @@
     <link rel="stylesheet" href="../../static/css/common.css" media="all">
     <style>
         body {
-            padding: 0 20px;
+            /*overflow: hidden;*/
         }
         .layui-table-box {
             border-right: 1px solid #9F9F9F;
@@ -21,44 +21,47 @@
     </style>
 </head>
 <body>
+<div style="padding: 25px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;">
+    <span style="font-size: large; font-weight: bold">閫夋嫨鍟嗗搧</span>
+</div>
+<div class="layui-card" style="padding: 0 20px; overflow: scroll;">
+    <fieldset class="layui-elem-field site-demo-button" style="margin: 20px;">
+        <legend>鎼滅储鏍�</legend>
+        <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="mat_no" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+                </div>
+            </div>
+            <!-- 鏃ユ湡鑼冨洿 -->
+            <div class="layui-inline" style="width: 300px">
+                <div class="layui-input-inline">
+                    <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+                </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>
+            </div>
+        </div>
+    </fieldset>
 
-<!-- 鎼滅储鏍� -->
-<fieldset class="layui-elem-field site-demo-button" style="margin: 20px;">
-    <legend>鎼滅储鏍�</legend>
-    <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="mat_no" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
-            </div>
-        </div>
-        <!-- 鏃ユ湡鑼冨洿 -->
-        <div class="layui-inline" style="width: 300px">
-            <div class="layui-input-inline">
-                <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
-            </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>
-        </div>
+    <div class="layui-form">
+        <table class="layui-hide" id="matCode" lay-filter="matCode"></table>
     </div>
-</fieldset>
+</div>
 
 <script type="text/html" id="toolbar">
     <div class="layui-btn-container">
         <button class="layui-btn" id="btn-confirm" lay-event="confirm" style="">鎻愬彇</button>
     </div>
 </script>
-
-<div class="layui-form">
-    <table class="layui-hide" id="matCode" lay-filter="matCode"></table>
-</div>
 
 <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
 <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
@@ -79,7 +82,7 @@
         )
         return cols;
     }
-    var pageCurr;
+
     layui.config({
         base: baseUrl + "/static/layui/lay/modules/"
     }).use(['table','laydate', 'form', 'admin'], function() {
@@ -126,12 +129,12 @@
 
         // 鐩戝惉澶村伐鍏锋爮浜嬩欢
         table.on('toolbar(matCode)', function (obj) {
-            var checkStatus = table.checkStatus(obj.config.id);
-            var data = checkStatus.data;
+            let checkStatus = table.checkStatus(obj.config.id);
+            let data = checkStatus.data;
             switch(obj.event) {
                 case 'confirm':
                     if (data.length === 0){
-                        layer.msg("璇烽�夋嫨鏁版嵁");
+                        layer.msg("璇烽�夋嫨鏁版嵁", {icon: 2});
                         return;
                     }
                     parent.addTableData(data);
@@ -141,13 +144,11 @@
 
         // 鎼滅储鏍忔悳绱簨浠�
         form.on('submit(search)', function (data) {
-            pageCurr = 1;
-            tableReload(false);
+            tableReload();
         });
 
         // 鎼滅储鏍忛噸缃簨浠�
         form.on('submit(reset)', function (data) {
-            pageCurr = 1;
             clearFormVal($('#search-box'));
             tableReload();
         });
@@ -159,31 +160,13 @@
         });
     })
 
-    function tableReload(child) {
+    function tableReload() {
         var searchData = {};
         $.each($('#search-box [name]').serializeArray(), function() {
             searchData[this.name] = this.value;
         });
         matQueryTable.reload({
-            where: searchData,
-            page: {
-                curr: pageCurr
-            },
-            done: function (res, curr, count) {
-                if (res.code === 403) {
-                    top.location.href = baseUrl+"/";
-                }
-                pageCurr=curr;
-                if (res.data.length === 0 && count !== 0) {
-                    tableIns.reload({
-                        where: searchData,
-                        page: {
-                            curr: pageCurr-1
-                        }
-                    });
-                    pageCurr -= 1;
-                }
-            }
+            where: searchData
         });
     }
 

--
Gitblit v1.9.1