From b7e08df5a07b3fa832a46ecc31983e16f2bccc8c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 24 七月 2023 14:56:01 +0800
Subject: [PATCH] # 出库作业，和库存明细管理 排序
---
src/main/webapp/static/js/report/workIn.js | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/static/js/report/workIn.js b/src/main/webapp/static/js/report/workIn.js
index bc173d9..83312e6 100644
--- a/src/main/webapp/static/js/report/workIn.js
+++ b/src/main/webapp/static/js/report/workIn.js
@@ -3,7 +3,11 @@
var cols = [
{field: 'io_time', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'mat_no', align: 'center',title: '鐗╂枡缂栧彿'}
+ ,{field: 'mat_name', align: 'center',title: '鐗╂枡鍚嶇О'}
];
+ arrRemove(detlCols, "field", "matNo");
+ arrRemove(detlCols, "field", "matName")
cols.push.apply(cols, detlCols);
return cols;
}
@@ -22,13 +26,14 @@
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/report/viewWorkInList.action',
page: true,
- limit: 10,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [getCol()],
request: {
- pageName: 'curr',
- pageSize: 'limit'
+ pageName: 'pageNumber',
+ limitName: 'pageSize'
},
parseData: function (res) {
return {
@@ -42,6 +47,7 @@
statusCode: 200
},
done: function(res, curr, count) {
+ console.log(res);
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
@@ -87,8 +93,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",
@@ -118,6 +129,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