From dc611cd221af70205e23f79d03298700de36b0f6 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期二, 10 九月 2024 16:08:09 +0800
Subject: [PATCH] 证书问题
---
src/main/webapp/static/js/rowLastno/rowLastno.js | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/static/js/rowLastno/rowLastno.js b/src/main/webapp/static/js/rowLastno/rowLastno.js
index 678f470..f26e048 100644
--- a/src/main/webapp/static/js/rowLastno/rowLastno.js
+++ b/src/main/webapp/static/js/rowLastno/rowLastno.js
@@ -13,23 +13,28 @@
url: baseUrl+'/rowLastno/list/auth',
page: true,
limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox', fixed: 'left'}
+ // {type: 'checkbox', fixed: 'left'}
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
- ,{field: 'whsType', align: 'center',title: '绫诲埆', 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: 'staNoList', 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 +52,6 @@
statusCode: 200
},
done: function(res, curr, count) {
- console.log(res);
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
@@ -141,7 +145,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) {
@@ -327,6 +331,9 @@
sRow: $('#sRow').val(),
eRow: $('#eRow').val(),
crnQty: $('#crnQty').val(),
+ sCrnNo: $('#sCrnNo').val(),
+ eCrnNo: $('#eCrnNo').val(),
+ staNoList: $('#staNoList').val(),
memo: $('#memo').val(),
modiUser: $('#modiUser').val(),
modiTime: top.strToDate($('#modiTime\\$').val()),
--
Gitblit v1.9.1