From 7c8e558ae8e3814e8fe56bda78e840e69dfd9432 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=9D=B0?= <zhengjie@tom.com>
Date: Fri, 26 Oct 2018 09:17:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DorgChart=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{plugins/lay/modules => js}/orgChart.js   |  0
 src/main/resources/static/plugins/layui.js    |  1 -
 .../templates/system/department/index.html    | 29 +++++++++++++------
 3 files changed, 20 insertions(+), 10 deletions(-)
 rename src/main/resources/static/{plugins/lay/modules => js}/orgChart.js (100%)

diff --git a/src/main/resources/static/plugins/lay/modules/orgChart.js b/src/main/resources/static/js/orgChart.js
similarity index 100%
rename from src/main/resources/static/plugins/lay/modules/orgChart.js
rename to src/main/resources/static/js/orgChart.js
diff --git a/src/main/resources/static/plugins/layui.js b/src/main/resources/static/plugins/layui.js
index 4d848ba..0b4c8c9 100644
--- a/src/main/resources/static/plugins/layui.js
+++ b/src/main/resources/static/plugins/layui.js
@@ -61,7 +61,6 @@
     ,table: 'modules/table' //表格
     ,element: 'modules/element' //常用元素操作
     ,rate: 'modules/rate'  //评分组件
-    ,orgChart: 'modules/orgChart'  //组织结构
     ,carousel: 'modules/carousel' //轮播
     ,flow: 'modules/flow' //流加载
     ,util: 'modules/util' //工具块
diff --git a/src/main/resources/templates/system/department/index.html b/src/main/resources/templates/system/department/index.html
index 745c095..a2ec056 100644
--- a/src/main/resources/templates/system/department/index.html
+++ b/src/main/resources/templates/system/department/index.html
@@ -53,16 +53,15 @@
         </div>
     </form>
 </script>
+
 <script>
-    var treeGrid = null;
-    layui.use(['jquery', 'sidebar', 'form' , 'treeGrid' ,'orgChart'], function () {
-        var $ = layui.jquery,
-            layer = layui.layer,
-            table = layui.table,
-            sidebar = layui.sidebar,
-            orgChart = layui.orgChart,
-            form = layui.form;
-        treeGrid = layui.treeGrid;
+    layui.config({
+        base: '../js/'
+    }).extend({
+        treeSelect:'orgChart'
+    }).use(['orgChart'], function () {
+
+        var  orgChart = layui.orgChart;
 
         $.ajax({
             url:'/department/getOrgChart',
@@ -98,6 +97,18 @@
                 layer.msg(msg,new Function());
             }
         });
+    });
+</script>
+
+<script>
+    var treeGrid = null;
+    layui.use(['jquery', 'sidebar', 'form' , 'treeGrid'], function () {
+        var $ = layui.jquery,
+            layer = layui.layer,
+            table = layui.table,
+            sidebar = layui.sidebar,
+            form = layui.form;
+        treeGrid = layui.treeGrid;
 
         //监听新增事件
         $('#add').on('click', function(){