From 08a9f9426f224295e29ed882d7c7bf11d1b71aec Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期五, 12 三月 2021 16:24:19 +0800
Subject: [PATCH] 1.0.3 平仓管理-增加库区的检索条件
---
src/main/webapp/static/js/locNormal/locNormal.js | 24 ++++++++++++++++++++++++
src/main/webapp/views/locNormal/locNormal.html | 9 +++++++--
src/main/webapp/views/locNormal/locNormalIn.html | 2 +-
3 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/static/js/locNormal/locNormal.js b/src/main/webapp/static/js/locNormal/locNormal.js
index 607bb86..0af0383 100644
--- a/src/main/webapp/static/js/locNormal/locNormal.js
+++ b/src/main/webapp/static/js/locNormal/locNormal.js
@@ -32,6 +32,30 @@
},
});
+// 搴撳尯涓嬫媺
+// 鑾峰彇浠撳簱涓嬫媺
+$.ajax({
+ url: baseUrl + "/locArea/queryAll/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ var html = "";
+ if (res.data && res.data.length > 0) {
+ html += res.data.map(function (item) {
+ return "<Option value=" + item.id + ">" + item.name + "</Option>";
+ });
+ }
+ $('#putSiteSelect').append(html);
+ form.render('select');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+})
+
layui.use(['table', 'laydate', 'form', 'upload'], function () {
var table = layui.table;
var $ = layui.jquery;
diff --git a/src/main/webapp/views/locNormal/locNormal.html b/src/main/webapp/views/locNormal/locNormal.html
index 6283083..fb082b2 100644
--- a/src/main/webapp/views/locNormal/locNormal.html
+++ b/src/main/webapp/views/locNormal/locNormal.html
@@ -93,13 +93,18 @@
<input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="width: 150px">
<select id="matStatusSelect" name="state">
- <option value="">璇烽�夋嫨鍑哄叆搴撶姸鎬�</option>
+ <option value="">鍑哄叆搴撶姸鎬�</option>
<option value="1">宸插叆搴�</option>
<option value="2">宸插嚭搴�</option>
</select>
</div>
+ <div class="layui-inline" style="width: 150px">
+ <select id="putSiteSelect" name="warehouse">
+ <option value="">璇烽�夋嫨搴撳尯</option>
+ </select>
+ </div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
diff --git a/src/main/webapp/views/locNormal/locNormalIn.html b/src/main/webapp/views/locNormal/locNormalIn.html
index 15ace2d..65c0c15 100644
--- a/src/main/webapp/views/locNormal/locNormalIn.html
+++ b/src/main/webapp/views/locNormal/locNormalIn.html
@@ -93,7 +93,7 @@
<!-- 1.閫夋嫨鍏ュ簱鍙� -->
<span id="staNoSpan">搴撳尯锛�</span>
<select id="putSiteSelect" lay-verify="required">
- <option value="">璇烽�夋嫨绔欑偣</option>
+ <option value="">璇烽�夋嫨搴撳尯</option>
</select>
<!-- 2.鍚姩鍑哄簱 -->
<button class="layui-btn layui-btn-normal layui-btn-lg" id="btn-locIn" lay-event="comb">鍚姩鍏ュ簱</button>
--
Gitblit v1.9.1