From fe1e4a89ecc79dd7d78b4149ea1476317e9ff8f6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期一, 25 一月 2021 23:36:05 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/tag/tag.js | 7 +------
src/main/java/zy/cloud/wms/manager/controller/TagController.java | 2 +-
2 files changed, 2 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 5ace47d..5a4c37f 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/TagController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/TagController.java
@@ -44,7 +44,7 @@
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(tagService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.parse("0-鎿嶄綔鎴愬姛").add(tagService.selectList(wrapper));
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
diff --git a/src/main/webapp/static/js/tag/tag.js b/src/main/webapp/static/js/tag/tag.js
index b34d335..95e4cfe 100644
--- a/src/main/webapp/static/js/tag/tag.js
+++ b/src/main/webapp/static/js/tag/tag.js
@@ -12,7 +12,6 @@
var treeTable = layui.treeTable;
var xmSelect = layui.xmSelect;
- tableRender = function() {
var tableIdx = treeTable.render({
elem: '#tag',
url: baseUrl+'/tag/list/auth',
@@ -27,8 +26,8 @@
toolbar: 'default',
cols: [[
{type: 'checkbox'}
+ ,{field: 'name', align: 'left',title: '鍚嶇О'}
,{field: 'uuid', align: 'center',title: '缂栧彿'}
- ,{field: 'name', align: 'center',title: '鍚嶇О'}
// ,{field: 'parentId', align: 'center',title: '鐖剁骇'}
,{field: 'parentName', align: 'center',title: '鐖剁骇鍚嶇О'}
// ,{field: 'path', align: 'center',title: '鍏宠仈璺緞'}
@@ -48,15 +47,11 @@
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
]],
done: function (data) {
- console.log(data)
tableIdx.expandAll();
// $(".ew-tree-table .ew-tree-table-tool .ew-tree-table-tool-item").css("display", "none");
// limit()
}
});
-
- }
- tableRender();
// 澶撮儴宸ュ叿鏍忕偣鍑讳簨浠�
--
Gitblit v1.9.1