From 4f24d81a17023a8037cd6adb5462858117466f6d Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 01 三月 2024 16:59:26 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/static/js/rowLastno/rowLastno.js b/src/main/webapp/static/js/rowLastno/rowLastno.js
index 7119e25..d55d336 100644
--- a/src/main/webapp/static/js/rowLastno/rowLastno.js
+++ b/src/main/webapp/static/js/rowLastno/rowLastno.js
@@ -13,6 +13,7 @@
         url: baseUrl+'/rowLastno/list/auth',
         page: true,
         limit: 16,
+        limits: [16, 30, 50, 100, 200, 500],
         even: true,
         toolbar: '#toolbar',
         cellMinWidth: 50,
@@ -21,15 +22,17 @@
 //            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
             ,{field: 'whsType', align: 'center',title: '绫诲埆', width:80}
             ,{field: 'wrkMk', align: 'center',title: '褰撳墠宸ヤ綔鍙�'}
-            ,{field: 'currentRow', align: 'center',title: '褰撳墠鎺掑彿'}
             ,{field: 'sRow', align: 'center',title: '璧峰鎺掑彿'}
+            ,{field: 'currentRow', align: 'center',title: '褰撳墠鎺掑彿', style: 'color: #AA3130;font-weight: bold'}
             ,{field: 'eRow', align: 'center',title: '缁堟鎺掑彿'}
+            ,{field: 'sCrnNo', align: 'center',title: '璧峰鍫嗗灈鏈哄彿'}
+            ,{field: 'eCrnNo', align: 'center',title: '缁堟鍫嗗灈鏈哄彿'}
             ,{field: 'crnQty', align: 'center',title: '鍫嗗灈鏈烘暟閲�'}
             ,{field: 'memo', align: 'center',title: '澶囨敞'}
-            ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
-            ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width:200}
+            ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
+            ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
 
-            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
         ]],
         request: {
             pageName: 'curr',
@@ -48,7 +51,7 @@
         },
         done: function(res, curr, count) {
             if (res.code === 403) {
-                top.location.href = "/";
+                top.location.href = baseUrl+"/";
             }
             pageCurr=curr;
             limit();
@@ -78,7 +81,7 @@
             },
             done: function (res, curr, count) {
                 if (res.code === 403) {
-                    top.location.href = "/";
+                    top.location.href = baseUrl+"/";
                 }
                 pageCurr=curr;
                 limit();
@@ -130,7 +133,7 @@
                                     layer.closeAll();
                                     tableReload(false);
                                 } else if (res.code === 403){
-                                    top.location.href = "/";
+                                    top.location.href = baseUrl+"/";
                                 } else {
                                     layer.msg(res.msg)
                                 }
@@ -140,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) {
@@ -169,7 +172,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)
                             }
@@ -325,6 +328,8 @@
             currentRow: $('#currentRow').val(),
             sRow: $('#sRow').val(),
             eRow: $('#eRow').val(),
+            sCrnNo: $('#sCrnNo').val(),
+            eCrnNo: $('#eCrnNo').val(),
             crnQty: $('#crnQty').val(),
             memo: $('#memo').val(),
             modiUser: $('#modiUser').val(),
@@ -347,7 +352,7 @@
                         $(this).val("");
                     });
                 } else if (res.code === 403){
-                    top.location.href = "/";
+                    top.location.href = baseUrl+"/";
                 }else {
                     layer.msg(res.msg)
                 }
@@ -409,7 +414,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