From aa7c4ba35f1201615c18e47e54899a873eea28d3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 27 六月 2020 08:44:28 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/wrkMastLog/wrkMastLog.js |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
index 621cce7..74fe97c 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,
@@ -52,8 +53,8 @@
             // ,{field: 'crnStrTime$', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
             // ,{field: 'crnEndTime$', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
             // ,{field: 'plcStrTime$', align: 'center',title: '鎷ｆ枡鏃堕棿'}
-            // ,{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: '鏉＄爜'}
@@ -83,7 +84,7 @@
         },
         done: function(res, curr, count) {
             if (res.code === 403) {
-                top.location.href = baseUrl;
+                top.location.href = baseUrl+"/";
             }
             pageCurr=curr;
             limit();
@@ -113,7 +114,7 @@
             },
             done: function (res, curr, count) {
                 if (res.code === 403) {
-                    top.location.href = baseUrl;
+                    top.location.href = baseUrl+"/";
                 }
                 pageCurr=curr;
                 limit();
@@ -165,7 +166,7 @@
                                     layer.closeAll();
                                     tableReload(false);
                                 } else if (res.code === 403){
-                                    top.location.href = baseUrl;
+                                    top.location.href = baseUrl+"/";
                                 } else {
                                     layer.msg(res.msg)
                                 }
@@ -175,7 +176,7 @@
                 }
                 break;
             case 'exportData':
-                layer.confirm('纭畾瀵煎嚭Excel鍚�', function(){
+                layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
                     var titles=[];
                     var fields=[];
                     obj.config.cols[0].map(function (col) {
@@ -204,7 +205,7 @@
                             if (res.code === 200) {
                                 table.exportFile(titles,res.data,'xls');
                             } else if (res.code === 403) {
-                                top.location.href = baseUrl;
+                                top.location.href = baseUrl+"/";
                             } else {
                                 layer.msg(res.msg)
                             }
@@ -681,7 +682,7 @@
                         $(this).val("");
                     });
                 } else if (res.code === 403){
-                    top.location.href = baseUrl;
+                    top.location.href = baseUrl+"/";
                 }else {
                     layer.msg(res.msg)
                 }
@@ -762,7 +763,11 @@
         elem: '#logErrTime\\$',
         type: 'datetime'
     });
-
+    layDate.render({
+        elem: '.layui-laydate-range'
+        ,type: 'datetime'
+        ,range: true
+    });
 
 });
 
@@ -783,7 +788,7 @@
         },
         done: function (res, curr, count) {
             if (res.code === 403) {
-                top.location.href = baseUrl;
+                top.location.href = baseUrl+"/";
             }
             pageCurr=curr;
             if (res.data.length === 0 && count !== 0) {

--
Gitblit v1.9.1