From 22c2a272694c485f7fb86239fcd25b2b7356c5d8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 13 六月 2020 14:12:18 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/pakStore/emptyOut.js | 34 ++++++++++++-----
src/main/webapp/views/pakStore/emptyOut.html | 43 +++++++++++++++------
src/main/java/com/zy/asrs/controller/WorkController.java | 6 +++
3 files changed, 60 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 1cf9edd..c71cf17 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -29,6 +29,12 @@
return R.ok().add(basDevpService.getAvailableDevp());
}
+ @RequestMapping("/available/take/site")
+ @ManagerAuth(memo = "鑾峰彇鏈夋晥鐨勫嚭搴撶珯鐐�")
+ public R availableTakeSite(){
+ return R.ok().add(basDevpService.getAvailableDevp());
+ }
+
@RequestMapping("/full/store/start")
@ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
public R start(@RequestBody FullStoreParam fullStoreParam) {
diff --git a/src/main/webapp/static/js/pakStore/emptyOut.js b/src/main/webapp/static/js/pakStore/emptyOut.js
index 6453b9d..12eb095 100644
--- a/src/main/webapp/static/js/pakStore/emptyOut.js
+++ b/src/main/webapp/static/js/pakStore/emptyOut.js
@@ -6,6 +6,26 @@
var layDate = layui.laydate;
var form = layui.form;
+ // 鑾峰彇鍙敤鍏ュ簱绔欑偣
+ $.ajax({
+ url: baseUrl+"/available/take/site",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ var tpl = $("#takeSiteSelectTemplate").html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ $('#staNoSelect').append(html);
+ form.render('select');
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+
// 鏁版嵁娓叉煋
tableIns = table.render({
elem: '#locMast',
@@ -73,16 +93,10 @@
var checkStatus = table.checkStatus(obj.config.id);
switch (obj.event) {
case 'outbound':
- layer.open({
- type: 1,
- title: '鍑哄簱',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: true,
- content: $("#outboundDiv"),
- success: function (layero, index) {
- }
- });
+ var staNo = $("#staNoSelect").val();
+ if (staNo === ""){
+ layer.msg("璇烽�夋嫨鍑哄簱鍙�");
+ }
break;
}
});
diff --git a/src/main/webapp/views/pakStore/emptyOut.html b/src/main/webapp/views/pakStore/emptyOut.html
index 87990c9..d35374c 100644
--- a/src/main/webapp/views/pakStore/emptyOut.html
+++ b/src/main/webapp/views/pakStore/emptyOut.html
@@ -10,6 +10,9 @@
<link rel="stylesheet" href="../../static/css/cool.css" media="all">
<link rel="stylesheet" href="../../static/css/common.css" media="all">
<style>
+ #search-box {
+ padding: 30px 0 20px 0;
+ }
#search-box .layui-inline:first-child {
margin-left: 30px;
}
@@ -26,22 +29,29 @@
}
#staNoSpan {
+ text-align: center;
display: inline-block;
- width: 100px;
- font-size: 15px;
+ width: 70px;
+ font-size: 13px;
}
.layui-btn-container .layui-form-select {
display: inline-block;
+ width: 150px;
+ height: 30px;
}
.layui-btn-container .layui-form-select.layui-form-selected {
display: inline-block;
width: 150px;
}
.layui-btn-container .layui-select-title input {
- font-size: 15px;
+ font-size: 13px;
}
.layui-btn-container .layui-anim.layui-anim-upbit dd {
- font-size: 15px;
+ font-size: 13px;
+ }
+
+ #btn-outbound {
+ margin-left: 50px;
}
</style>
</head>
@@ -94,15 +104,16 @@
</div>
<script type="text/html" id="toolbar">
- <div class="layui-btn-container">
- <!-- 1.閫夋嫨鍑哄簱鍙� -->
- <span id="staNoSpan">鍑哄簱鍙ｏ細</span>
- <select id="staNoSelect" lay-search="">
- <option value="">璇烽�夋嫨绔欑偣</option>
- <option value="1"> 1 </option>
- </select>
- <!-- 2.鍚姩鍑哄簱 -->
- <button class="layui-btn" id="btn-outbound" lay-event="outbound">鍚姩鍑哄簱</button>
+ <div class="layui-form">
+ <div class="layui-btn-container">
+ <!-- 1.閫夋嫨鍑哄簱鍙� -->
+ <span id="staNoSpan">鍑哄簱鍙ｏ細</span>
+ <select id="staNoSelect" lay-verify="required">
+ <option value="">璇烽�夋嫨绔欑偣</option>
+ </select>
+ <!-- 2.鍚姩鍑哄簱 -->
+ <button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="outbound">鍚姩鍑哄簱</button>
+ </div>
</div>
</script>
@@ -120,6 +131,12 @@
<div id="outboundDiv">
</div>
+
+<script type="text/template" id="takeSiteSelectTemplate">
+ {{#each data}}
+ <option value="{{this}}">{{this}}</option>
+ {{/each}}
+</script>
</body>
</html>
--
Gitblit v1.9.1