From 0b83d075e78acfded07fafe8da133376b2260ef6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 18 六月 2020 10:26:16 +0800
Subject: [PATCH] #
---
src/main/webapp/views/locMast/locMast.html | 55 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/src/main/webapp/views/locMast/locMast.html b/src/main/webapp/views/locMast/locMast.html
index ed4156d..3b5c724 100644
--- a/src/main/webapp/views/locMast/locMast.html
+++ b/src/main/webapp/views/locMast/locMast.html
@@ -30,18 +30,6 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">搴撲綅绫诲瀷锛�</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="whsType" class="layui-input" name="whs_type" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
- <input id="whsType$" 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="basWhsQueryBywhsType" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basWhsQueryBywhsTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline">
<label class="layui-form-label">搴撲綅鐘舵�侊細</label>
<div class="layui-input-inline cool-auto-complete">
<input id="locType" class="layui-input" name="loc_type" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
@@ -53,9 +41,20 @@
</div>
</div>
</div>
-
+ <div class="layui-inline">
+ <label class="layui-form-label">搴撲綅绫诲瀷锛�</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="whsType" class="layui-input" name="whs_type" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
+ <input id="whsType$" 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="basWhsQueryBywhsType" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basWhsQueryBywhsTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
<!-- 寰呮坊鍔� -->
- <div id="data-search-btn" class="layui-btn-container layui-form-item">
+ <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>
@@ -76,7 +75,7 @@
</script>
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
+<!-- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>-->
<a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>
</script>
@@ -88,18 +87,18 @@
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
<!-- 閲嶇疆搴撲綅寮圭獥 -->
-<div id="resetLocDiv" style="margin: 20px 0 20px 30px">
+<div id="resetLocDiv" style="margin: 20px 0 10px 30px; display: none">
<div class="layui-form layui-form-pane">
<!-- 鎺� -->
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">璧锋鎺�</label>
<div class="layui-input-inline" style="width: 100px;">
- <input type="text" name="startRow" autocomplete="off" class="layui-input" lay-verify="number">
+ <input type="text" name="startRow" autocomplete="off" class="layui-input" lay-verify="required|number">
</div>
<div class="layui-form-mid">-</div>
<div class="layui-input-inline" style="width: 100px;">
- <input type="text" name="endRow" autocomplete="off" class="layui-input" lay-verify="number">
+ <input type="text" name="endRow" autocomplete="off" class="layui-input" lay-verify="required|number">
</div>
</div>
</div>
@@ -108,11 +107,11 @@
<div class="layui-inline">
<label class="layui-form-label">璧锋鍒�</label>
<div class="layui-input-inline" style="width: 100px;">
- <input type="text" name="startBay" autocomplete="off" class="layui-input" lay-verify="number">
+ <input type="text" name="startBay" autocomplete="off" class="layui-input" lay-verify="required|number">
</div>
<div class="layui-form-mid">-</div>
<div class="layui-input-inline" style="width: 100px;">
- <input type="text" name="endbay" autocomplete="off" class="layui-input" lay-verify="number">
+ <input type="text" name="endBay" autocomplete="off" class="layui-input" lay-verify="required|number">
</div>
</div>
</div>
@@ -121,20 +120,26 @@
<div class="layui-inline">
<label class="layui-form-label">璧锋灞�</label>
<div class="layui-input-inline" style="width: 100px;">
- <input type="text" name="startLev" autocomplete="off" class="layui-input" lay-verify="number">
+ <input type="text" name="startLev" autocomplete="off" class="layui-input" lay-verify="required|number">
</div>
<div class="layui-form-mid">-</div>
<div class="layui-input-inline" style="width: 100px;">
- <input type="text" name="endLev" autocomplete="off" class="layui-input" lay-verify="number">
+ <input type="text" name="endLev" autocomplete="off" class="layui-input" lay-verify="required|number">
</div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍫嗗灈鏈烘暟閲�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="crnAmount" lay-verify="required|number" autocomplete="off" class="layui-input">
</div>
</div>
<!-- 搴撲綅绫诲瀷 -->
<div class="layui-form-item">
- <label class="layui-form-label">搴撲綅绫诲瀷</label>
+ <label class="layui-form-label">绫诲瀷(閫夊~)</label>
<div class="layui-input-inline">
- <select name="locType">
- <option selected="" style="color: #1E9FFF">璇烽�夋嫨绫诲瀷锛堥�夊~锛�</option>
+ <select name="whsType">
+ <option style="display: none"></option>
<option value="1">浣庡簱浣�</option>
<option value="2">楂樺簱浣�</option>
</select>
--
Gitblit v1.9.1