From dbb792c46cdae2bc6882ce6b1b8ad479ed09f1ab Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 7 Mar 2018 14:40:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=89=E6=8B=A9=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/controller/UserController.java       | 13 ++-
 .../static/ruoyi/system/user/edit.js          | 16 +++-
 .../resources/templates/system/user/edit.html |  3 +-
 .../resources/templates/system/user/tree.html | 87 +++++++++++++++++++
 4 files changed, 114 insertions(+), 5 deletions(-)
 create mode 100644 src/main/resources/templates/system/user/tree.html

diff --git a/src/main/java/com/ruoyi/project/system/user/controller/UserController.java b/src/main/java/com/ruoyi/project/system/user/controller/UserController.java
index d26bbb170..2592204f2 100644
--- a/src/main/java/com/ruoyi/project/system/user/controller/UserController.java
+++ b/src/main/java/com/ruoyi/project/system/user/controller/UserController.java
@@ -69,7 +69,7 @@ public class UserController extends BaseController
         model.addAttribute("user", user);
         return prefix + "/edit";
     }
-    
+
     /**
      * 新增用户
      */
@@ -109,7 +109,7 @@ public class UserController extends BaseController
         }
         return JSON.error();
     }
-    
+
     /**
      * 保存
      */
@@ -126,4 +126,13 @@ public class UserController extends BaseController
         return JSON.error();
     }
 
+    /**
+     * 选择部门树
+     */
+    @GetMapping("/selectDeptTree")
+    public String selectDeptTree()
+    {
+        return prefix + "/tree";
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/resources/static/ruoyi/system/user/edit.js b/src/main/resources/static/ruoyi/system/user/edit.js
index 6191cda70..b903a3854 100644
--- a/src/main/resources/static/ruoyi/system/user/edit.js
+++ b/src/main/resources/static/ruoyi/system/user/edit.js
@@ -29,18 +29,19 @@ function getIsChecked(_name) {
 
 function update() {
 	var userId = $("input[name='userId']").val();
+	var deptId = $("input[name='deptId']").val();
 	var userName = $("input[name='userName']").val();
 	var email = $("input[name='email']").val();
 	var phonenumber = $("input[name='phonenumber']").val();
 	var status = $("input[name='status']").is(':checked') == true ? 0 : 1;
 	var roleIds = getIsChecked("role");
-	alert(roleIds);
 	$.ajax({
 		cache : true,
 		type : "POST",
 		url : "/system/user/save",
 		data : {
 			"userId": userId,
+			"deptId": deptId,
 			"userName": userName,
 			"email": email,
 			"phonenumber": phonenumber,
@@ -62,4 +63,15 @@ function update() {
 
 		}
 	});
-}
\ No newline at end of file
+}
+
+/*用户管理-修改-选择部门树*/
+function selectDeptTree() {
+    var url = "/system/user/selectDeptTree";
+    layer_show("选择部门", url, '400', '410');
+}
+
+function loadDept(deptId,deptName){
+	$("#deptId").val(deptId);
+	$("#deptName").val(deptName);
+}
diff --git a/src/main/resources/templates/system/user/edit.html b/src/main/resources/templates/system/user/edit.html
index 9a43a57c7..f78f8182b 100644
--- a/src/main/resources/templates/system/user/edit.html
+++ b/src/main/resources/templates/system/user/edit.html
@@ -7,6 +7,7 @@
 	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
 		<form class="form-horizontal m" id="form-user-edit">
 			<input name="userId"  type="hidden"  th:value="${user.userId}" />
+			<input name="deptId"  type="hidden"  th:value="${user.deptId}" id="deptId"/>
 			<div class="form-group">
 				<label class="col-sm-3 control-label ">登录名称：</label>
 				<div class="col-sm-8">
@@ -16,7 +17,7 @@
 			<div class="form-group">
 				<label class="col-sm-3 control-label">部门名称：</label>
 				<div class="col-sm-8">
-					<input class="form-control" type="text" readonly="true" name="deptName" id="deptName" th:value="${user.dept.deptName}">
+					<input class="form-control" type="text" onclick="selectDeptTree()" readonly="true" name="deptName" id="deptName" th:value="${user.dept.deptName}">
 				</div>
 			</div>
 			<div class="form-group">
diff --git a/src/main/resources/templates/system/user/tree.html b/src/main/resources/templates/system/user/tree.html
new file mode 100644
index 000000000..ac9fffa05
--- /dev/null
+++ b/src/main/resources/templates/system/user/tree.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html>
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<link href="/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css" rel="stylesheet">
+<link href="/ruoyi/css/RuoYi.css" rel="stylesheet"/>
+<style>
+body{height:auto;font-family: "Microsoft YaHei";}
+button{font-family: "SimSun","Helvetica Neue",Helvetica,Arial;}
+</style>
+<body class="hold-transition box box-main">
+	<input id="deptId"   name="deptId"    type="hidden"/>
+	<input id="deptName" name="deptName"  type="hidden"/>
+	<div class="wrapper"><div class="treeShowHideButton" onclick="search();">
+		<label id="btnShow" title="显示搜索" style="display:none;">︾</label>
+		<label id="btnHide" title="隐藏搜索">︽</label>
+	</div>
+	<div class="treeSearchInput" id="search">
+		<label for="keyword">关键字：</label><input type="text" class="empty" id="keyword" maxlength="50">
+		<button class="btn" id="btn" onclick="searchNode()"> 搜索 </button>
+	</div>
+	<div class="treeExpandCollapse">
+		<a href="javascript:" id="btnExpand">展开</a> /
+		<a href="javascript:" id="btnCollapse">折叠</a>
+	</div>
+	<div id="tree" class="ztree treeselect"></div>
+	</div>
+	<div class="layui-layer-btn">
+		<a class="layui-layer-btn0" th:onclick="'javascript:loadUser()'"><i class="fa fa-check"></i> 确定</a>
+		<a class="layui-layer-btn1" th:onclick="'javascript:layer_close()'"><i class="fa fa-close"></i> 关闭</a>
+	</div>
+	<div th:include="include::footer"></div>
+	<script src="/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js"></script>
+	<script>
+		$(document).ready(function(){
+			queryDeptTreeDaTa();
+		});
+		function search($this) {
+			$('#search').slideToggle(200);
+			$('#btnShow').toggle();
+			$('#btnHide').toggle();
+			$('#keyword').focus();
+		}
+		function queryDeptTreeDaTa()
+		{
+			// 树结构初始化加载
+			var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:{enable:true}},
+				callback:{onClick:function(event, treeId, treeNode){
+					var deptId = treeNode.id;
+					var deptName = treeNode.name;
+					$("#deptId").val(deptId);
+					$("#deptName").val(deptName);
+				}}
+			}, tree, loadTree = function(){
+				$.get("/system/dept/treeData", 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, "正在加载，请稍后...");
+			};loadTree();
+			
+			$('#btnExpand').click(function() {
+				tree.expandAll(true);
+			});
+			$('#btnCollapse').click(function() {
+				tree.expandAll(false);
+			});
+		}
+		
+		function loadUser(){
+			var deptId = $("#deptId").val();
+			var deptName = $("#deptName").val();
+			parent.loadDept(deptId, deptName);
+			var index = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+			parent.layer.close(index);
+		}
+	</script>
+</body>
+</html>