From ce6b5be6c0e1544bcc66f9fce9efec3ced724d95 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 11 七月 2020 15:46:29 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/wrkMastLog/wrkMastLog.js |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
index ea13204..80d052e 100644
--- a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
+++ b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
@@ -12,7 +12,8 @@
         headers: {token: localStorage.getItem('token')},
         url: baseUrl+'/wrkMastLog/list/auth',
         page: true,
-        limit: 10,
+        limit: 16,
+        limits: [16, 30, 50, 100, 200, 500],
         even: true,
         toolbar: '#toolbar',
         cellMinWidth: 50,
@@ -26,10 +27,10 @@
             ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�', width:160}
             ,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'}
             ,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈哄彿'}
-            ,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯',event: 'sourceStaNo', style: 'cursor:pointer'}
-            ,{field: 'staNo$', align: 'center',title: '鐩爣绔�',event: 'staNo', style: 'cursor:pointer'}
-            ,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�',event: 'sourceLocNo', style: 'cursor:pointer'}
-            ,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅',event: 'locNo', style: 'cursor:pointer'}
+            ,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯'}
+            ,{field: 'staNo$', align: 'center',title: '鐩爣绔�'}
+            ,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'}
+            ,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
             // ,{field: 'picking', align: 'center',title: '鎷f枡', templet:function(row){
             //         var html = "<input value='picking' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
             //         if(row.picking === 'Y'){html += " checked ";}
@@ -52,8 +53,8 @@
             // ,{field: 'crnStrTime$', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
             // ,{field: 'crnEndTime$', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
             // ,{field: 'plcStrTime$', align: 'center',title: '鎷f枡鏃堕棿'}
-            // ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'modiUser', style: 'cursor:pointer'}
-            // ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+            ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
+            ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
             // ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'cursor:pointer'}
             // ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
             ,{field: 'barcode', align: 'center',title: '鏉$爜'}
@@ -762,7 +763,11 @@
         elem: '#logErrTime\\$',
         type: 'datetime'
     });
-
+    layDate.render({
+        elem: '.layui-laydate-range'
+        ,type: 'datetime'
+        ,range: true
+    });
 
 });
 

--
Gitblit v1.9.1