From 4ad1f324ab1fd2b51504afc00b43b4ee40f029c2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 20 二月 2025 09:40:03 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/pakStore/locDetlQuery.html |  128 +++++++++++++++++++-----------------------
 1 files changed, 59 insertions(+), 69 deletions(-)

diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 8c01684..154ff98 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -7,11 +7,11 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
     <link rel="stylesheet" href="../../static/css/cool.css" media="all">
     <link rel="stylesheet" href="../../static/css/common.css" media="all">
     <style>
         body {
-            padding: 0 20px;
         }
         .layui-table-box {
             border-right: 1px solid #9F9F9F;
@@ -38,12 +38,25 @@
     </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>
 <!-- 鎼滅储鏍� -->
 <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 cool-auto-complete">
+                <input id="crnNo" class="layui-input" name="crnNo" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
+                <input id="crnNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鍫嗗灈鏈哄彿" onfocus=this.blur()>
+                <div class="cool-auto-complete-window">
+                    <input class="cool-auto-complete-window-input" data-key="basCrnpQueryBycrnNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
+                    <select class="cool-auto-complete-window-select" data-key="basCrnpQueryBycrnNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+                    </select>
+                </div>
+            </div>
+        </div>
         <div class="layui-inline">
             <div class="layui-input-inline">
                 <input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
@@ -51,12 +64,17 @@
         </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="matnr" placeholder="瑙勬牸"  autocomplete="off">
             </div>
         </div>
         <div class="layui-inline">
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="maktx" placeholder="鐗╂枡鎻忚堪" autocomplete="off">
+                <input class="layui-input" type="text" name="maktx" placeholder="鐗╂枡鍚嶇О" autocomplete="off">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <div class="layui-input-inline">
+                <input class="layui-input" type="text" name="batch" placeholder="鎵瑰彿" autocomplete="off">
             </div>
         </div>
         <!-- 鏃ユ湡鑼冨洿 -->
@@ -68,7 +86,6 @@
         <!-- 寰呮坊鍔� -->
         <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>
@@ -92,45 +109,48 @@
 </body>
 <script>
 
-    var pageCurr;
-    layui.use(['table','laydate', 'form'], function() {
+    function getCol() {
+        var cols = [
+            {type: 'checkbox', merge: ['locNo']}
+            ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}
+            // ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+        ];
+        cols.push.apply(cols, detlCols);
+        cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
+            ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'})
+        return cols;
+    }
+
+    layui.config({
+        base: baseUrl + "/static/layui/lay/modules/"
+    }).use(['table','laydate', 'form', 'admin', 'tableMerge'], function() {
         var table = layui.table;
         var $ = layui.jquery;
         var layer = layui.layer;
         var layDate = layui.laydate;
         var form = layui.form;
+        var admin = layui.admin;
+        var tableMerge = layui.tableMerge;
+        var dataSource = []
+
         // 鏁版嵁娓叉煋
         locDetlTableIns = table.render({
             elem: '#stockOut',
             headers: {token: localStorage.getItem('token')},
             url: baseUrl+'/stock/out/list/auth',
             page: true,
-            limit: 10,
+            limits: [16, 30, 50, 100, 200, 500],
+            limit: 16,
             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: '澶囨敞'}
-
-            ]],
+            cols: [getCol()],
             request: {
                 pageName: 'curr',
                 pageSize: 'limit'
             },
             parseData: function (res) {
+                dataSource = res.data.records
                 return {
                     'code': res.code,
                     'msg': res.msg,
@@ -142,46 +162,41 @@
                 statusCode: 200
             },
             done: function(res, curr, count) {
+                tableMerge.render(this);
                 if (res.code === 403) {
                     top.location.href = baseUrl+"/";
                 }
-                pageCurr=curr;
-                form.on('checkbox(tableCheckbox)', function (data) {
-                    var _index = $(data.elem).attr('table-index')||0;
-                    if(data.elem.checked){
-                        res.data[_index][data.value] = 'Y';
-                    }else{
-                        res.data[_index][data.value] = 'N';
-                    }
-                });
             }
         });
 
         // 鐩戝惉澶村伐鍏锋爮浜嬩欢
         table.on('toolbar(stockOut)', function (obj) {
+
             var checkStatus = table.checkStatus(obj.config.id);
             var data = checkStatus.data;
+            var dataList = []
+            for (var j = 0; j < data.length; j++) {
+                var locno = data[j].locNo
+                for(var i = 0;i < dataSource.length; i++) {
+                    if (dataSource[i].locNo === locno) {
+                        dataList.push(dataSource[i])
+                    }
+                }
+            }
+
             switch(obj.event) {
                 case 'confirm':
                     if (data.length === 0){
                         layer.msg("璇烽�夋嫨鏁版嵁");
                         return;
                     }
-                    parent.addTableData(data);
+                    parent.addTableData(dataList);
                     break;
             }
         });
 
         // 鎼滅储鏍忔悳绱簨浠�
         form.on('submit(search)', function (data) {
-            pageCurr = 1;
-            tableReload();
-        });
-
-        // 鎼滅储鏍忛噸缃簨浠�
-        form.on('submit(reset)', function (data) {
-            pageCurr = 1;
-            clearFormVal($('#search-box'));
             tableReload();
         });
 
@@ -192,39 +207,14 @@
         });
     })
 
-    function tableReload(child) {
+    function tableReload() {
         var searchData = {};
         $.each($('#search-box [name]').serializeArray(), function() {
             searchData[this.name] = this.value;
         });
         locDetlTableIns.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) {
-                    locDetlTableIns.reload({
-                        where: searchData,
-                        page: {
-                            curr: pageCurr-1
-                        }
-                    });
-                    pageCurr -= 1;
-                }
-            }
         });
-    }
-
-    function clearFormVal(el) {
-        $(':input', el)
-            .val('')
-            .removeAttr('checked')
-            .removeAttr('selected');
     }
 </script>
 </html>

--
Gitblit v1.9.1