From 9052fef232f56eb878d7cf8360a09a11e6a0fe2f Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 06 六月 2025 10:48:54 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/pakStore/stockOut.js |   46 ++++++++++++++++++++++++++--------------------
 1 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/main/webapp/static/js/pakStore/stockOut.js b/src/main/webapp/static/js/pakStore/stockOut.js
index af9afd9..cd0de96 100644
--- a/src/main/webapp/static/js/pakStore/stockOut.js
+++ b/src/main/webapp/static/js/pakStore/stockOut.js
@@ -1,4 +1,4 @@
-var admin;
+var locDetlLayerIdx;
 var locDetlData = [];
 function getCol() {
     var cols = [
@@ -14,12 +14,14 @@
 
 layui.config({
     base: baseUrl + "/static/layui/lay/modules/"
-}).use(['admin', 'table','laydate', 'form'], function() {
+}).use(['table','laydate', 'form', 'admin', 'tableMerge'], function() {
     var table = layui.table;
     var $ = layui.jquery;
     var layer = layui.layer;
     var form = layui.form;
-    admin = layui.admin;
+    var admin = layui.admin;
+    var tableMerge = layui.tableMerge;
+
 
     tableIns = table.render({
         elem: '#chooseData',
@@ -28,8 +30,10 @@
         even: true,
         toolbar: '#toolbar',
         cellMinWidth: 50,
+        limit: 500,
         cols: [getCol()],
         done: function(res, curr, count) {
+            tableMerge.render(this);
             limit();
             getOutBound();
         }
@@ -75,7 +79,7 @@
                         return;
                     }
                     let param = {
-                        outSite: staNo,
+                        floor: staNo,
                         locDetls: locDetlData
                     }
                     $.ajax({
@@ -134,23 +138,25 @@
             }
         })
     }
+
+
+    $(document).on('click','#mat-query', function () {
+        let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
+        locDetlLayerIdx = layer.open({
+            type: 2,
+            title: false,
+            closeBtn: false,
+            maxmin: false,
+            area: ['90%', '85%'],
+            shadeClose: true,
+            content: 'locDetlQuery.html',
+            success: function(layero, index){
+                layer.close(loadIndex);
+            }
+        });
+    })
+
 })
-
-
-var locDetlLayerIdx;
-function getLocDetl() {
-    locDetlLayerIdx = layer.open({
-        type: 2,
-        title: false,
-        closeBtn: false,
-        maxmin: false,
-        area: ['90%', '85%'],
-        shadeClose: true,
-        content: 'locDetlQuery.html',
-        success: function(layero, index){
-        }
-    });
-}
 
 // 娣诲姞琛ㄦ牸鏁版嵁
 function addTableData(data) {

--
Gitblit v1.9.1