From cb02db9c2914291842e7aa080f3f16a33d4fd684 Mon Sep 17 00:00:00 2001 From: WenG <450292408@qq.com> Date: Wed, 13 Oct 2021 22:20:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=90=88=E5=B9=B6=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../route/DepartmentRouteController.java | 5 + .../department/list-tree-select.html | 130 ++++++++++++++++++ .../resources/templates/department/list.html | 10 +- 3 files changed, 140 insertions(+), 5 deletions(-) create mode 100644 service-department/src/main/resources/templates/department/list-tree-select.html diff --git a/service-department/src/main/java/ink/wgink/service/department/controller/route/DepartmentRouteController.java b/service-department/src/main/java/ink/wgink/service/department/controller/route/DepartmentRouteController.java index 3f3da595..cc04fc13 100644 --- a/service-department/src/main/java/ink/wgink/service/department/controller/route/DepartmentRouteController.java +++ b/service-department/src/main/java/ink/wgink/service/department/controller/route/DepartmentRouteController.java @@ -87,6 +87,11 @@ public class DepartmentRouteController { return new ModelAndView("department/list-tree"); } + @GetMapping("list-tree-select") + public ModelAndView listTreeSelect() { + return new ModelAndView("department/list-tree-select"); + } + @GetMapping("list-tree-user") public ModelAndView listTreeUser() { return new ModelAndView("department/list-tree-user"); diff --git a/service-department/src/main/resources/templates/department/list-tree-select.html b/service-department/src/main/resources/templates/department/list-tree-select.html new file mode 100644 index 00000000..d1d4466f --- /dev/null +++ b/service-department/src/main/resources/templates/department/list-tree-select.html @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + +
+
+
+
+
+
    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/service-department/src/main/resources/templates/department/list.html b/service-department/src/main/resources/templates/department/list.html index d99d4757..7f36d5bc 100644 --- a/service-department/src/main/resources/templates/department/list.html +++ b/service-department/src/main/resources/templates/department/list.html @@ -321,18 +321,18 @@ } }); } else if(mergeType === 'selectDepartment') { - top.dialog.tree({ - title: '选择树', - apiUri: top.restAjax.path('api/department/listztree', []), + top.dialog.open({ + url: top.restAjax.path('route/department/list-tree-select', []), + title: '选择组织', width: '200px', height: '400px', onClose: function() { - var selectNodes = top.dialog.dialogTreeData.selectedNodes; + var selectNodes = top.dialog.dialogData.selectedNodes; + console.log(selectNodes); if(selectNodes && selectNodes.length > 0) { for(var i = 0, item; item = checkDatas[i++];) { if(item.departmentId == selectNodes[0].id) { top.dialog.msg('不能选中要合并的组织'); - top.dialog.dialogTreeData.selectedNodes = []; return; } }