From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

---
 src/main/webapp/static/js/wrkLastno/wrkLastno.js |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/main/webapp/static/js/wrkLastno/wrkLastno.js b/src/main/webapp/static/js/wrkLastno/wrkLastno.js
index 3d538d5..97e1769 100644
--- a/src/main/webapp/static/js/wrkLastno/wrkLastno.js
+++ b/src/main/webapp/static/js/wrkLastno/wrkLastno.js
@@ -10,21 +10,22 @@
     tableIns = table.render({
         elem: '#wrkLastno',
         headers: {token: localStorage.getItem('token')},
-        url: '/wrkLastno/list/auth',
+        url: baseUrl+'/wrkLastno/list/auth',
         page: true,
         limit: 16,
+        limits: [16, 30, 50, 100, 200, 500],
         even: true,
         toolbar: '#toolbar',
         cellMinWidth: 50,
         cols: [[
             {type: 'checkbox', fixed: 'left'}
             ,{field: 'wrkMk', align: 'center',title: '绫诲瀷'}
-            ,{field: 'wrkNo', align: 'center',title: '褰撳墠ID'}
             ,{field: 'sno', align: 'center',title: '璧峰ID'}
+            ,{field: 'wrkNo', align: 'center',title: '褰撳墠ID', style: 'color: #AA3130;font-weight: bold'}
             ,{field: 'eno', align: 'center',title: '缁堟ID'}
             ,{field: 'memoM', align: 'center',title: '澶囨敞'}
             ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
-            ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width:200}
+            ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate'}
         ]],
         request: {
@@ -44,7 +45,7 @@
         },
         done: function(res, curr, count) {
             if (res.code === 403) {
-                top.location.href = "/";
+                top.location.href = baseUrl+"/";
             }
             pageCurr=curr;
             limit();
@@ -74,7 +75,7 @@
             },
             done: function (res, curr, count) {
                 if (res.code === 403) {
-                    top.location.href = "/";
+                    top.location.href = baseUrl+"/";
                 }
                 pageCurr=curr;
                 limit();
@@ -116,7 +117,7 @@
                 } else {
                     layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
                         $.ajax({
-                            url: "/wrkLastno/delete/auth",
+                            url: baseUrl+"/wrkLastno/delete/auth",
                             headers: {'token': localStorage.getItem('token')},
                             data: {param: JSON.stringify(data)},
                             method: 'POST',
@@ -126,7 +127,7 @@
                                     layer.closeAll();
                                     tableReload(false);
                                 } else if (res.code === 403){
-                                    top.location.href = "/";
+                                    top.location.href = baseUrl+"/";
                                 } else {
                                     layer.msg(res.msg)
                                 }
@@ -136,7 +137,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) {
@@ -154,7 +155,7 @@
                         'fields': fields
                     };
                     $.ajax({
-                        url: "/wrkLastno/export/auth",
+                        url: baseUrl+"/wrkLastno/export/auth",
                         headers: {'token': localStorage.getItem('token')},
                         data: JSON.stringify(param),
                         dataType:'json',
@@ -165,7 +166,7 @@
                             if (res.code === 200) {
                                 table.exportFile(titles,res.data,'xls');
                             } else if (res.code === 403) {
-                                top.location.href = "/";
+                                top.location.href = baseUrl+"/";
                             } else {
                                 layer.msg(res.msg)
                             }
@@ -233,7 +234,7 @@
                        content: '../user/user_detail.html',
                        success: function(layero, index){
                            $.ajax({
-                               url: "/user/"+ param +"/auth",
+                               url: baseUrl+"/user/"+ param +"/auth",
                                headers: {'token': localStorage.getItem('token')},
                                method: 'GET',
                                success: function (res) {
@@ -270,7 +271,7 @@
                        content: '../user/user_detail.html',
                        success: function(layero, index){
                            $.ajax({
-                               url: "/user/"+ param +"/auth",
+                               url: baseUrl+"/user/"+ param +"/auth",
                                headers: {'token': localStorage.getItem('token')},
                                method: 'GET',
                                success: function (res) {
@@ -328,7 +329,7 @@
 
         };
         $.ajax({
-            url: "/wrkLastno/"+name+"/auth",
+            url: baseUrl+"/wrkLastno/"+name+"/auth",
             headers: {'token': localStorage.getItem('token')},
             data: top.reObject(data),
             method: 'POST',
@@ -340,7 +341,7 @@
                         $(this).val("");
                     });
                 } else if (res.code === 403){
-                    top.location.href = "/";
+                    top.location.href = baseUrl+"/";
                 }else {
                     layer.msg(res.msg)
                 }
@@ -402,7 +403,7 @@
         },
         done: function (res, curr, count) {
             if (res.code === 403) {
-                top.location.href = "/";
+                top.location.href = baseUrl+"/";
             }
             pageCurr=curr;
             if (res.data.length === 0 && count !== 0) {

--
Gitblit v1.9.1