From cd280ead41b98ee60154038e36d9b83cc25e7d16 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 20 十二月 2023 12:55:25 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/stoMan/stoQue.js |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index 9dc54d2..1b52ae6 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -19,8 +19,8 @@
         headers: {token: localStorage.getItem('token')},
         url: baseUrl+'/locMast/list/auth',
         page: true,
-        limit: 16,
-        limits: [16, 30, 50, 100, 200, 500],
+        limit: 20,
+        limits: [20, 30, 50, 100, 200, 500],
         even: true,
         toolbar: '#toolbar',
         cellMinWidth: 50,
@@ -28,18 +28,24 @@
             {type: 'checkbox'}
             ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
             ,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��', width: 180, style: 'color: #8E2323'}
-            ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
-            ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
+            ,{field: 'fireStatus$', align: 'center',title: '娑堥槻鐘舵��', width: 90, style: 'color: #8E2323'}
+            ,{field: 'packStatus$', align: 'center',title: '浜у搧鐘舵��', width: 90, style: 'color: #8E2323'}
+            ,{field: 'locType1$', align: 'center',title: '搴撲綅绫诲瀷'}
+            ,{field: 'locType2$', align: 'center',title: '娴嬭瘯璁惧鍙�'}
+            ,{field: 'freeze$', align: 'center',title: '鍐荤粨鐘舵��',width: 90}
+            // ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
+            // ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
             ,{field: 'row1', align: 'center',title: '鎺�'}
             ,{field: 'bay1', align: 'center',title: '鍒�'}
             ,{field: 'lev1', align: 'center',title: '灞�'}
-            ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
-                    var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
-                    if(row.fullPlt === 'Y'){html += " checked ";}
-                    html += "disabled='disabled' >";
-                    return html;
-                },width:80}
-            ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
+            // ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
+            //         var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
+            //         if(row.fullPlt === 'Y'){html += " checked ";}
+            //         html += "disabled='disabled' >";
+            //         return html;
+            //     },width:80}
+            ,{field: 'barcode', align: 'center',title: '鎵樼洏鐮�'}
+            ,{field: 'ctnKind', align: 'center',title: '鍚姩鎸夐挳'}
             ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width: 180}
             ,{ fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate'}
         ]],
@@ -210,7 +216,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: 'pack鐮�'}
                 ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
             ]],
             request: {

--
Gitblit v1.9.1