组织机构权限修改

.codex/inspect_core/views/layouts/default.html

@@ -0,0 +1,21 @@
+<%/* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+   * No deletion without permission, or be held responsible to law. */
+/*
+ * 默认布局文件
+ * @param title 页面标题
+ * @param bodyClass body标签的class内容
+ * @param libs 要引用的js或css类库
+ */
+var themeName = @Global.getConfig('web.view.themeName', 'default');
+// 获取当前皮肤样式名称：详见jeesite-common项目下的static/adminlte/css/skins目录
+var defaultSkinName = @Global.getConfig('sys.index.skinName', 'skin-blue-light3');
+var skinName = cookie('skinName', false, defaultSkinName);
+print('<'+'!DOC'+'TYPE html'+'><'+'html class="'+skinName+'"><'+'head'+'>');
+include('/include/head.html', {title: text(title!)}){}
+include('/themes/'+themeName+'/include/header.html', {libs: libs!, skinName: skinName!}){} %>
+</head><body class="hold-transition ${bodyClass!}">
+<% if (!@ListUtils.inString('layout', libs!)){ %>
+<div class="wrapper">${layoutContent}</div>
+<% }else{ %>${layoutContent}<% } %>
+<a id="scroll-up" href="#" class="btn btn-sm hide"><i class="fa fa-angle-double-up"></i></a>
+<% include('/themes/'+themeName+'/include/footer.html', {libs: libs!}){} %>

.codex/inspect_core/views/modules/sys/officeIndex.html

@@ -0,0 +1,76 @@
+<% 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/office/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}},
+	async:{enable:true,autoParam:["id=parentCode"],url:"${ctx}/sys/office/treeData"},
+	callback:{onClick:function(event, treeId, treeNode){
+		tree.expandNode(treeNode);
+		//win.$('button[type=reset]').click();
+		win.$('#officeCode').val(treeNode.id);
+		win.page();
+	}}
+}, tree, loadTree = function(){
+	js.ajaxSubmit(setting.async.url+"?___t="+new Date().getTime(), {
+			ctrlPermi:'${ctrlPermi}'/*1拥有的权限 2管理的权限*/,
+			parentCode:'${parameter.parentCode!}'}, function(data){
+		tree = $.fn.zTree.init($("#tree"), setting, data);
+		var level = -1, nodes;
+		while (++level <= 1) {
+			nodes = tree.getNodesByParam("level", level);
+			if (nodes.length > 10) { break; }
+			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();
+});
+// 调用子页分页函数
+function page(){
+	win.page();
+}
+</script>

.codex/inspect_core/views/modules/sys/user/empUserIndex.html

@@ -0,0 +1,80 @@
+<% 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">
+					<% if(hasPermi('sys:office:edit')){ %>
+						<button type="button" class="btn btn-box-tool addTabPage" data-href="${ctx}/sys/office/list" title="${text('机构管理')}"><i class="fa fa-edit"></i></button>
+					<% } %>
+					<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/empUser/list"></iframe>
+</div> 
+<% } %>
+<script>
+// 初始化布局
+$('body').layout({
+	west__initClosed: $(window).width() <= 767, // 是否默认关闭
+	west__size: window.lang == 'en' ? 215 : 200
+});
+// 主页框架
+var win = $("#mainFrame")[0].contentWindow;
+// 树结构初始化加载
+var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:{enable:true}},
+	async:{enable:true,autoParam:["id=parentCode"],url:"${ctx}/sys/office/treeData"},
+	callback:{onClick:function(event, treeId, treeNode){
+		tree.expandNode(treeNode);
+		//win.$('button[type=reset]').click();
+		win.$('#officeCode').val(treeNode.id);
+		win.$('#officeName').val(treeNode.name);
+		win.page(1);
+	}}
+}, tree, loadTree = function(){
+	js.ajaxSubmit(setting.async.url+"?___t="+new Date().getTime(), {
+			ctrlPermi:'${ctrlPermi}'/*1拥有的权限 2管理的权限*/,
+			parentCode:'${parameter.parentCode!}'}, function(data){
+		tree = $.fn.zTree.init($("#tree"), setting, data);
+		var level = -1, nodes;
+		while (++level <= 1) {
+			nodes = tree.getNodesByParam("level", level);
+			if (nodes.length > 10) { break; }
+			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();
+});
+// 调用子页分页函数
+function page(){
+	win.page();
+}
+</script>

src/main/resources/views/modules/mes/mesEmployeeForm.html

@@ -36,7 +36,7 @@
 							<div class="col-sm-8">
 								<#form:treeselect id="office" title="${text('机构选择')}"
 									path="officeCode" labelPath="officeName"
-									url="${ctx}/sys/office/treeData?ctrlPermi=${ctrlPermi}"
+									url="${ctx}/sys/office/treeData?ctrlPermi=0"
 									class="required" allowClear="false" canSelectRoot="true" canSelectParent="true"/>
 							</div>
 						</div>

src/main/resources/views/modules/sys/officeForm.html

@@ -19,7 +19,7 @@
 							<div class="col-sm-8">
 								<#form:treeselect id="parent" title="${text('上级机构')}"
 									path="parent.id" labelPath="parent.officeName" 
-									url="${ctx}/sys/office/treeData?excludeCode=${office.id}&ctrlPermi=${ctrlPermi}"
+									url="${ctx}/sys/office/treeData?excludeCode=${office.id}&ctrlPermi=0"
 									class="" allowClear="true" canSelectRoot="true" canSelectParent="true"/>
 							</div>
 						</div>

src/main/resources/views/modules/sys/officeIndex.html

@@ -0,0 +1,76 @@
+<% 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/office/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}},
+	async:{enable:true,autoParam:["id=parentCode"],url:"${ctx}/sys/office/treeData"},
+	callback:{onClick:function(event, treeId, treeNode){
+		tree.expandNode(treeNode);
+		//win.$('button[type=reset]').click();
+		win.$('#officeCode').val(treeNode.id);
+		win.page();
+	}}
+}, tree, loadTree = function(){
+	js.ajaxSubmit(setting.async.url+"?___t="+new Date().getTime(), {
+			ctrlPermi:'0'/*0全部 1拥有的权限 2管理的权限*/,
+			parentCode:'${parameter.parentCode!}'}, function(data){
+		tree = $.fn.zTree.init($("#tree"), setting, data);
+		var level = -1, nodes;
+		while (++level <= 1) {
+			nodes = tree.getNodesByParam("level", level);
+			if (nodes.length > 10) { break; }
+			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();
+});
+// 调用子页分页函数
+function page(){
+	win.page();
+}
+</script>

src/main/resources/views/modules/sys/officeList.html

@@ -21,7 +21,7 @@
 		<div class="box-body">
 			<#form:form id="searchForm" model="${office}" action="${ctx}/sys/office/listData" method="post" class="form-inline hide"
 					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
-				<#form:hidden name="ctrlPermi" value="${ctrlPermi}"/>
+				<#form:hidden name="ctrlPermi" value="0"/>
 				<#form:hidden path="officeCode" class="isReset"/>
 				<div class="form-group">
 					<label class="control-label">${text('机构代码')}：</label>

src/main/resources/views/modules/sys/user/empUserForm.html

@@ -26,7 +26,7 @@
 						<div class="col-sm-8">
 							<#form:treeselect id="office" title="${text('机构选择')}"
 							path="employee.office.officeCode" labelPath="employee.office.officeName"
-							url="${ctx}/sys/office/treeData?ctrlPermi=${ctrlPermi}"
+							url="${ctx}/sys/office/treeData?ctrlPermi=0"
 							class="required" allowClear="false" canSelectRoot="true" canSelectParent="true"/>
 						</div>
 					</div>
@@ -223,7 +223,7 @@
 							id: 'office_'+editOptions.id, title: '机构选择',
 							name: 'officeCode', value: val.split('|')[0],
 							labelName: 'officeName', labelValue: val.split('|')[1],
-							url: '${ctx}/sys/office/treeData', cssClass: 'required'
+							url: '${ctx}/sys/office/treeData?ctrlPermi=0', cssClass: 'required'
 						});
 					}
 				}
@@ -256,7 +256,7 @@
 		url: '${ctx}/sys/role/treeData',
 		postData: [
 			{name:'userType',value:'employee'},
-			{name:'ctrlPermi',value:'${ctrlPermi}'}
+			{name:'ctrlPermi',value:'0'}
 		],
 		columnModel: [
 			{header:'${text("角色名称")}', name:'name', sortable:false, width:100, align:"center"},

src/main/resources/views/modules/sys/user/empUserIndex.html

@@ -0,0 +1,80 @@
+<% 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">
+					<% if(hasPermi('sys:office:edit')){ %>
+						<button type="button" class="btn btn-box-tool addTabPage" data-href="${ctx}/sys/office/list" title="${text('机构管理')}"><i class="fa fa-edit"></i></button>
+					<% } %>
+					<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/empUser/list"></iframe>
+</div>
+<% } %>
+<script>
+// 初始化布局
+$('body').layout({
+	west__initClosed: $(window).width() <= 767, // 是否默认关闭
+	west__size: window.lang == 'en' ? 215 : 200
+});
+// 主页框架
+var win = $("#mainFrame")[0].contentWindow;
+// 树结构初始化加载
+var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:{enable:true}},
+	async:{enable:true,autoParam:["id=parentCode"],url:"${ctx}/sys/office/treeData"},
+	callback:{onClick:function(event, treeId, treeNode){
+		tree.expandNode(treeNode);
+		//win.$('button[type=reset]').click();
+		win.$('#officeCode').val(treeNode.id);
+		win.$('#officeName').val(treeNode.name);
+		win.page(1);
+	}}
+}, tree, loadTree = function(){
+	js.ajaxSubmit(setting.async.url+"?___t="+new Date().getTime(), {
+			ctrlPermi:'0'/*0全部 1拥有的权限 2管理的权限*/,
+			parentCode:'${parameter.parentCode!}'}, function(data){
+		tree = $.fn.zTree.init($("#tree"), setting, data);
+		var level = -1, nodes;
+		while (++level <= 1) {
+			nodes = tree.getNodesByParam("level", level);
+			if (nodes.length > 10) { break; }
+			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();
+});
+// 调用子页分页函数
+function page(){
+	win.page();
+}
+</script>

src/main/resources/views/modules/sys/user/empUserList.html

@@ -28,7 +28,7 @@
 		<div class="box-body">
 			<#form:form id="searchForm" model="${empUser}" action="${ctx}/sys/empUser/listData" method="post" class="form-inline "
 			data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
-			<#form:hidden name="ctrlPermi" value="${@Global.getConfig('user.adminCtrlPermi', '2')}"/>
+			<#form:hidden name="ctrlPermi" value="0"/>
 			<div class="form-group">
 				<label class="control-label">${text('账号')}：</label>
 				<div class="control-inline">
@@ -71,7 +71,7 @@
 					<div class="control-inline width-90">
 						<#form:treeselect id="office" title="${text('机构选择')}"
 						path="employee.office.officeCode" labelPath="employee.office.officeName"
-						url="${ctx}/sys/office/treeData?ctrlPermi=${@Global.getConfig('user.adminCtrlPermi', '2')}"
+						url="${ctx}/sys/office/treeData?ctrlPermi=0"
 						btnClass="btn-sm" allowClear="true" canSelectRoot="true" canSelectParent="true"/>
 					</div>
 				</div>

src/main/resources/views/modules/sys/user/officeList.html

@@ -21,7 +21,7 @@
 		<div class="box-body">
 			<#form:form id="searchForm" model="${office}" action="${ctx}/sys/office/listData" method="post" class="form-inline hide"
 					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
-				<#form:hidden name="ctrlPermi" value="${ctrlPermi}"/>
+				<#form:hidden name="ctrlPermi" value="0"/>
 				<#form:hidden path="officeCode" class="isReset"/>
 				<div class="form-group">
 					<label class="control-label">${text('机构代码')}：</label>
@@ -164,4 +164,4 @@ $('#btnImport').click(function(){
 		</div>
 	</div>
 </form>
-//--></script>
+//--></script>