From 1a786e19195d98e06d2b3319b7ed0148d5c86cc8 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期三, 24 六月 2020 08:55:06 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/LocDetlController.java | 9 +++++++++ src/main/java/com/zy/common/web/BaseController.java | 2 +- src/main/webapp/views/pakStore/locDetlQuery.html | 13 +++++++++++++ 3 files changed, 23 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java index 903acb9..90c99f6 100644 --- a/src/main/java/com/zy/asrs/controller/LocDetlController.java +++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java @@ -35,6 +35,15 @@ public R stockOutList(@RequestParam(defaultValue = "1")Integer curr, @RequestParam(defaultValue = "10")Integer limit, @RequestParam Map<String, Object> param){ + if (!Cools.isEmpty(param.get("modi_time"))){ + String val = String.valueOf(param.get("modi_time")); + if (val.contains(RANGE_TIME_LINK)) { + String[] dates = val.split(RANGE_TIME_LINK); + param.put("startTime", DateUtils.convert(dates[0])); + param.put("endTime", DateUtils.convert(dates[1])); + param.remove("modi_time"); + } + } return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class))); } diff --git a/src/main/java/com/zy/common/web/BaseController.java b/src/main/java/com/zy/common/web/BaseController.java index 021601e..ecc7e80 100644 --- a/src/main/java/com/zy/common/web/BaseController.java +++ b/src/main/java/com/zy/common/web/BaseController.java @@ -71,7 +71,7 @@ // 鍏ㄥ瓧娈垫ā绯婃悳绱� todo if (!Cools.isEmpty(map.get("condition"))) { Set<String> columns = new HashSet<>(); - for (Field field :Cools.getAllFields(cls)){ + for (Field field : Cools.getAllFields(cls)){ if (Modifier.isFinal(field.getModifiers()) || Modifier.isStatic(field.getModifiers()) || Modifier.isTransient(field.getModifiers())){ diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html index 96d4919..8c01684 100644 --- a/src/main/webapp/views/pakStore/locDetlQuery.html +++ b/src/main/webapp/views/pakStore/locDetlQuery.html @@ -59,6 +59,12 @@ <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 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> @@ -91,6 +97,7 @@ var table = layui.table; var $ = layui.jquery; var layer = layui.layer; + var layDate = layui.laydate; var form = layui.form; // 鏁版嵁娓叉煋 locDetlTableIns = table.render({ @@ -177,6 +184,12 @@ clearFormVal($('#search-box')); tableReload(); }); + + layDate.render({ + elem: '.layui-laydate-range' + ,type: 'datetime' + ,range: true + }); }) function tableReload(child) { -- Gitblit v1.9.1