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/report/reportStockUse.js | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/static/js/report/reportStockUse.js b/src/main/webapp/static/js/report/reportStockUse.js
index a1b7eb1..6c92acb 100644
--- a/src/main/webapp/static/js/report/reportStockUse.js
+++ b/src/main/webapp/static/js/report/reportStockUse.js
@@ -14,11 +14,12 @@
url: baseUrl+'/report/viewStockUseList.action',
page: true,
limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox', fixed: 'left'}
- ,{field: 'row1', title: '閽㈡灦鍙�', sort: true, align: 'center'}
+ // {type: 'checkbox', fixed: 'left'}
+ {field: 'row1', title: '閽㈡灦鍙�', sort: true, align: 'center'}
,{field: 'total_qty', align: 'center',title: '搴撲綅鎬绘暟'}
,{field: 'full_qty', align: 'center',title: '鍦ㄥ簱鏁伴噺'}
,{field: 'null_qty', align: 'center',title: '绌哄簱浣嶆暟閲�'}
@@ -44,7 +45,7 @@
},
done: function(res, curr, count) {
if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -66,7 +67,7 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -79,7 +80,7 @@
var checkStatus = table.checkStatus(obj.config.id);
switch(obj.event) {
case 'exportData':
- layer.confirm('纭畾瀵煎嚭Excel鍚�', function(){
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
var titles=[];
var fields=[];
obj.config.cols[0].map(function (col) {
@@ -103,7 +104,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)
}
@@ -112,6 +113,12 @@
});
break;
}
+ });
+
+ // 鎼滅储鏍忔悳绱簨浠�
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
});
});
@@ -133,7 +140,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