From 6d75b9bda39c710153183844ba1e8effbb730de1 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 16 四月 2024 09:53:43 +0800
Subject: [PATCH] 单据、拣货单权限问题

---
 src/main/webapp/static/js/operateLog/operateLog.js |   35 ++++++++++++++++++++---------------
 1 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/main/webapp/static/js/operateLog/operateLog.js b/src/main/webapp/static/js/operateLog/operateLog.js
index 14073f1..d8c9acf 100644
--- a/src/main/webapp/static/js/operateLog/operateLog.js
+++ b/src/main/webapp/static/js/operateLog/operateLog.js
@@ -13,20 +13,21 @@
         url: baseUrl+'/operateLog/list/auth',
         page: true,
         limit: 16,
-        // even: true,
+        limits: [16, 30, 50, 100, 200, 500],
+        even: true,
         toolbar: '#toolbar',
         cellMinWidth: 50,
         cols: [[
-            {type: 'checkbox', fixed: 'left'}
-            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
-            ,{field: 'action', align: 'center',title: '璁块棶鍦板潃'}
-            ,{field: 'userId$', align: 'center',title: '鐢ㄦ埛',event: 'userId', style: 'text-decoration: underline;cursor:pointer'}
-            ,{field: 'ip',  edit:'text', align: 'center',title: '瀹㈡埛绔疘P'}
+            // {type: 'checkbox'}
+            {field: 'id', title: 'ID', sort: true,align: 'center', width: 80}
+            ,{field: 'userId$', align: 'center',title: '鐢ㄦ埛'}
+            ,{field: 'action', align: 'center',title: '鎿嶄綔鍐呭'}
+            ,{field: 'ip', align: 'center',title: '瀹㈡埛绔疘P'}
             ,{field: 'request', align: 'center',title: '璇锋眰鏁版嵁'}
             ,{field: 'response', align: 'center',title: '鍝嶅簲鏁版嵁'}
             ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
 
-            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+            // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
         ]],
         request: {
             pageName: 'curr',
@@ -45,7 +46,7 @@
         },
         done: function(res, curr, count) {
             if (res.code === 403) {
-                top.location.href = baseUrl;
+                top.location.href = baseUrl+"/";
             }
             pageCurr=curr;
             limit();
@@ -77,7 +78,7 @@
             },
             done: function (res, curr, count) {
                 if (res.code === 403) {
-                    top.location.href = baseUrl;
+                    top.location.href = baseUrl+"/";
                 }
                 pageCurr=curr;
                 limit();
@@ -132,7 +133,7 @@
                                     layer.closeAll();
                                     tableReload(false);
                                 } else if (res.code === 403){
-                                    top.location.href = baseUrl;
+                                    top.location.href = baseUrl+"/";
                                 } else {
                                     layer.msg(res.msg)
                                 }
@@ -142,7 +143,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) {
@@ -171,7 +172,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)
                             }
@@ -288,7 +289,7 @@
                         $(this).val("");
                     });
                 } else if (res.code === 403){
-                    top.location.href = baseUrl;
+                    top.location.href = baseUrl+"/";
                 }else {
                     layer.msg(res.msg)
                 }
@@ -315,7 +316,11 @@
         elem: '#createTime\\$',
         type: 'datetime'
     });
-
+    layDate.render({
+        elem: '.layui-laydate-range'
+        ,type: 'datetime'
+        ,range: true
+    });
 });
 
 // 鍏抽棴鍔ㄤ綔
@@ -335,7 +340,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