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 @@
+
@@ -16,7 +17,7 @@
- +
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 @@ + + + + + + + + + + +
+ + +
+ +
+ 展开 / + 折叠 +
+
+
+
+ 确定 + 关闭 +
+
+ + + +