From 03e5ff030c6883df3daec952b7bc9af13ecd130c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 29 七月 2020 11:03:39 +0800
Subject: [PATCH] #当前本版十分完美、冻结
---
src/main/webapp/static/js/report/workOut.js | 17 +++++++-
src/main/webapp/views/report/viewWorkOut.html | 31 +++++++++------
src/main/java/com/zy/asrs/entity/ViewWorkInBean.java | 12 +++++
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 7 ---
4 files changed, 46 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index 836f31e..c62d6f7 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -161,12 +161,7 @@
//------------------鏃ュ嚭搴撴槑缁嗙粺璁�--------------------------------------
@RequestMapping("/viewWorkOutList.action")
- public R viewWorkOutList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- ViewWorkInBean bean = new ViewWorkInBean();
- bean.setPageSize(limit);
- bean.setPageNumber(curr);
+ public R viewWorkOutList(ViewWorkInBean bean){
List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkOutList(bean);
int count = reportQueryMapper.getViewWorkOutCount(bean);
Page<ViewWorkInBean> page = new Page<>();
diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index 089ca68..3bad406 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -61,6 +61,7 @@
private double wt; //閲嶉噺
private int pageNumber;
private int pageSize;
+ private String query_date;
private String begin_date; //鏌ヨ寮�濮嬫棩鏈�
private String end_date; //鏌ヨ鎴鏃ユ湡
private double num1;
@@ -404,5 +405,14 @@
public void setCrn_end_time(String crn_end_time) {
this.crn_end_time = crn_end_time;
}
-
+
+ public void setQuery_date(String query_date) {
+ this.query_date = query_date;
+ if (query_date.contains(" - ")) {
+ String[] dates = query_date.split(" - ");
+ this.begin_date = dates[0];
+ this.end_date = dates[1];
+
+ }
+ }
}
\ No newline at end of file
diff --git a/src/main/webapp/static/js/report/workOut.js b/src/main/webapp/static/js/report/workOut.js
index 49a03e0..035d6b5 100644
--- a/src/main/webapp/static/js/report/workOut.js
+++ b/src/main/webapp/static/js/report/workOut.js
@@ -30,8 +30,8 @@
cellMinWidth: 50,
cols: [getCol()],
request: {
- pageName: 'curr',
- pageSize: 'limit'
+ pageName: 'pageNumber',
+ limitName: 'pageSize'
},
parseData: function (res) {
return {
@@ -121,6 +121,19 @@
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
+ });
+
});
// 鍏抽棴鍔ㄤ綔
diff --git a/src/main/webapp/views/report/viewWorkOut.html b/src/main/webapp/views/report/viewWorkOut.html
index 48dfd47..6d91968 100644
--- a/src/main/webapp/views/report/viewWorkOut.html
+++ b/src/main/webapp/views/report/viewWorkOut.html
@@ -19,18 +19,25 @@
<!-- 鎼滅储鏍� -->
<div id="search-box" class="layui-form layui-card-header">
- <!--<div class="layui-inline">-->
- <!--<label class="layui-form-label">搴� 浣� 鍙凤細</label>-->
- <!--<div class="layui-input-inline">-->
- <!--<input class="layui-input" type="text" name="id" placeholder="璇疯緭鍏�" autocomplete="off">-->
- <!--</div>-->
- <!--</div>-->
-
- <!-- 寰呮坊鍔� -->
-<!-- <div id="data-search-btn" class="layui-btn-container layui-form-item">-->
-<!-- <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>-->
-<!-- <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>-->
-<!-- </div>-->
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栫爜" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="query_date" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div id="data-search-btn" class="layui-btn-container layui-form-item">
+ <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+ <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
+ </div>
</div>
<!-- 琛ㄦ牸 -->
--
Gitblit v1.9.1