From 3460fb53ad2758df466f3fca28628d6299dd6781 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 23 二月 2021 16:03:39 +0800 Subject: [PATCH] # --- src/main/webapp/views/mat/mat_detail.html | 25 ++++++------------------- src/main/webapp/static/js/tagTree.js | 4 ++-- src/main/webapp/views/mat/mat.html | 6 +++--- src/main/java/zy/cloud/wms/manager/controller/TagController.java | 2 +- 4 files changed, 12 insertions(+), 25 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 c75d20b..0808360 100644 --- a/src/main/java/zy/cloud/wms/manager/controller/TagController.java +++ b/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); } } diff --git a/src/main/webapp/static/js/tagTree.js b/src/main/webapp/static/js/tagTree.js index 3d4fcc7..dcbbca5 100644 --- a/src/main/webapp/static/js/tagTree.js +++ b/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} }); } diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html index 9f84a4b..238a8b9 100644 --- a/src/main/webapp/views/mat/mat.html +++ b/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">  - <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"></i>鎼滅储 </button> </div> diff --git a/src/main/webapp/views/mat/mat_detail.html b/src/main/webapp/views/mat/mat_detail.html index b88a3e1..bd368d9 100644 --- a/src/main/webapp/views/mat/mat_detail.html +++ b/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"> -- Gitblit v1.9.1