From e57e89707d57d0af0ff8ed9f470f7450105ed4c0 Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期日, 06 七月 2025 14:48:50 +0800 Subject: [PATCH] 1 --- src/main/webapp/views/wrkMastDetlLog/wrkMastDetlLog.html | 19 ++++++++++++++++++- src/main/java/com/zy/asrs/controller/WrkMastDetlLogController.java | 2 +- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/WrkMastDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastDetlLogController.java index 357a72f..8aa94b3 100644 --- a/src/main/java/com/zy/asrs/controller/WrkMastDetlLogController.java +++ b/src/main/java/com/zy/asrs/controller/WrkMastDetlLogController.java @@ -43,7 +43,7 @@ EntityWrapper<WrkMastDetlLog> wrapper = new EntityWrapper<>(); excludeTrash(param); convert(param, wrapper); - allLike(WrkMastDetlLog.class, param.keySet(), wrapper, condition); + //allLike(WrkMastDetlLog.class, param.keySet(), wrapper, condition); if (!Cools.isEmpty(orderByField)) { wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType)); } diff --git a/src/main/webapp/views/wrkMastDetlLog/wrkMastDetlLog.html b/src/main/webapp/views/wrkMastDetlLog/wrkMastDetlLog.html index c614d4d..457b87f 100644 --- a/src/main/webapp/views/wrkMastDetlLog/wrkMastDetlLog.html +++ b/src/main/webapp/views/wrkMastDetlLog/wrkMastDetlLog.html @@ -68,6 +68,11 @@ </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"> + <div class="layui-input-inline"> <input class="layui-input" type="text" name="supp_code" placeholder="璐ф灦鐮�" autocomplete="off"> </div> @@ -86,10 +91,22 @@ </div> <div class="layui-inline"> <div class="layui-input-inline"> - <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" + <input class="layui-input" type="text" name="source_loc_no" placeholder="婧愬簱浣�" autocomplete="off"> </div> </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="condition" placeholder="璇疯緭鍏�"--> +<!-- autocomplete="off">--> +<!-- </div>--> +<!-- </div>--> <div class="layui-inline">  <button class="layui-btn icon-btn" lay-filter="search" lay-submit> <i class="layui-icon"></i>鎼滅储 -- Gitblit v1.9.1