From b7e08df5a07b3fa832a46ecc31983e16f2bccc8c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 24 七月 2023 14:56:01 +0800
Subject: [PATCH] # 出库作业,和库存明细管理 排序

---
 src/main/webapp/views/pakStore/locDetlQuery.html |   85 ++++++++++++++++++++++++++++++++----------
 1 files changed, 64 insertions(+), 21 deletions(-)

diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index efe43ab..1d02c25 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -10,6 +10,9 @@
     <link rel="stylesheet" href="../../static/css/cool.css" media="all">
     <link rel="stylesheet" href="../../static/css/common.css" media="all">
     <style>
+        .layui-table-body.layui-table-main {
+            overflow: scroll;
+        }
         body {
             padding: 0 20px;
         }
@@ -44,6 +47,13 @@
     <legend>鎼滅储鏍�</legend>
     <!-- 鎼滅储鏍� -->
     <div id="search-box" class="layui-form layui-card-header">
+        <div class="layui-input-inline" style="margin-top: -10px">
+            <select id="crnNo" name="crnNo">
+                <option value="" style="display: none">璇烽�夋嫨宸烽亾</option>
+                <option value="1">1鍙�</option>
+                <option value="2">2鍙�</option>
+            </select>
+        </div>
         <div class="layui-inline">
             <div class="layui-input-inline">
                 <input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
@@ -51,7 +61,7 @@
         </div>
         <div class="layui-inline">
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�"  autocomplete="off">
+                <input class="layui-input" type="text" name="mat_no" placeholder="鐗╂枡缂栫爜"  autocomplete="off">
             </div>
         </div>
         <div class="layui-inline">
@@ -59,7 +69,17 @@
                 <input class="layui-input" type="text" name="mat_name" placeholder="鐗╂枡鍚嶇О" autocomplete="off">
             </div>
         </div>
-
+        <div class="layui-inline">
+            <div class="layui-input-inline">
+                <input class="layui-input" type="text" name="memo" 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 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>
@@ -74,7 +94,7 @@
     </div>
 </script>
 
-<div class="layui-form">
+<div class="layui-form" style="width: 100%">
     <table class="layui-hide" id="stockOut" lay-filter="stockOut"></table>
 </div>
 
@@ -88,10 +108,42 @@
 <script>
 
     var pageCurr;
+    function getCol() {
+        var cols = [
+            {type: 'checkbox'}
+            ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+            ,{field: 'matNo', align: 'center',title: '浜у搧缂栫爜'}
+            ,{field: 'matName', align: 'center',title: '浜у搧鍚嶇О', width: 180}
+            ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+            ,{field: 'qty', align: 'center',title: '鏁伴噺'}
+            ,{field: 'source', title: '鏉ユ簮', align: 'center'}
+            ,{field: 'vendor', title: '渚涘簲鍟�', align: 'center'}
+            ,{field: 'qtyBox', align: 'center', title: '姣忕鏁伴噺(PCS)', width: 130}
+            ,{field: 'allQty', title: '鎬绘暟閲�(PCS)', align: 'center', width: 120}
+            ,{field: 'weight', align: 'center', title: '姣忕閲嶉噺(KG)', width: 130}
+            ,{field: 'allWeight', title: '鎬婚噸閲�(KG)', align: 'center', width: 120}
+            ,{field: 'unit', align: 'center',title: '鍗曚綅', width:80, hide: true}
+            ,{field: 'supplier', align: 'center',title: '鎵瑰彿'}
+            ,{field: 'color', align: 'center',title: '棰滆壊'}
+            ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'}
+            // ,{field: 'bname', align: 'center',title: '搴撲綅鍚嶇О'}
+            ,{field: 'memo', align: 'center',title: '鐢熶骇鏃ユ湡'}
+            ,{field: 'str3', align: 'center',title: '瀹㈡埛鍚嶇О'}
+            ,{field: 'str4', align: 'center',title: '椤圭洰淇℃伅'}
+            ,{field: 'str5$', align: 'center',title: '绫诲埆'}
+        ];
+        // cols.push.apply(cols, detlCols);
+        
+        cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
+            ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width: 180})
+        return cols;
+    }
+
     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;
         // 鏁版嵁娓叉煋
         locDetlTableIns = table.render({
@@ -100,26 +152,11 @@
             url: baseUrl+'/stock/out/list/auth',
             page: true,
             limit: 10,
+            limits: [10, 30, 50, 100, 200, 500],
             even: true,
             toolbar: '#toolbar',
-            cellMinWidth: 50,
-            cols: [[
-                {type: 'checkbox'}
-                ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
-                ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
-                // ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�', width:80}
-                // ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
-                // ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
-                // ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID', width:200}
-                ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
-                // ,{field: 'werks', align: 'center',title: '宸ュ巶'}
-                ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
-                ,{field: 'altme', align: 'center',title: '鍗曚綅'}
-                ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'}
-                // ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
-                // ,{field: 'memo', align: 'center',title: '澶囨敞'}
-
-            ]],
+            cellMinWidth: 100,
+            cols: [getCol()],
             request: {
                 pageName: 'curr',
                 pageSize: 'limit'
@@ -178,6 +215,12 @@
             clearFormVal($('#search-box'));
             tableReload();
         });
+
+        layDate.render({
+            elem: '.layui-laydate-range'
+            ,type: 'datetime'
+            ,range: true
+        });
     })
 
     function tableReload(child) {

--
Gitblit v1.9.1