From 248da5a7b1a7ffc68150f1d6f804bf717b74364c Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 15 Oct 2021 20:20:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=8F=B8=E7=AE=A1=E7=90=86=E3=80=81?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86=E3=80=81=E8=A1=8C=E6=94=BF?=
 =?UTF-8?q?=E5=8C=BA=E5=88=92=E5=A2=9E=E5=8A=A0=E5=B7=A6=E6=A0=91=E5=8F=B3?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/web/AreaController.java       | 11 +++
 .../modules/sys/web/CompanyController.java    | 10 +++
 .../modules/sys/web/OfficeController.java     |  2 +-
 .../views/modules/sys/areaIndex.html          | 71 +++++++++++++++++++
 .../views/modules/sys/companyIndex.html       | 71 +++++++++++++++++++
 5 files changed, 164 insertions(+), 1 deletion(-)
 create mode 100644 modules/core/src/main/resources/views/modules/sys/areaIndex.html
 create mode 100644 modules/core/src/main/resources/views/modules/sys/companyIndex.html

diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/AreaController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/AreaController.java
index 45062813..92868d33 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/web/AreaController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/AreaController.java
@@ -28,6 +28,7 @@ import com.jeesite.common.idgen.IdGen;
 import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.web.BaseController;
 import com.jeesite.modules.sys.entity.Area;
+import com.jeesite.modules.sys.entity.Company;
 import com.jeesite.modules.sys.service.AreaService;
 import com.jeesite.modules.sys.utils.AreaUtils;
 import com.jeesite.modules.sys.utils.UserUtils;
@@ -53,6 +54,16 @@ public class AreaController extends BaseController {
 		return areaService.get(areaCode, isNewRecord);
 	}
 	
+	/**
+	 * 区域管理
+	 */
+	@RequiresPermissions("sys:area:view")
+	@RequestMapping(value = "index")
+	public String index(Company area, Model model) {
+		model.addAttribute("area", area);
+		return "modules/sys/areaIndex";
+	}
+	
 	/**
 	 * 区域列表
 	 * @param area
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java
index 221b04cd..78d55fa4 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java
@@ -54,6 +54,16 @@ public class CompanyController extends BaseController {
 	public Company get(String companyCode, boolean isNewRecord) {
 		return companyService.get(companyCode, isNewRecord);
 	}
+	
+	/**
+	 * 公司管理
+	 */
+	@RequiresPermissions("sys:company:view")
+	@RequestMapping(value = "index")
+	public String index(Company company, Model model) {
+		model.addAttribute("company", company);
+		return "modules/sys/companyIndex";
+	}
 
 	/**
 	 * 公司列表
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java
index 29b5995e..00dfb686 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java
@@ -53,7 +53,7 @@ public class OfficeController extends BaseController {
 	}
 
 	/**
-	 * 机构管理主页面
+	 * 机构管理
 	 */
 	@RequiresPermissions("sys:office:view")
 	@RequestMapping(value = "index")
diff --git a/modules/core/src/main/resources/views/modules/sys/areaIndex.html b/modules/core/src/main/resources/views/modules/sys/areaIndex.html
new file mode 100644
index 00000000..069cf6e5
--- /dev/null
+++ b/modules/core/src/main/resources/views/modules/sys/areaIndex.html
@@ -0,0 +1,71 @@
+<% layout('/layouts/default.html', {title: '公司管理', libs: ['layout','zTree']}){ %>
+<div class="ui-layout-west">
+	<div class="main-content">
+		<div class="box box-main">
+			<div class="box-header">
+				<div class="box-title">
+					<i class="fa icon-grid"></i> ${text('公司')}
+				</div>
+				<div class="box-tools pull-right">
+					<button type="button" class="btn btn-box-tool" id="btnExpand" title="${text('展开')}" style="display:none;"><i class="fa fa-chevron-up"></i></button>
+					<button type="button" class="btn btn-box-tool" id="btnCollapse" title="${text('折叠')}"><i class="fa fa-chevron-down"></i></button>
+					<button type="button" class="btn btn-box-tool" id="btnRefresh" title="${text('刷新')}"><i class="fa fa-refresh"></i></button>
+				</div>
+			</div>
+			<div class="ui-layout-content">
+				<div id="tree" class="ztree"></div>
+			</div>
+		</div>
+	</div>
+</div>
+<div class="ui-layout-center">
+	<iframe id="mainFrame" name="mainFrame" class="ui-layout-content p0"
+		src="${ctx}/sys/area/list"></iframe>
+</div>
+<% } %>
+<script>
+// 初始化布局
+$('body').layout({
+	west__initClosed: $(window).width() <= 767, // 是否默认关闭
+	west__size: 200
+});
+// 主页框架
+var win = $("#mainFrame")[0].contentWindow;
+// 树结构初始化加载
+var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:{enable:true}},
+	callback:{onClick:function(event, treeId, treeNode){
+		tree.expandNode(treeNode);
+		//win.$('button[type=reset]').click();
+		win.$('#menuCode').val(treeNode.id);
+		win.page();
+	}}
+}, tree, loadTree = function(){
+	js.ajaxSubmit("${ctx}/sys/area/treeData?___t=" + new Date().getTime(), function(data){
+		tree = $.fn.zTree.init($("#tree"), setting, data);//.expandAll(true);
+		// 展开第一级节点
+		var nodes = tree.getNodesByParam("level", 0);
+		for(var i=0; i<nodes.length; i++) {
+			tree.expandNode(nodes[i], true, false, false);
+		}
+		// 展开第二级节点
+// 		nodes = tree.getNodesByParam("level", 1);
+// 		for(var i=0; i<nodes.length; i++) {
+// 			tree.expandNode(nodes[i], true, false, false);
+// 		}
+	}, null, null, js.text('loading.message'));
+};loadTree();
+// 工具栏按钮绑定
+$('#btnExpand').click(function(){
+	tree.expandAll(true);
+	$(this).hide();
+	$('#btnCollapse').show();
+});
+$('#btnCollapse').click(function(){
+	tree.expandAll(false);
+	$(this).hide();
+	$('#btnExpand').show();
+});
+$('#btnRefresh').click(function(){
+	loadTree();
+});
+</script>
diff --git a/modules/core/src/main/resources/views/modules/sys/companyIndex.html b/modules/core/src/main/resources/views/modules/sys/companyIndex.html
new file mode 100644
index 00000000..77841ea3
--- /dev/null
+++ b/modules/core/src/main/resources/views/modules/sys/companyIndex.html
@@ -0,0 +1,71 @@
+<% layout('/layouts/default.html', {title: '公司管理', libs: ['layout','zTree']}){ %>
+<div class="ui-layout-west">
+	<div class="main-content">
+		<div class="box box-main">
+			<div class="box-header">
+				<div class="box-title">
+					<i class="fa icon-grid"></i> ${text('公司')}
+				</div>
+				<div class="box-tools pull-right">
+					<button type="button" class="btn btn-box-tool" id="btnExpand" title="${text('展开')}" style="display:none;"><i class="fa fa-chevron-up"></i></button>
+					<button type="button" class="btn btn-box-tool" id="btnCollapse" title="${text('折叠')}"><i class="fa fa-chevron-down"></i></button>
+					<button type="button" class="btn btn-box-tool" id="btnRefresh" title="${text('刷新')}"><i class="fa fa-refresh"></i></button>
+				</div>
+			</div>
+			<div class="ui-layout-content">
+				<div id="tree" class="ztree"></div>
+			</div>
+		</div>
+	</div>
+</div>
+<div class="ui-layout-center">
+	<iframe id="mainFrame" name="mainFrame" class="ui-layout-content p0"
+		src="${ctx}/sys/company/list"></iframe>
+</div>
+<% } %>
+<script>
+// 初始化布局
+$('body').layout({
+	west__initClosed: $(window).width() <= 767, // 是否默认关闭
+	west__size: 200
+});
+// 主页框架
+var win = $("#mainFrame")[0].contentWindow;
+// 树结构初始化加载
+var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:{enable:true}},
+	callback:{onClick:function(event, treeId, treeNode){
+		tree.expandNode(treeNode);
+		//win.$('button[type=reset]').click();
+		win.$('#menuCode').val(treeNode.id);
+		win.page();
+	}}
+}, tree, loadTree = function(){
+	js.ajaxSubmit("${ctx}/sys/company/treeData?___t=" + new Date().getTime(), function(data){
+		tree = $.fn.zTree.init($("#tree"), setting, data);//.expandAll(true);
+		// 展开第一级节点
+		var nodes = tree.getNodesByParam("level", 0);
+		for(var i=0; i<nodes.length; i++) {
+			tree.expandNode(nodes[i], true, false, false);
+		}
+		// 展开第二级节点
+// 		nodes = tree.getNodesByParam("level", 1);
+// 		for(var i=0; i<nodes.length; i++) {
+// 			tree.expandNode(nodes[i], true, false, false);
+// 		}
+	}, null, null, js.text('loading.message'));
+};loadTree();
+// 工具栏按钮绑定
+$('#btnExpand').click(function(){
+	tree.expandAll(true);
+	$(this).hide();
+	$('#btnCollapse').show();
+});
+$('#btnCollapse').click(function(){
+	tree.expandAll(false);
+	$(this).hide();
+	$('#btnExpand').show();
+});
+$('#btnRefresh').click(function(){
+	loadTree();
+});
+</script>