wms-cloud.git - Gitblit

parent: 746bc300 | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of https://gitee.com/luxiaotao1123/wms-cloud

luxiaotao1123

2021-04-07 8976457876d817ae1e00b721fce595a376d34435

Merge branch 'master' of https://gitee.com/luxiaotao1123/wms-cloud

2个文件已修改

1个文件已添加

	src/main/java/zy/cloud/wms/manager/controller/TagController.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/pda/matQuery.html	34 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/pda/selectMat.html	124 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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) {

 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>
</html>

 src/main/webapp/views/pda/selectMat.html

New file
@@ -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">&#xe615;</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>

			@@ -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) {

			@@ -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>
			</html>

New file
			@@ -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>