From ce6b5be6c0e1544bcc66f9fce9efec3ced724d95 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 11 七月 2020 15:46:29 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/pakStore/matQuery.html |   31 ++++++++++++++++++++++---------
 1 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index 5af04f7..f929872 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -26,12 +26,21 @@
     <legend>鎼滅储鏍�</legend>
     <div id="search-box" class="layui-form layui-card-header">
         <div class="layui-inline">
-            <label class="layui-form-label">鐗╂枡缂栫爜锛�</label>
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="mat_no" placeholder="璇疯緭鍏�" autocomplete="off">
+                <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>
@@ -64,6 +73,7 @@
         var table = layui.table;
         var $ = layui.jquery;
         var layer = layui.layer;
+        var layDate = layui.laydate;
         var form = layui.form;
         // 鐗╂枡鏌ヨ鏁版嵁琛�
         matQueryTable = table.render({
@@ -83,6 +93,8 @@
                 {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'},
                 {field: 'str1', align: 'center', title: '鐗╂枡鍗曚綅'},
                 {field: 'str2', align: 'center', title: '鐗╂枡瑙勬牸'},
+                {field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true},
+                {field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
             ]],
             request: {
                 pageName: 'curr',
@@ -116,12 +128,7 @@
                         layer.msg("璇烽�夋嫨鏁版嵁");
                         return;
                     }
-                    for (var i=0;i<data.length;i++){
-                        data[i]["count"] = parent.initCountVal;
-                    }
-                    parent.matCodeData.push.apply(parent.matCodeData, data);
-                    parent.tableIns.reload({data: parent.matCodeData});
-                    parent.layer.close(parent.matCodeLayerIdx);
+                    parent.addTableData(data);
                     break;
             }
         });
@@ -138,6 +145,12 @@
             clearFormVal($('#search-box'));
             tableReload();
         });
+
+        layDate.render({
+            elem: '.layui-laydate-range'
+            ,type: 'datetime'
+            ,range: true
+        });
     })
 
     function tableReload(child) {

--
Gitblit v1.9.1