From 481486ccf088dd011156fe0a79fbd9db979c3895 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期六, 18 十月 2025 09:09:10 +0800
Subject: [PATCH] 联调
---
src/main/webapp/static/js/report/inOut.js | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/static/js/report/inOut.js b/src/main/webapp/static/js/report/inOut.js
index 36a37b1..5c8ef7e 100644
--- a/src/main/webapp/static/js/report/inOut.js
+++ b/src/main/webapp/static/js/report/inOut.js
@@ -11,14 +11,14 @@
tableIns = table.render({
elem: '#inOut',
headers: {token: localStorage.getItem('token')},
- url: '/report/viewInOutList.action',
+ url: baseUrl+'/report/viewInOutList.action',
page: true,
limit: 10,
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox'}
- ,{field: 'ymd', align: 'center', title: '鏃ユ湡', sort: true}
+ // {type: 'checkbox'}
+ {field: 'ymd', align: 'center', title: '鏃ユ湡'}
,{field: 'source_sta_no', align: 'center',title: '绔欑偣'}
,{field: 'sto_qty', align: 'center',title: '鍏ュ簱娆℃暟'}
,{field: 'ret_qty', align: 'center',title: '鍑哄簱娆℃暟'}
@@ -41,7 +41,7 @@
},
done: function(res, curr, count) {
if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -63,7 +63,7 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -76,7 +76,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) {
@@ -89,19 +89,18 @@
'fields': fields
};
$.ajax({
- url: "/report/viewInOutList.action",
+ url: baseUrl+"/report/viewInOutList.action",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
dataType:'json',
contentType:'application/json;charset=UTF-8',
method: 'POST',
success: function (res) {
- console.log(res);
layer.closeAll();
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)
}
@@ -116,6 +115,17 @@
form.on('submit(search)', function (data) {
pageCurr = 1;
tableReload(false);
+ });
+ // 鎼滅储鏍忛噸缃簨浠�
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'date'
+ ,range: true
});
});
@@ -136,7 +146,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