From ae5401a34b32643b2db847b4e5266758e63cd7aa Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期四, 18 六月 2020 13:13:27 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/LocDetlController.java | 6 +++++- src/main/webapp/static/js/pakStore/stockAdjust.js | 32 +++++++++++++++++++++++++++++--- src/main/webapp/views/pakStore/stockAdjust.html | 15 ++++++++++++--- 3 files changed, 46 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java index de9b64c..fd9549f 100644 --- a/src/main/java/com/zy/asrs/controller/LocDetlController.java +++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java @@ -59,7 +59,11 @@ } else if (entry.getKey().endsWith("<")) { wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue()))); } else { - wrapper.like(entry.getKey(), String.valueOf(entry.getValue())); + if (entry.getKey().equals("locNo")) { + wrapper.eq("loc_no", String.valueOf(entry.getValue())); + } else { + wrapper.like(entry.getKey(), String.valueOf(entry.getValue())); + } } } } diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js index 16ce5ac..7362e27 100644 --- a/src/main/webapp/static/js/pakStore/stockAdjust.js +++ b/src/main/webapp/static/js/pakStore/stockAdjust.js @@ -30,12 +30,13 @@ // 妫�绱簨浠� form.on('submit(search)', function (data) { - if (data.field.loc_no === "") { + let locNo = data.field.loc_no; + if (locNo === "") { inputTip($("#searchLocNo")); layer.msg("璇疯緭鍏ュ簱浣嶅彿"); return; } - http.post(baseUrl + "/locDetl/list/auth", {loc_no: data.field.loc_no,limit: 1000}, function (res) { + http.post(baseUrl + "/locDetl/list/auth", {locNo: locNo,limit: 1000}, function (res) { matCodeData = []; let data = res.data.records; for (var i = 0; i<data.length; i++) { @@ -45,8 +46,8 @@ count: 0, }) } + locTips(true, locNo); tableReload(); - console.log(matCodeData); }) }); @@ -55,13 +56,38 @@ clearFormVal($('#search-box')); matCodeData = []; tableReload(); + locTips(false); }); + // 閲嶈浇琛ㄦ牸 function tableReload() { tableIns.reload({data: matCodeData,done:function (res) { limit(); }}); } + + // 搴撲綅鎻愮ず妗� + function locTips(retrieve, locNo) { + if (retrieve) { + http.post(baseUrl+"/locMast/"+locNo+"/auth", null, function (res) { + let data = res.data; + if (data != null) { + $(".retrieve").show(); + $("#locMsg").html(locNo + " ,搴撲綅鐘舵�侊細" + data.locType$); + $('.not-retrieve').hide(); + } else { + layer.msg("璇疯緭鍏ユ湁鏁堝簱浣嶅彿"); + $('.not-retrieve').show(); + $("#locMsg").html(""); + $(".retrieve").hide(); + } + }) + } else { + $('.not-retrieve').show(); + $("#locMsg").html(""); + $(".retrieve").hide(); + } + } }) // 鎻愬彇鐗╂枡 diff --git a/src/main/webapp/views/pakStore/stockAdjust.html b/src/main/webapp/views/pakStore/stockAdjust.html index f88846a..429028c 100644 --- a/src/main/webapp/views/pakStore/stockAdjust.html +++ b/src/main/webapp/views/pakStore/stockAdjust.html @@ -50,7 +50,7 @@ .function-btn { font-size: 16px; padding: 1px 1px 1px 1px; - width: 100px; + width: 120px; height: 40px; border-color: #2b425b; border-radius: 4px; @@ -59,7 +59,6 @@ border-style: solid; transition: 0.4s; cursor: pointer; - letter-spacing: 3px; } .function-btn:hover { background-color: #2b425b; @@ -82,13 +81,23 @@ <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 style="display: inline-block; font-size: 16px"> + <div class="not-retrieve" style="color: red"> + 鏈绱㈠簱浣� + </div> + <div class="retrieve" style="display: none;color: blue"> + 褰撳墠妫�绱㈠簱浣�: <span id="locMsg"></span> + </div> + + </div> </div> <hr> <!-- 鍔熻兘鍖� --> <div class="function-area"> - <button id="mat-query" class="function-btn" onclick="getMat()">鏂板</button> + <button id="mat-query" class="function-btn" onclick="getMat()">鏂板搴撳瓨</button> </div> <!-- 琛ㄦ牸 --> -- Gitblit v1.9.1