From e7d8e2c64facfa261e8b168b84e81ef6c835f57d Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 03 九月 2025 09:25:19 +0800
Subject: [PATCH] 许可证到期提醒,系统30分钟无操作下线账号

---
 src/main/webapp/static/js/pakStore/stockOut.js |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/static/js/pakStore/stockOut.js b/src/main/webapp/static/js/pakStore/stockOut.js
index dc21d99..cd0de96 100644
--- a/src/main/webapp/static/js/pakStore/stockOut.js
+++ b/src/main/webapp/static/js/pakStore/stockOut.js
@@ -14,12 +14,14 @@
 
 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 form = layui.form;
     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({
@@ -137,6 +141,7 @@
 
 
     $(document).on('click','#mat-query', function () {
+        let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
         locDetlLayerIdx = layer.open({
             type: 2,
             title: false,
@@ -146,6 +151,7 @@
             shadeClose: true,
             content: 'locDetlQuery.html',
             success: function(layero, index){
+                layer.close(loadIndex);
             }
         });
     })

--
Gitblit v1.9.1