From c6bc9682699d3e10dc06a3d6641a70179e64f9a1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 14 九月 2021 08:32:11 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs
---
src/main/webapp/views/locMast/locMast.html | 75 +++++++++++++++++++++++++------------
1 files changed, 51 insertions(+), 24 deletions(-)
diff --git a/src/main/webapp/views/locMast/locMast.html b/src/main/webapp/views/locMast/locMast.html
index b736512..f2f18c0 100644
--- a/src/main/webapp/views/locMast/locMast.html
+++ b/src/main/webapp/views/locMast/locMast.html
@@ -29,11 +29,31 @@
<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="loc_sts" placeholder="搴撲綅鐘舵��" autocomplete="off">
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="locSts" name="loc_sts" class="layui-input" type="text" style="display: none">
+ <input id="locSts$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="搴撲綅鐘舵��" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="locStacQueryBylocSts" onkeyup="autoLoad2(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="locStacQueryBylocStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
</div>
</div>
+
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="loc_sts" placeholder="搴撲綅鐘舵��" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
+
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="crn_no" placeholder="鍫嗗灈鏈哄彿" autocomplete="off">
+ </div>
+ </div>
+
<div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="row1" placeholder="鎺�" autocomplete="off">
@@ -53,6 +73,13 @@
<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>
+
+<!-- 瑙ｅ喅娴忚鍣ㄨ嚜鍔ㄥ～鍏呭瘑鐮侀棶棰橈紝鏂板涓�涓殣钘忚緭鍏ユ -->
+<div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" style="width:10px;opacity: 0;position: absolute">
</div>
</div>
@@ -141,28 +168,28 @@
</select>
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">瀹界獎绫诲瀷</label>
- <div class="layui-input-inline">
- <select name="locType2">
- <option style="display: none"></option>
- <option value="0">鏈煡</option>
- <option value="1">绐勫簱浣�</option>
- <option value="2">瀹藉簱浣�</option>
- </select>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">杞婚噸绫诲瀷</label>
- <div class="layui-input-inline">
- <select name="locType3">
- <option style="display: none"></option>
- <option value="0">鏈煡</option>
- <option value="1">杞诲簱浣�</option>
- <option value="2">閲嶅簱浣�</option>
- </select>
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">瀹界獎绫诲瀷</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <select name="locType2">-->
+<!-- <option style="display: none"></option>-->
+<!-- <option value="0">鏈煡</option>-->
+<!-- <option value="1">绐勫簱浣�</option>-->
+<!-- <option value="2">瀹藉簱浣�</option>-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">杞婚噸绫诲瀷</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <select name="locType3">-->
+<!-- <option style="display: none"></option>-->
+<!-- <option value="0">鏈煡</option>-->
+<!-- <option value="1">杞诲簱浣�</option>-->
+<!-- <option value="2">閲嶅簱浣�</option>-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
<div id="prompt" style="text-indent: 10px;">
<span class="not-null">鍒濆鍖栧簱浣嶅悗灏嗗垹闄ゅ簱瀛樻槑缁嗭紝璇疯皑鎱庢搷浣滐紒</span>
</div>
--
Gitblit v1.9.1