From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/views/locMast/locMast.html | 94 ++++++++++++++++++++++++++++++-----------------
1 files changed, 60 insertions(+), 34 deletions(-)
diff --git a/src/main/webapp/views/locMast/locMast.html b/src/main/webapp/views/locMast/locMast.html
index ed4156d..b736512 100644
--- a/src/main/webapp/views/locMast/locMast.html
+++ b/src/main/webapp/views/locMast/locMast.html
@@ -17,6 +17,7 @@
position: relative;
overflow: visible !important;
}
+
</style>
</head>
<body>
@@ -24,38 +25,32 @@
<!-- 鎼滅储鏍� -->
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
- <label class="layui-form-label">搴� 浣� 鍙凤細</label>
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="loc_no" placeholder="璇疯緭鍏�" autocomplete="off">
+ <input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
</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 class="layui-input-inline">
+ <input class="layui-input" type="text" name="loc_sts" placeholder="搴撲綅鐘舵��" autocomplete="off">
</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">
- <input id="locType$" 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="basLocTypeQueryBylocType" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basLocTypeQueryBylocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="row1" placeholder="鎺�" autocomplete="off">
</div>
</div>
-
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="bay1" placeholder="鍒�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="lev1" placeholder="灞�" autocomplete="off">
+ </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>
@@ -68,7 +63,6 @@
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
- <!--<button class="layui-btn layui-btn-sm" id="btn-refresh" lay-event="refreshData">鍒锋柊</button>-->
<button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<button class="layui-btn layui-btn-primary" id="btn-init" lay-event="init">鍒濆鍖�</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
@@ -76,7 +70,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 +82,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 +102,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,25 +115,57 @@
<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="locType1">
+ <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>
<!-- 鎸夐挳 -->
<div style="text-align: center; margin-top: 20px">
<button class="layui-btn layui-btn-radius layui-btn-normal" id="initDo" lay-submit lay-filter="initDo">纭畾</button>
--
Gitblit v1.9.1