From 03210aeb31d8e9dfa3c1f9f065587d7208d80dd8 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 10 一月 2023 12:51:34 +0800
Subject: [PATCH] #
---
src/main/webapp/views/home/console.html | 39 ++++++++++++++++++++++++++-------------
src/main/resources/mapper/ViewStayTimeMapper.xml | 3 +++
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 15 +++++++++++++++
3 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index b25238c..03433fc 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -68,6 +68,21 @@
ViewStayTimeBean bean = new ViewStayTimeBean();
bean.setPageSize(limit);
bean.setPageNumber(curr);
+ String matnr = String.valueOf(param.get("matnr"));
+ if (!Cools.isEmpty(matnr) && !matnr.equals("null")) {
+ bean.setMatnr(matnr);
+ }
+
+ String maktx = String.valueOf(param.get("maktx"));
+ if (!Cools.isEmpty(maktx) && !maktx.equals("null")) {
+ bean.setMaktx(maktx);
+ }
+
+ String specs = String.valueOf(param.get("specs"));
+ if (!Cools.isEmpty(specs) && !specs.equals("null")) {
+ bean.setSpecs(specs);
+ }
+
String locNo = String.valueOf(param.get("loc_no"));
if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
bean.setLoc_no(locNo);
diff --git a/src/main/resources/mapper/ViewStayTimeMapper.xml b/src/main/resources/mapper/ViewStayTimeMapper.xml
index 8a23b69..7c9b42d 100644
--- a/src/main/resources/mapper/ViewStayTimeMapper.xml
+++ b/src/main/resources/mapper/ViewStayTimeMapper.xml
@@ -8,6 +8,9 @@
<if test="loc_no!=null and loc_no!='' ">
and asr_loc_mast.loc_no like '%' + #{loc_no} + '%'
</if>
+ <if test="specs!=null and specs!='' ">
+ and specs like '%' + #{specs} + '%'
+ </if>
<if test="matnr!=null and matnr!='' ">
and matnr like '%' + #{matnr} + '%'
</if>
diff --git a/src/main/webapp/views/home/console.html b/src/main/webapp/views/home/console.html
index a17558c..60f5f0f 100644
--- a/src/main/webapp/views/home/console.html
+++ b/src/main/webapp/views/home/console.html
@@ -109,7 +109,7 @@
<div class="home-elem loc-retention">
<div class="layui-form">
<div id="form-header">搴撳瓨婊炵暀鏃堕棿缁熻琛�</div>
- <div class="layui-card" style="padding: 0 20px 20px 20px;">
+ <div class="layui-card" style="padding: 0 20px 1px 20px;">
<fieldset class="layui-elem-field site-demo-button" style="margin: 20px;">
<legend>鎼滅储鏍�</legend>
<div id="search-box" class="layui-form layui-card-header">
@@ -120,23 +120,13 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="maktx" 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="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ <input class="layui-input" type="text" name="specs" placeholder="瑙勬牸" autocomplete="off">
</div>
</div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
<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>
</fieldset>
@@ -291,6 +281,7 @@
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
+ var form = layui.form;
// 鏁版嵁娓叉煋
tableIns = table.render({
@@ -389,6 +380,28 @@
}
});
});
+
+ // 鎼滅储鏍忔悳绱簨浠�
+ form.on('submit(search)', function (data) {
+ tableReload();
+ });
+ // 鎼滅储鏍忔悳绱簨浠�
+ form.on('submit(reset)', function (data) {
+ $(':input', $('#search-box'))
+ .val('')
+ .removeAttr('checked')
+ .removeAttr('selected');
+ });
+
+ function tableReload() {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData
+ });
+ }
});
--
Gitblit v1.9.1