From c51ab886ca899243f36cffe6c1a86d19057d44f5 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:38 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/webapp/views/pakStore/locDetlCheckQuery.html | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/views/pakStore/locDetlCheckQuery.html b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
index 71fcf1f..bf518ea 100644
--- a/src/main/webapp/views/pakStore/locDetlCheckQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
@@ -53,7 +53,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
@@ -158,10 +158,10 @@
switch(obj.event) {
case 'confirm':
if (data.length === 0){
- layer.msg("璇烽�夋嫨鏁版嵁");
+ layer.msg("璇烽�夋嫨鏁版嵁", {icon: 2});
return;
}
- var locNos = [];
+ let locNos = [];
data.forEach(function(elem) {
locNos.push(elem.locNo);
});
@@ -190,6 +190,13 @@
form.on('submit(search)', function (data) {
tableReload();
});
+ // 鎼滅储鏍忛噸缃簨浠�
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ $('#detlTable').css("display", 'none');
+ tableReload(false);
+ });
layDate.render({
elem: '.layui-laydate-range'
--
Gitblit v1.9.1