From 002f10f7d38dc6791d26a69d061e6b17f9980fd0 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 24 三月 2025 19:41:36 +0800
Subject: [PATCH] 1

---
 src/main/webapp/static/js/stoMan/stoQue.js |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index 4fe0666..9fb7e04 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -7,22 +7,30 @@
     var layDate = layui.laydate;
     var form = layui.form;
 
+    layDate.render({
+        elem: '.layui-laydate-range'
+        ,type: 'datetime'
+        ,range: true
+    });
+
     // 鏁版嵁娓叉煋
     tableIns = table.render({
         elem: '#stoQue',
         headers: {token: localStorage.getItem('token')},
         url: baseUrl+'/locMast/list/auth',
         page: true,
-        limit: 10,
+        limit: 20,
+        limits: [20, 30, 50, 100, 200, 500],
         even: true,
         toolbar: '#toolbar',
         cellMinWidth: 50,
         cols: [[
             {type: 'checkbox'}
             ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
-            ,{field: 'locType$', align: 'center',title: '搴撲綅鐘舵��', width: 180, style: 'color: #8E2323'}
-            ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
+            ,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��', width: 180, style: 'color: #8E2323'}
+            // ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
             ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
+            ,{field: 'qrCodeValue', align: 'center',title: '浜岀淮鐮佸��', sort:true}
             ,{field: 'row1', align: 'center',title: '鎺�'}
             ,{field: 'bay1', align: 'center',title: '鍒�'}
             ,{field: 'lev1', align: 'center',title: '灞�'}
@@ -104,6 +112,7 @@
                 break;
             case 'exportData':
                 layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+                    layer.load(2, {time: 600*1000});
                     var titles=[];
                     var fields=[];
                     obj.config.cols[0].map(function (col) {
@@ -150,10 +159,10 @@
             // 鏌ョ湅鏄庣粏
             case 'locDetl':
                 // locDetl(data.locNo);
-                if (data.locType.trim() === ''
-                    || data.locType.trim() === 'S'
-                    || data.locType.trim() === 'D'
-                    || data.locType.trim() === 'O')  {
+                if (data.locSts.trim() === ''
+                    || data.locSts.trim() === 'S'
+                    || data.locSts.trim() === 'D'
+                    || data.locSts.trim() === 'O')  {
                     layer.msg("姝ゅ簱浣嶇殑鐘舵�佷笉瀛樺湪鐗╂枡");
                     return;
                 }
@@ -203,7 +212,7 @@
                 ,{field: 'werks', align: 'center',title: '宸ュ巶'}
                 ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
                 ,{field: 'altme', align: 'center',title: '鍗曚綅'}
-                ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'}
+                ,{field: 'zpallet', align: 'center',title: '璐ф灦鏉$爜'}
                 ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
             ]],
             request: {

--
Gitblit v1.9.1