From ae5928177e910e882ba37a953bcd52ae503f8c30 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期四, 07 四月 2022 08:05:28 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/pakStore/locDetlCheckQuery.html |   53 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/views/pakStore/locDetlCheckQuery.html b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
index f98139a..0d2410b 100644
--- a/src/main/webapp/views/pakStore/locDetlCheckQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlCheckQuery.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">
@@ -57,6 +67,11 @@
         <div class="layui-inline">
             <div class="layui-input-inline">
                 <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>
         <!-- 鏃ユ湡鑼冨洿 -->
@@ -79,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>
 
@@ -97,14 +112,35 @@
         var cols = [
             {type: 'checkbox'}
             ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
-        ];
-        cols.push.apply(cols, detlCols);
-        cols.push(
-            {field: 'str3', 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: '绫诲埆'}
-            ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
-            ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'})
+            // {type: 'checkbox'}
+            // ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+        ];
+        // cols.push.apply(cols, detlCols);
+        cols.push(
+            // {field: 'str3', align: 'center',title: '瀹㈡埛鍚嶇О'}
+            // ,{field: 'str4', align: 'center',title: '椤圭洰淇℃伅'}
+            // ,{field: 'str5$', align: 'center',title: '绫诲埆'}
+            {field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
+            ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width: 180})
         return cols;
     }
 
@@ -121,9 +157,10 @@
             url: baseUrl+'/stock/out/list/auth',
             page: true,
             limit: 10,
+            limits: [10, 30, 50, 100, 200, 500],
             even: true,
             toolbar: '#toolbar',
-            cellMinWidth: 50,
+            cellMinWidth: 100,
             cols: [getCol()],
             request: {
                 pageName: 'curr',

--
Gitblit v1.9.1