From 8976457876d817ae1e00b721fce595a376d34435 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 07 四月 2021 08:14:59 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/wms-cloud
---
src/main/webapp/views/pda/selectMat.html | 124 +++++++++++++++++++++++++++++++++++++++++
src/main/java/zy/cloud/wms/manager/controller/TagController.java | 10 +++
src/main/webapp/views/pda/matQuery.html | 34 +++++++++--
3 files changed, 161 insertions(+), 7 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/TagController.java b/src/main/java/zy/cloud/wms/manager/controller/TagController.java
index 6ca7410..4f3c8b1 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/TagController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/TagController.java
@@ -29,6 +29,16 @@
@Autowired
private TreeUtils treeUtils;
+ @RequestMapping(value = "/tag/list/pda/auth")
+ @ManagerAuth
+ public R pdaList(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<Tag> wrapper = new EntityWrapper<>();
+ List<Tag> tags = tagService.selectList(wrapper);
+ return R.ok().add(tags);
+ }
+
@RequestMapping(value = "/tag/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index 18638fc..5dff49b 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -12,7 +12,7 @@
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<style>
.form-box {
- padding: 15px 5px 5px 5px;
+ padding: 15px 5px 5px 0px;
font-size: 16px;
text-align: center;
}
@@ -26,6 +26,7 @@
display: inline-block;
text-align: right;
width: 70px;
+ vertical-align: middle;
}
.form-box input {
width: 120px;
@@ -36,14 +37,22 @@
overflow:hidden;
white-space:nowrap;
text-overflow:ellipsis;
+ vertical-align: middle;
}
.form-box textarea {
+ height: 60px;
width: 120px;
margin-left: 10px;
padding-left: 5px;
- height: 30px;
border: 1px solid #777777;
+ display: inline-block;
+ vertical-align: middle;
}
+ #selectBtn {
+ vertical-align: middle;
+ padding: 3px 5px;
+ }
+
#confirm {
margin-top: 10px;
padding: 5px 20px;
@@ -82,13 +91,14 @@
<body>
<div class="form-box">
- <div class="form-item">
+ <div class="form-item" style="padding-left: 33px;">
<span>鍟嗗搧缂栫爜</span>
<input id="matnr" type="text" placeholder="鎵爜 / 杈撳叆" onkeyup="find(this)" autocomplete="off">
+ <button id="selectBtn">閫�</button>
</div>
<div class="form-item">
- <span style="float: left;margin-left: 38px">鍟嗗搧鍚嶇О</span>
- <textarea id="maktx" type="text" disabled="disabled" style="height: 60px;float: left;"></textarea>
+ <span>鍟嗗搧鍚嶇О</span>
+ <textarea id="maktx" type="text" disabled="disabled"></textarea>
<div style="clear: both"></div>
</div>
<div class="form-item">
@@ -156,7 +166,17 @@
}
window.onload = function(){document.getElementById("matnr").focus();}
- $(document).on('click','#confirm', function () {
+ $(document).on('click','#selectBtn', function () {
+ var matSelectIdx = parent.layer.open({
+ type: 2,
+ title: '閫夋嫨鍟嗗搧',
+ area: ['100%', '100%'],
+ content: 'selectMat.html',
+ success: function(layero, index){
+ // $('.layui-layer-title').css('font-size', '16px').css('background-color', '#fff');
+ }
+ });
+ parent.layer.full(matSelectIdx);
})
// $('body').keydown(function () {
@@ -186,4 +206,4 @@
}
</script>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/webapp/views/pda/selectMat.html b/src/main/webapp/views/pda/selectMat.html
new file mode 100644
index 0000000..678f4c2
--- /dev/null
+++ b/src/main/webapp/views/pda/selectMat.html
@@ -0,0 +1,124 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
+ <title>鍟嗗搧閫夋嫨</title>
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+ <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+ <script type="text/javascript" src="../../static/layui/layer_mobile/layer.js" charset="utf-8"></script>
+ <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+ <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+ <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
+ <style>
+ html {
+ height: 100%;
+ }
+ body {
+ height: 100%;
+ background-color: #f1f1f1;
+ padding: 5px;
+ }
+
+ /* 澶撮儴鎼滅储鏍� */
+ .search-box {
+ height: 36px;
+ padding: 3px 15px;
+ }
+ .search-box input {
+ border: none;
+ border-radius: 20px;
+ height: 30px;
+ box-shadow: 0 0 3px rgba(0,0,0,.3);
+ width: 75%;
+ padding-left: 15px;
+ vertical-align: middle;
+ }
+ .search-box button {
+ border: none;
+ background-color: white;
+ box-shadow: 0 0 3px rgba(0,0,0,.3);
+ height: 33px;
+ margin-left: 15px;
+ border-radius: 20px;
+ width: 15%;
+ vertical-align: middle;
+ }
+ .search-box button:hover {
+ background-color: #dedede;
+ }
+
+ /* 涓讳綋鍗＄墖 */
+ .box-item {
+ height: 100px;
+ border-bottom: 1px solid #dedede;
+ background-color: #fff;
+ border-radius: 5px;
+ box-shadow: 0 0 3px rgba(0,0,0,.3);
+ margin-top: 2px;
+ }
+ .box-item:hover {
+ background-color: #eaeaea;
+ }
+ .box-item-label {
+ font-size: x-large;
+ font-weight: bold;
+ padding: 10px 0 0 20px;
+ }
+</style>
+</head>
+<body>
+
+<header>
+ <div class="search-box">
+ <input type="text">
+ <button>
+ <i class="layui-icon"></i>
+ </button>
+ </div>
+</header>
+
+<main>
+ <div class="box-item">
+ <div class="box-item-label">灏奸緳澶磋灪涓濈洅瑁�</div>
+ </div>
+ <div class="box-item">
+ <div class="box-item-label">灏奸緳澶磋灪涓濈洅瑁�</div>
+ </div>
+ <div class="box-item">
+ <div class="box-item-label">灏奸緳澶磋灪涓濈洅瑁�</div>
+ </div>
+ <div class="box-item">
+ <div class="box-item-label">灏奸緳澶磋灪涓濈洅瑁�</div>
+ </div>
+ <div class="box-item">
+ <div class="box-item-label">灏奸緳澶磋灪涓濈洅瑁�</div>
+ </div>
+ <div class="box-item">
+ <div class="box-item-label">灏奸緳澶磋灪涓濈洅瑁�</div>
+ </div>
+
+</main>
+
+</body>
+<script>
+ $(function () {
+
+
+ })
+
+ $(document).on('click','.box-item', function () {
+ })
+</script>
+<script type="text/template" id="tagTpl">
+ {{#each data}}
+ <option value="{{this}}">{{this}}</option>
+ {{/each}}
+</script>
+<script type="text/template" id="matTpl">
+ {{#each data}}
+ <option value="{{this}}">{{this}}</option>
+ {{/each}}
+</script>
+</html>
--
Gitblit v1.9.1