#
luxiaotao1123
2021-02-23 3460fb53ad2758df466f3fca28628d6299dd6781
#
4个文件已修改
37 ■■■■■ 已修改文件
src/main/java/zy/cloud/wms/manager/controller/TagController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/tagTree.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/mat/mat.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/mat/mat_detail.html 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/controller/TagController.java
@@ -173,7 +173,7 @@
            treeUtils.remove(condition, result);
            treeUtils.remove(condition, result);
        }
        return R.ok(tree);
        return R.ok(result);
    }
}
src/main/webapp/static/js/tagTree.js
@@ -42,7 +42,7 @@
                            $('#organizationTree').find('.ew-tree-click').removeClass('ew-tree-click');
                            $(obj.elem).children('.layui-tree-entry').addClass('ew-tree-click');
                            tableIns.reload({
                                where: {temId: obj.data.id},
                                where: {tag_id: obj.data.id},
                                page: {curr: 1}
                            });
                        }
@@ -50,7 +50,7 @@
                    treeData = res.data;
                    if (isEmpty(condition) && init) {
                        tableIns.reload({
                            where: {temId: ""},
                            where: {tag_id: ""},
                            page: {curr: 1}
                        });
                    }
src/main/webapp/views/mat/mat.html
@@ -62,17 +62,17 @@
                            <div class="layui-inline">
                                <label class="layui-form-label" style="padding: 8px 15px 8px 15px">字典名称:</label>
                                <div class="layui-input-inline">
                                    <input name="dictDataName" class="layui-input" placeholder="输入字典名称"/>
                                    <input name="matnr" class="layui-input" placeholder="输入字典名称"/>
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="padding: 8px 15px 8px 15px">字典键值:</label>
                                <div class="layui-input-inline">
                                    <input name="dictDataCode" class="layui-input" placeholder="输入字典键值"/>
                                    <input name="maktx" class="layui-input" placeholder="输入字典键值"/>
                                </div>
                            </div>
                            <div class="layui-inline">&emsp;
                                <button class="layui-btn icon-btn" lay-filter="dictDataTbSearch" lay-submit>
                                <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
                                    <i class="layui-icon">&#xe615;</i>搜索
                                </button>
                            </div>
src/main/webapp/views/mat/mat_detail.html
@@ -15,20 +15,7 @@
<!-- 详情 -->
<div id="data-detail" class="layer_self_wrap">
    <form id="detail" class="layui-form">
    <!--
        <div class="layui-inline"  style="display: none">
            <label class="layui-form-label"><span class="not-null">*</span>编  号:</label>
            <div class="layui-input-inline">
                <input id="id" class="layui-input" type="text" placeholder="编号">
            </div>
        </div>
    -->
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label"><span class="not-null">*</span>I  D:</label>
            <div class="layui-input-inline">
                <input id="id" class="layui-input" type="text" onkeyup="check(this.id, 'mat')" lay-verify="number" >
            </div>
        </div>
        <input id="id" class="layui-input" type="hidden" onkeyup="check(this.id, 'mat')" lay-verify="number" >
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">编  号:</label>
            <div class="layui-input-inline">
@@ -143,13 +130,13 @@
                <input id="weight" class="layui-input" type="text" lay-verify="number" >
            </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="status" class="layui-input" type="text" lay-verify="number" >
            </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 cool-auto-complete">
                <input id="createBy" class="layui-input" type="text" lay-verify="number"  style="display: none">
@@ -161,13 +148,13 @@
                </div>
            </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="createTime$" 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 cool-auto-complete">
                <input id="updateBy" class="layui-input" type="text" lay-verify="number"  style="display: none">
@@ -179,7 +166,7 @@
                </div>
            </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="updateTime$" class="layui-input" type="text" autocomplete="off">