From be8e8e39bf493853820a785d464c108ac4d3e009 Mon Sep 17 00:00:00 2001
From: icssoa <2570063477@qq.com>
Date: Sun, 14 Mar 2021 22:56:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/components/dept/move.vue     | 18 ++--
 .../modules/base/components/dept/tree.vue     | 95 +++++++++----------
 2 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/src/cool/modules/base/components/dept/move.vue b/src/cool/modules/base/components/dept/move.vue
index be87cb4..45fa0ad 100644
--- a/src/cool/modules/base/components/dept/move.vue
+++ b/src/cool/modules/base/components/dept/move.vue
@@ -9,13 +9,7 @@ export default {
 	name: "cl-dept-move",
 
 	methods: {
-		async getDeptList() {
-			return await this.$service.system.dept.list().then(deepTree);
-		},
-
 		async toMove(ids) {
-			let list = await this.getDeptList();
-
 			this.$crud.openForm({
 				title: "部门转移",
 				width: "600px",
@@ -29,6 +23,16 @@ export default {
 						component: {
 							name: "system-user__dept-move",
 
+							data() {
+								return {
+									list: []
+								};
+							},
+
+							async created() {
+								this.list = await this.$service.system.dept.list().then(deepTree);
+							},
+
 							methods: {
 								selectRow(e) {
 									this.$emit("input", e);
@@ -44,7 +48,7 @@ export default {
 											padding: "2px"
 										}}>
 										<el-tree
-											data={list}
+											data={this.list}
 											{...{
 												props: {
 													props: {
diff --git a/src/cool/modules/base/components/dept/tree.vue b/src/cool/modules/base/components/dept/tree.vue
index 70bde73..6202c02 100644
--- a/src/cool/modules/base/components/dept/tree.vue
+++ b/src/cool/modules/base/components/dept/tree.vue
@@ -95,52 +95,47 @@ export default {
 				d = this.list[0] || {};
 			}
 
-			let list = [
-				{
-					label: "新增",
-					"suffix-icon": "el-icon-plus",
-					hidden: n && n.level >= this.level,
-					callback: (_, done) => {
-						this.rowEdit({
-							name: "",
-							parentName: d.name,
-							parentId: d.id
-						});
-						done();
-					}
-				},
-				{
-					label: "编辑",
-					"suffix-icon": "el-icon-edit",
-					callback: (_, done) => {
-						this.rowEdit(d);
-						done();
-					}
-				}
-			];
-
-			if (d.parentId) {
-				list.push({
-					label: "删除",
-					"suffix-icon": "el-icon-delete",
-					callback: (_, done) => {
-						this.rowDel(d);
-						done();
-					}
-				});
-			}
-
-			list.push({
-				label: "新增成员",
-				"suffix-icon": "el-icon-user",
-				callback: (_, done) => {
-					this.$emit("user-add", d);
-					done();
-				}
-			});
-
 			ContextMenu.open(e, {
-				list
+				list: [
+					{
+						label: "新增",
+						"suffix-icon": "el-icon-plus",
+						hidden: n && n.level >= this.level,
+						callback: (_, done) => {
+							this.rowEdit({
+								name: "",
+								parentName: d.name,
+								parentId: d.id
+							});
+							done();
+						}
+					},
+					{
+						label: "编辑",
+						"suffix-icon": "el-icon-edit",
+						callback: (_, done) => {
+							this.rowEdit(d);
+							done();
+						}
+					},
+					{
+						label: "删除",
+						"suffix-icon": "el-icon-delete",
+						hidden: !Boolean(d.parentId),
+						callback: (_, done) => {
+							this.rowDel(d);
+							done();
+						}
+					},
+					{
+						label: "新增成员",
+						"suffix-icon": "el-icon-user",
+						callback: (_, done) => {
+							this.$emit("user-add", d);
+							done();
+						}
+					}
+				]
 			});
 		},
 
@@ -175,7 +170,6 @@ export default {
 		},
 
 		rowEdit(e) {
-			console.log(e);
 			const method = e.id ? "update" : "add";
 
 			Form.open({
@@ -251,14 +245,17 @@ export default {
 			const del = f => {
 				this.$service.system.dept
 					.delete({
-						ids: e.id,
+						ids: [e.id],
 						deleteUser: f
 					})
 					.then(() => {
 						if (f) {
 							this.$message.success("删除成功");
 						} else {
-							this.$confirm("该部门用户已移动到部门顶级", "删除成功");
+							this.$confirm(
+								`“${e.name}” 部门的用户已成功转移到 “${e.parentName}” 部门。`,
+								"删除成功"
+							);
 						}
 					})
 					.done(() => {
@@ -266,7 +263,7 @@ export default {
 					});
 			};
 
-			this.$confirm("该操作会删除部门下的所有用户，是否确认？", "提示", {
+			this.$confirm(`该操作会删除 “${e.name}” 部门的所有用户，是否确认？`, "提示", {
 				type: "warning",
 				confirmButtonText: "直接删除",
 				cancelButtonText: "保留用户",