From bcb5e464f879458c421069e7d8c72d8c16b4ac7b Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期六, 13 八月 2022 10:32:46 +0800
Subject: [PATCH] Merge branch 'gzynasrs' of http://47.97.1.152:5880/r/zy-asrs into gzynasrs
---
src/main/webapp/static/js/rowLastno/rowLastno.js | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/static/js/rowLastno/rowLastno.js b/src/main/webapp/static/js/rowLastno/rowLastno.js
index 678f470..bd2356e 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,15 @@
// ,{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: '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',
@@ -47,7 +48,6 @@
statusCode: 200
},
done: function(res, curr, count) {
- console.log(res);
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
@@ -141,7 +141,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) {
--
Gitblit v1.9.1