#
luxiaotao1123
2021-03-06 cfe822097221cb29ab54d2a06e0e0eca1b8225ad
#
3个文件已修改
24 ■■■■ 已修改文件
src/main/java/zy/cloud/wms/manager/controller/TagController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/prior/prior.js 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/prior/prior_detail.html 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/controller/TagController.java
@@ -141,13 +141,13 @@
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<Tag> wrapper = new EntityWrapper<>();
        wrapper.like("id", condition);
        wrapper.like("uuid", condition).or().like("name", condition);
        Page<Tag> page = tagService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (Tag tag : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", tag.getId());
            map.put("value", tag.getId());
            map.put("value", tag.getUuid() + "(" + tag.getName() + ")");
            result.add(map);
        }
        return R.ok(result);
src/main/webapp/static/js/prior/prior.js
@@ -104,7 +104,7 @@
                    type: 2,
                    title: '新增',
                    maxmin: true,
                    area: [top.detailWidth, top.detailHeight],
                    area: ['30%', top.detailHeight],
                    content: 'prior_detail.html',
                    success: function(layero, index){
                        layer.getChildFrame('#data-detail-submit-edit', index).hide();
@@ -190,7 +190,7 @@
                    type: 2,
                    title: '详情',
                    maxmin: true,
                    area: [top.detailWidth, top.detailHeight],
                    area: ['30%', top.detailHeight],
                    shadeClose: true,
                    content: 'prior_detail.html',
                    success: function(layero, index){
@@ -209,7 +209,7 @@
                    type: 2,
                    title: '修改',
                    maxmin: true,
                    area: [top.detailWidth, top.detailHeight],
                    area: ['30%', top.detailHeight],
                    content: 'prior_detail.html',
                    success: function(layero, index){
                        layer.getChildFrame('#data-detail-submit-save', index).hide();
src/main/webapp/views/prior/prior_detail.html
@@ -14,7 +14,7 @@
<!-- 详情 -->
<div id="data-detail" class="layer_self_wrap">
    <form id="detail" class="layui-form">
    <form id="detail" class="layui-form" style="text-align: center">
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label"><span class="not-null">*</span>I  D:</label>
            <div class="layui-input-inline">
@@ -33,7 +33,7 @@
                <input id="name" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label"><span class="not-null">*</span>关联商品:</label>
            <div class="layui-input-inline cool-auto-complete">
                <input id="matId" class="layui-input" type="text" lay-verify="required|number"  style="display: none">
@@ -57,7 +57,7 @@
                <input id="maktx" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label"><span class="not-null">*</span>关联货位:</label>
            <div class="layui-input-inline cool-auto-complete">
                <input id="nodeId" class="layui-input" type="text" lay-verify="required|number"  style="display: none">
@@ -75,13 +75,13 @@
<!--                <input id="nodeName" class="layui-input" type="text">-->
<!--            </div>-->
<!--        </div>-->
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label">安全库存:</label>
            <div class="layui-input-inline">
                <input id="safeQua" class="layui-input" type="text" lay-verify="number" >
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label">优 先 级:</label>
            <div class="layui-input-inline">
                <input id="prio" class="layui-input" type="text" lay-verify="number" >
@@ -93,7 +93,7 @@
                <input id="barcode" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">状  态:</label>
            <div class="layui-input-inline">
                <select id="status">
@@ -139,7 +139,7 @@
                <input id="updateTime$" class="layui-input" type="text" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">备  注:</label>
            <div class="layui-input-inline">
                <input id="memo" class="layui-input" type="text">