From 15d69d9f596a7529ce5a8b8d5a38b94e5c50b6b6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 18 六月 2021 09:21:56 +0800
Subject: [PATCH] # 库存跳转上报erp

---
 src/main/webapp/views/pakStore/matQuery.html |   52 ++++++++++++++++++++++++++++++++--------------------
 1 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index 458e0cc..530de5b 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>
@@ -55,16 +64,26 @@
 <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/handlebars/handlebars-v4.5.3.js"></script>
-<script type="text/javascript" src="../../static/js/pakStore/pakStore.js" charset="utf-8"></script>
 
 </body>
 <script>
-
+    function getCol() {
+        var cols = [
+            {type: 'checkbox', fixed: 'left'}
+        ];
+        cols.push.apply(cols, matCols);
+        cols.push(
+            {field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true},
+            {field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+        )
+        return cols;
+    }
     var pageCurr;
     layui.use(['table','laydate', 'form'], function() {
         var table = layui.table;
         var $ = layui.jquery;
         var layer = layui.layer;
+        var layDate = layui.laydate;
         var form = layui.form;
         // 鐗╂枡鏌ヨ鏁版嵁琛�
         matQueryTable = table.render({
@@ -77,14 +96,7 @@
             even: true,
             cellMinWidth: 50,
             toolbar: '#toolbar',
-            cols: [[
-                {type: 'checkbox', fixed: 'left'},
-                {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
-                {field: 'barcode', align: 'center', title: '鏉$爜'},
-                {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'},
-                {field: 'str1', align: 'center', title: '鐗╂枡鍗曚綅'},
-                {field: 'str2', align: 'center', title: '鐗╂枡瑙勬牸'},
-            ]],
+            cols: [getCol()],
             request: {
                 pageName: 'curr',
                 pageSize: 'limit'
@@ -104,7 +116,6 @@
                 if (res.code === 403) {
                     top.location.href = baseUrl + "/";
                 }
-
             }
         });
 
@@ -118,12 +129,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;
             }
         });
@@ -140,6 +146,12 @@
             clearFormVal($('#search-box'));
             tableReload();
         });
+
+        layDate.render({
+            elem: '.layui-laydate-range'
+            ,type: 'datetime'
+            ,range: true
+        });
     })
 
     function tableReload(child) {

--
Gitblit v1.9.1