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/pakStore/locMove.html | 44 +++++++++++++++++++-------------------------
1 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/src/main/webapp/views/pakStore/locMove.html b/src/main/webapp/views/pakStore/locMove.html
index 8213963..caa24b6 100644
--- a/src/main/webapp/views/pakStore/locMove.html
+++ b/src/main/webapp/views/pakStore/locMove.html
@@ -7,6 +7,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
<link rel="stylesheet" href="../../static/css/cool.css" media="all">
<link rel="stylesheet" href="../../static/css/common.css" media="all">
<style>
@@ -14,6 +15,7 @@
height: 100%;
padding: 10px;
background-color: #f1f1f1;
+ box-sizing: border-box;
}
body {
background-color: #fff;
@@ -22,7 +24,7 @@
padding-bottom: 20px;
}
.function-area {
- padding: 50px 80px 30px 70px;
+ padding: 50px 80px 50px 70px;
display: inline-block;
}
.cool-auto-complete-div {
@@ -63,38 +65,26 @@
.layui-layer-lan .layui-layer-btn .layui-layer-btn1:hover {
background-color: #f7f7f7;
}
+
+ #loc-move-btn {
+ display: none;
+ }
</style>
</head>
<body>
-<div class="function-area" style="border-right: 1px solid #d5d5d5">
- <div class="layui-inline">
- <div class="layui-input-inline cool-auto-complete">
- <input id="locNo" class="layui-input" name="loc_no" type="text" onkeyup="check(this.id, 'locDetl')" autocomplete="off" style="display: none">
- <input id="locNo$" class="layui-input cool-auto-complete-div search-input" 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="locMastQueryBylocNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="locMastQueryBylocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <button id="loc-query-btn" class="function-btn" onclick="getLoc()">鎼滅储</button>
-</div>
-<div class="function-area">
+<div class="function-area layui-form">
<!-- 婧愬簱浣� -->
<div class="layui-inline">
<div class="layui-input-inline">
- <input id="sourceLocNo" class="layui-input cool-auto-complete-div" type="text" placeholder="婧愬簱浣�" style="width: 150px;cursor: initial">
+ <input id="sourceLocNo" class="layui-input" onkeyup="getLoc(this)" type="text" placeholder="婧愬簱浣�" autocomplete="off">
</div>
</div>
<div class="layui-form-mid" style="float: none; display: inline-block; margin-left: 10px">-</div>
-<!-- <hr style="display: inline-block;width: 80px;margin-top: 20px">-->
- <!-- 鐩爣搴撲綅 -->
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input id="targetLocNo" class="layui-input cool-auto-complete-div" type="text" placeholder="鐩爣搴撲綅" style="width: 150px;cursor: initial">
- </div>
+ <div class="layui-input-inline">
+ <select id="targetLocNo" name="modules" lay-verify="required" lay-search="">
+ <option value="">鐩爣绌哄簱浣�</option>
+ </select>
</div>
<button id="loc-move-btn" class="function-btn" onclick="locMove()" style="background: #4476A7;text-shadow: inherit;height: 45px;font-size: 15px;margin-left: 20px">搴撲綅绉昏浆</button>
</div>
@@ -110,7 +100,11 @@
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/js/pakStore/locMove.js" charset="utf-8"></script>
-<script type="text/template" id="">
+<script type="text/template" id="emptyLocStock">
+ <option value="">璇疯緭鍏ュ苟閫夋嫨</option>
+ {{#each data}}
+ <option value="{{this}}">{{this}}</option>
+ {{/each}}
</script>
<div id="locMoveWindow" style="height: 100%;display: none">
@@ -133,4 +127,4 @@
</div>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
--
Gitblit v1.9.1