From b51eadaa66a5c0ee6da0e418a3ba193dfc878fca Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 03 七月 2025 13:21:56 +0800
Subject: [PATCH] 1

---
 src/main/webapp/views/pakStore/locDetlQuery.html |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index ef7c53d..80be16c 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -46,6 +46,17 @@
     <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">
@@ -54,6 +65,11 @@
         <div class="layui-inline">
             <div class="layui-input-inline">
                 <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="specs" placeholder="瑙勬牸"  autocomplete="off">
             </div>
         </div>
         <div class="layui-inline">
@@ -96,7 +112,8 @@
     function getCol() {
         var cols = [
             {type: 'checkbox'}
-            ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+            ,{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}
@@ -106,22 +123,25 @@
 
     layui.config({
         base: baseUrl + "/static/layui/lay/modules/"
-    }).use(['table','laydate', 'form', 'admin'], function() {
+    }).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;
 
         // 鏁版嵁娓叉煋
         locDetlTableIns = table.render({
             elem: '#stockOut',
             headers: {token: localStorage.getItem('token')},
-            url: baseUrl+'/stock/out/list/auth',
+            url: baseUrl+'/stock/out/crn/list/auth',
             page: true,
             limits: [16, 30, 50, 100, 200, 500],
+            limit: 16,
             even: true,
+            where: {"crn_no":1},
             toolbar: '#toolbar',
             cellMinWidth: 50,
             cols: [getCol()],
@@ -141,6 +161,7 @@
                 statusCode: 200
             },
             done: function(res, curr, count) {
+                tableMerge.render(this);
                 if (res.code === 403) {
                     top.location.href = baseUrl+"/";
                 }
@@ -179,6 +200,7 @@
         $.each($('#search-box [name]').serializeArray(), function() {
             searchData[this.name] = this.value;
         });
+        searchData["crn_no"] = 1;
         locDetlTableIns.reload({
             where: searchData,
         });

--
Gitblit v1.9.1