From e85f0e74d21e49b9c68474bc4d19f5eceacf1a46 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:40:04 +0800
Subject: [PATCH] 对接
---
src/main/webapp/static/js/rowLastno/rowLastno.js | 48 ++++++++++++++++++++++++++++++------------------
1 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/static/js/rowLastno/rowLastno.js b/src/main/webapp/static/js/rowLastno/rowLastno.js
index c0265d5..7bd9ec6 100644
--- a/src/main/webapp/static/js/rowLastno/rowLastno.js
+++ b/src/main/webapp/static/js/rowLastno/rowLastno.js
@@ -13,23 +13,32 @@
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: 'wrkMk', align: 'center',title: '褰撳墠宸ヤ綔鍙�'}
- ,{field: 'currentRow', align: 'center',title: '褰撳墠鎺掑彿'}
- ,{field: 'sRow', align: 'center',title: '璧峰鎺掑彿'}
- ,{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: 'whsType', align: 'center',title: '绫诲埆', width:80, hide:true}
+ ,{field: 'wrkMk', align: 'center',title: '褰撳墠宸ヤ綔鍙�', hide:false}
+ ,{field: 'sRow', align: 'center',title: '璧峰鎺掑彿', hide:true}
+ ,{field: 'currentRow', align: 'center',title: '褰撳墠鎺掑彿', style: 'color: #AA3130;font-weight: bold', hide:false}
+ ,{field: 'eRow', align: 'center',title: '缁堟鎺掑彿', hide:true}
+ ,{field: 'sCrnNo', align: 'center',title: '璧峰鍫嗗灈鏈哄彿', hide:true}
+ ,{field: 'eCrnNo', align: 'center',title: '缁堟鍫嗗灈鏈哄彿', hide:true}
+ ,{field: 'crnQty', align: 'center',title: '鍫嗗灈鏈烘暟閲�', hide:true}
+ ,{field: 'staNoList', align: 'center',title: '绔欑偣闆嗗悎', hide:false}
+ ,{field: 'typeId$', align: 'center',title: '搴撶被鍨�', hide:false}
+ ,{field: 'beSimilar', align: 'center',title: '鐩镐技鐗╂枡寮�鍏�', hide:true}
+ ,{field: 'pointSwitch', align: 'center',title: '鏄惁瀛樺湪鐐逛綅', hide:true}
+ ,{field: 'emptySimilar', align: 'center',title: '绌烘澘闈犺繎鎽嗘斁', hide:true}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide:false}
+ ,{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 +57,7 @@
},
done: function(res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -78,7 +87,7 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -130,7 +139,7 @@
layer.closeAll();
tableReload(false);
} else if (res.code === 403){
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
} else {
layer.msg(res.msg)
}
@@ -140,7 +149,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 +178,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)
}
@@ -326,6 +335,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()),
@@ -347,7 +359,7 @@
$(this).val("");
});
} else if (res.code === 403){
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
}else {
layer.msg(res.msg)
}
@@ -409,7 +421,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