From 7d86c8c3edfe2ee2ee83d468c1502ed2efe21697 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 28 四月 2025 10:39:44 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/report/workIn.js | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/static/js/report/workIn.js b/src/main/webapp/static/js/report/workIn.js
index 80267c4..ccf3fa2 100644
--- a/src/main/webapp/static/js/report/workIn.js
+++ b/src/main/webapp/static/js/report/workIn.js
@@ -1,8 +1,9 @@
var pageCurr;
function getCol() {
var cols = [
- {field: 'io_time', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
+ {field: 'ioTime$', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'model', align: 'center',title: '鍥惧彿'}
];
cols.push.apply(cols, detlCols);
return cols;
@@ -28,8 +29,8 @@
cellMinWidth: 50,
cols: [getCol()],
request: {
- pageName: 'curr',
- pageSize: 'limit'
+ pageName: 'pageNumber',
+ limitName: 'pageSize'
},
parseData: function (res) {
return {
@@ -88,8 +89,13 @@
fields.push(col.field);
}
});
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
var param = {
- 'fields': fields
+ fields: fields,
+ exportData: exportData
};
$.ajax({
url: baseUrl+"/report/viewWorkInExport.action",
@@ -119,6 +125,17 @@
pageCurr = 1;
tableReload(false);
});
+ // 鎼滅储鏍忛噸缃簨浠�
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
});
// 鍏抽棴鍔ㄤ綔
--
Gitblit v1.9.1