From 0a531ae9556fb3680be1657f4d2171d8803e5af9 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 7 Jun 2026 21:02:15 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=A7=84=E8=8C=83=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E9=A1=B5=E9=9D=A2=E7=B1=BB=E5=9E=8B=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/role/index.vue               | 37 ++++++++++---------
 .../system/user/components/UserDeptTree.vue   |  9 +++--
 src/views/system/user/index.vue               |  2 +-
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 0e1e9c80..6915b65f 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -231,6 +231,7 @@
 <script setup lang="ts">
 import { useAppStore } from "@/stores/app";
 import { DeviceEnum } from "@/enums/settings";
+import type { TreeNodeData } from "element-plus/es/components/tree";
 
 import RoleAPI from "@/api/system/role";
 import type { RoleItem, RoleForm } from "@/api/system/role";
@@ -249,7 +250,7 @@ const roleFormRef = ref();
 const permTreeRef = ref();
 
 const loading = ref(false);
-const ids = ref<number[]>([]);
+const ids = ref<string[]>([]);
 
 const tableData = reactive<PageResult<RoleItem>>({
   list: [],
@@ -301,6 +302,11 @@ const isExpanded = ref(true);
 
 const parentChildLinked = ref(true);
 
+interface ToggleableTreeNode {
+  expand: () => void;
+  collapse: () => void;
+}
+
 /**
  * 加载角色列表数据
  */
@@ -337,8 +343,8 @@ function handleResetQuery(): void {
 }
 
 // 行复选框选中
-function handleSelectionChange(selection: any): void {
-  ids.value = selection.map((item: any) => item.id);
+function handleSelectionChange(selection: RoleItem[]): void {
+  ids.value = selection.flatMap((item) => (item.id ? [item.id] : []));
 }
 
 /**
@@ -489,9 +495,10 @@ async function handleAssignPermClick(row: RoleItem): Promise<void> {
 function handleAssignPermSubmit() {
   const roleId = checkedRole.value.id;
   if (roleId) {
-    const checkedMenuIds: number[] = permTreeRef
+    const checkedMenuIds = permTreeRef
       .value!.getCheckedNodes(false, true)
-      .map((node: any) => node.value);
+      .map((node: TreeNodeData) => Number(node.value))
+      .filter((value: number) => !Number.isNaN(value));
 
     loading.value = true;
     RoleAPI.updateRoleMenus(roleId, checkedMenuIds)
@@ -510,11 +517,12 @@ function handleAssignPermSubmit() {
 function togglePermTree(): void {
   isExpanded.value = !isExpanded.value;
   if (permTreeRef.value) {
-    Object.values(permTreeRef.value.store.nodesMap).forEach((node: any) => {
+    Object.values(permTreeRef.value.store.nodesMap).forEach((node) => {
+      const treeNode = node as ToggleableTreeNode;
       if (isExpanded.value) {
-        node.expand();
+        treeNode.expand();
       } else {
-        node.collapse();
+        treeNode.collapse();
       }
     });
   }
@@ -525,19 +533,14 @@ watch(permKeywords, (val) => {
   permTreeRef.value!.filter(val);
 });
 
-function handlePermFilter(
-  value: string,
-  data: {
-    [key: string]: any;
-  }
-) {
+function handlePermFilter(value: string, data: TreeNodeData) {
   if (!value) return true;
-  return data.label.includes(value);
+  return String(data.label ?? "").includes(value);
 }
 
 // 父子菜单节点是否联动
-function handleParentChildLinkedChange(val: any): void {
-  parentChildLinked.value = val;
+function handleParentChildLinkedChange(val: string | number | boolean): void {
+  parentChildLinked.value = Boolean(val);
 }
 
 onMounted(() => {
diff --git a/src/views/system/user/components/UserDeptTree.vue b/src/views/system/user/components/UserDeptTree.vue
index fd2058bb..c9292f36 100644
--- a/src/views/system/user/components/UserDeptTree.vue
+++ b/src/views/system/user/components/UserDeptTree.vue
@@ -21,6 +21,7 @@
 
 <script setup lang="ts">
 import DeptAPI from "@/api/system/dept";
+import type { TreeNodeData } from "element-plus/es/components/tree";
 
 const props = defineProps({
   modelValue: {
@@ -32,7 +33,7 @@ const props = defineProps({
 // 部门树数据
 const deptList = ref<OptionItem[]>();
 const deptTreeRef = ref();
-const deptName = ref();
+const deptName = ref("");
 
 const emits = defineEmits(["node-click"]);
 
@@ -50,17 +51,17 @@ watchEffect(
 /**
  * 部门筛选
  */
-function handleFilter(value: string, data: any): boolean {
+function handleFilter(value: string, data: TreeNodeData): boolean {
   if (!value) {
     return true;
   }
-  return data.label.indexOf(value) !== -1;
+  return String(data.label ?? "").includes(value);
 }
 
 /**
  * 部门树节点点击事件
  */
-function handleNodeClick(data: { [key: string]: any }): void {
+function handleNodeClick(data: OptionItem): void {
   deptId.value = data.value;
   emits("node-click");
 }
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index f163a74f..aa49ce66 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -418,7 +418,7 @@ function handleResetPassword(row: UserItem): void {
     inputPattern: /.{6,}/,
     inputErrorMessage: "密码至少需要6位字符",
   }).then(
-    (result: any) => resetPassword(row.id, result.value),
+    (result: { value: string }) => resetPassword(row.id, result.value),
     () => {
       /* 用户取消 */
     }