diff --git a/src/components/SelectTree/index.vue b/src/components/SelectTree/index.vue
index 98c86df..7c087f8 100644
--- a/src/components/SelectTree/index.vue
+++ b/src/components/SelectTree/index.vue
@@ -4,24 +4,11 @@
       最好是 符合elementui类型的树形结构
        -->
 <!-- 树状选择器 -->
-<template>
-  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
-    <el-select v-model="value" clearable filterable ref="treeSelect" :placeholder="placeholder || '请选择'"
-      :filter-method="selectFilter" @clear="clearSelected">
-      <el-option :value="currentNodeKey" :label="currentNodeLabel">
-        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
-          :current-node-key="currentNodeKey" default-expand-all @node-click="nodeClick" :expand-on-click-node="false"
-          :filter-method="treeFilter"></el-tree-v2>
-      </el-option>
-    </el-select>
-  </div>
-</template>
-
-
 <script lang="ts">
-import { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
-import { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
-import { defineComponent, nextTick, onMounted, PropType, reactive, ref, toRefs, watch } from 'vue'
+import type { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
+import type { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
+import type { PropType } from 'vue'
+import { defineComponent, nextTick, onMounted, reactive, ref, toRefs, watch } from 'vue'
 interface PropsIter {
   value: string
   label: string
@@ -34,12 +21,11 @@
   children?: TreeIter[]
 }
 export default defineComponent({
-  name: 'tree select',
   props: {
     // 组件绑定的options
     options: {
       type: Array as PropType<TreeIter[]>,
-      required: true
+      required: true,
     },
     // 配置选项
     keyProps: Object as PropType<PropsIter>,
@@ -48,25 +34,22 @@
     // 组件样式宽
     width: {
       type: String,
-      default: '240px'
+      default: '240px',
     },
     // 空占位字符
     placeholder: String,
+    // eslint-disable-next-line vue/prop-name-casing
     TreeProps: {
       type: Object,
-      default: () => ({
-        value: 'id',
-        label: 'label',
-        children: 'children'
-      })
-    }
+      default: () => { return {} },
+    },
   },
   setup(props, { emit }) {
     const { modelValue } = toRefs(props)
-    const select: any = reactive({
+    const select: { value: string | number | undefined; currentNodeLabel: string | number | undefined; currentNodeKey: string | number | undefined } = reactive({
       value: modelValue.value,
       currentNodeKey: '',
-      currentNodeLabel: ''
+      currentNodeLabel: '',
     })
     const treeSelect = ref<HTMLElement | null>(null)
     const nodeClick = (data: TreeNodeData, node: TreeNode) => {
@@ -117,21 +100,34 @@
         setCurrent()
       }
     })
-    const { TreeProps } = toRefs(props)
+    const TreeProps = toRefs(props)
     return {
       treeSelect,
       treeV2,
+      // eslint-disable-next-line vue/no-dupe-keys
       TreeProps,
       ...toRefs(select),
       nodeClick,
       selectFilter,
       treeFilter,
-      clearSelected
+      clearSelected,
     }
-  }
+  },
 })
 </script>
 
+<template>
+  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
+    <el-select v-model="value" clearable filterable ref="treeSelect" :placeholder="placeholder || '请选择'"
+      :filter-method="selectFilter" @clear="clearSelected">
+      <el-option :value="currentNodeKey" :label="currentNodeLabel">
+        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
+          :current-node-key="currentNodeKey" default-expand-all @node-click="nodeClick" :expand-on-click-node="false"
+          :filter-method="treeFilter"></el-tree-v2>
+      </el-option>
+    </el-select>
+  </div>
+</template>
 
 <style lang="scss" scoped>
 .tree_box {

diff --git a/src/components/SelectTree/index.vue b/src/components/SelectTree/index.vue
index 98c86df..7c087f8 100644
--- a/src/components/SelectTree/index.vue
+++ b/src/components/SelectTree/index.vue
@@ -4,24 +4,11 @@
       最好是 符合elementui类型的树形结构
        -->
 <!-- 树状选择器 -->
-<template>
-  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
-    <el-select v-model="value" clearable filterable ref="treeSelect" :placeholder="placeholder || '请选择'"
-      :filter-method="selectFilter" @clear="clearSelected">
-      <el-option :value="currentNodeKey" :label="currentNodeLabel">
-        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
-          :current-node-key="currentNodeKey" default-expand-all @node-click="nodeClick" :expand-on-click-node="false"
-          :filter-method="treeFilter"></el-tree-v2>
-      </el-option>
-    </el-select>
-  </div>
-</template>
-
-
 <script lang="ts">
-import { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
-import { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
-import { defineComponent, nextTick, onMounted, PropType, reactive, ref, toRefs, watch } from 'vue'
+import type { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
+import type { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
+import type { PropType } from 'vue'
+import { defineComponent, nextTick, onMounted, reactive, ref, toRefs, watch } from 'vue'
 interface PropsIter {
   value: string
   label: string
@@ -34,12 +21,11 @@
   children?: TreeIter[]
 }
 export default defineComponent({
-  name: 'tree select',
   props: {
     // 组件绑定的options
     options: {
       type: Array as PropType<TreeIter[]>,
-      required: true
+      required: true,
     },
     // 配置选项
     keyProps: Object as PropType<PropsIter>,
@@ -48,25 +34,22 @@
     // 组件样式宽
     width: {
       type: String,
-      default: '240px'
+      default: '240px',
     },
     // 空占位字符
     placeholder: String,
+    // eslint-disable-next-line vue/prop-name-casing
     TreeProps: {
       type: Object,
-      default: () => ({
-        value: 'id',
-        label: 'label',
-        children: 'children'
-      })
-    }
+      default: () => { return {} },
+    },
   },
   setup(props, { emit }) {
     const { modelValue } = toRefs(props)
-    const select: any = reactive({
+    const select: { value: string | number | undefined; currentNodeLabel: string | number | undefined; currentNodeKey: string | number | undefined } = reactive({
       value: modelValue.value,
       currentNodeKey: '',
-      currentNodeLabel: ''
+      currentNodeLabel: '',
     })
     const treeSelect = ref<HTMLElement | null>(null)
     const nodeClick = (data: TreeNodeData, node: TreeNode) => {
@@ -117,21 +100,34 @@
         setCurrent()
       }
     })
-    const { TreeProps } = toRefs(props)
+    const TreeProps = toRefs(props)
     return {
       treeSelect,
       treeV2,
+      // eslint-disable-next-line vue/no-dupe-keys
       TreeProps,
       ...toRefs(select),
       nodeClick,
       selectFilter,
       treeFilter,
-      clearSelected
+      clearSelected,
     }
-  }
+  },
 })
 </script>
 
+<template>
+  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
+    <el-select v-model="value" clearable filterable ref="treeSelect" :placeholder="placeholder || '请选择'"
+      :filter-method="selectFilter" @clear="clearSelected">
+      <el-option :value="currentNodeKey" :label="currentNodeLabel">
+        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
+          :current-node-key="currentNodeKey" default-expand-all @node-click="nodeClick" :expand-on-click-node="false"
+          :filter-method="treeFilter"></el-tree-v2>
+      </el-option>
+    </el-select>
+  </div>
+</template>
 
 <style lang="scss" scoped>
 .tree_box {
diff --git a/src/views/system/user/list.user.vue b/src/views/system/user/list.user.vue
index 3c8639a..85e66f6 100644
--- a/src/views/system/user/list.user.vue
+++ b/src/views/system/user/list.user.vue
@@ -1,13 +1,13 @@
 <script lang="ts" setup name="SystemDictListDict">
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQueryType, TreeStructure, userType, changePageType } from './user_interface'
-import { getDeptTreeList } from '@/api/system/dept'
-import { delUser, freezeUserApi, getUserList, unfreezeUser, resetPwdApi } from '@/api/system/user'
-import { toTreeList } from '@/utils/structure'
-import { Menu, Plus, Delete, EditPen, Key, MagicStick } from '@element-plus/icons-vue'
-import { RSAencrypt } from '@/utils/security'
-import RoleAssignment from './role.assignment.vue'
+import { Delete, EditPen, Key, MagicStick, Plus } from '@element-plus/icons-vue'
+import type { IlistQueryType, TreeStructure, changePageType, userType } from './user_interface'
 import AddUser from './user.add.vue'
+import RoleAssignment from './role.assignment.vue'
+import { getDeptTreeList } from '@/api/system/dept'
+import { delUser, freezeUserApi, getUserList, resetPwdApi, unfreezeUser } from '@/api/system/user'
+import { toTreeList } from '@/utils/structure'
+import { RSAencrypt } from '@/utils/security'
 // 逻辑代码
 interface Tree {
   name: string
@@ -93,10 +93,10 @@
   if (select.value) {
     const user: userType = list.value[select.value - 1]
     addUserRef.value.initDialog('update', user)
-  } else {
+  }
+  else {
     ElMessage.error('必须选中一项')
   }
-
 }
 // 重置密码
 const resetPwd = () => {
@@ -113,13 +113,14 @@
     ).then(async () => {
       const params = {
         id: String(user.id),
-        newPwd: await RSAencrypt(resetPwdFlag.value)
+        newPwd: await RSAencrypt(resetPwdFlag.value),
       }
       resetPwdApi(params).then(() => {
         ElMessage.success('操作成功')
       })
     }).catch(() => { })
-  } else {
+  }
+  else {
     ElMessage.error('必须选中一项')
   }
 }
@@ -172,13 +173,14 @@
     }
   }).catch(() => { })
 }
-const roleAssignmentRef = ref() //角色分配弹窗
+const roleAssignmentRef = ref() // 角色分配弹窗
 // 角色分配
 const assignmentRole = () => {
   if (select.value) {
     const user: userType = list.value[select.value - 1]
     roleAssignmentRef.value.initDialog(user)
-  } else {
+  }
+  else {
     ElMessage.error('必须选中一项')
   }
 }
@@ -228,8 +230,10 @@
                 <span>组织机构</span>
               </div>
             </template>
-            <el-tree v-loading="loadingTree" :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick" />
+            <el-tree
+              v-loading="loadingTree" :data="treeData" :props="defaultProps" default-expand-all
+              :expand-on-click-node="false" @node-click="handleNodeClick"
+            />
           </el-card>
         </div>
       </div>
@@ -241,12 +245,16 @@
             <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
           </search-item>
           <search-item>
-            <el-date-picker v-model="listQuery.beginTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-              placeholder="选择开始时间" />
+            <el-date-picker
+              v-model="listQuery.beginTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+              placeholder="选择开始时间"
+            />
           </search-item>
           <search-item>
-            <el-date-picker v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-              placeholder="选择结束时间" />
+            <el-date-picker
+              v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+              placeholder="选择结束时间"
+            />
           </search-item>
         </search-area>
         <!-- 操作 -->
@@ -263,8 +271,10 @@
           <el-button v-if="proxy.hasPerm('/sys/mgr/reset')" type="primary" :icon="Key" @click="resetPwd">
             重置密码
           </el-button>
-          <el-button v-if="proxy.hasPerm('/sys/mgr/roleAssign')" type="primary" :icon="MagicStick"
-            @click="assignmentRole">
+          <el-button
+            v-if="proxy.hasPerm('/sys/mgr/roleAssign')" type="primary" :icon="MagicStick"
+            @click="assignmentRole"
+          >
             角色分配
           </el-button>
         </div>
@@ -278,8 +288,10 @@
           </div>
         </div> -->
         <!-- 查询结果Table显示 -->
-        <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-          @change="changePage">
+        <normal-table
+          :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="loadingTable"
+          @change="changePage"
+        >
           <template #preColumns>
             <el-table-column label="选择" width="60" header-align="center">
               <template #default="scope">

diff --git a/src/components/SelectTree/index.vue b/src/components/SelectTree/index.vue
index 98c86df..7c087f8 100644
--- a/src/components/SelectTree/index.vue
+++ b/src/components/SelectTree/index.vue
@@ -4,24 +4,11 @@
       最好是 符合elementui类型的树形结构
        -->
 <!-- 树状选择器 -->
-<template>
-  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
-    <el-select v-model="value" clearable filterable ref="treeSelect" :placeholder="placeholder || '请选择'"
-      :filter-method="selectFilter" @clear="clearSelected">
-      <el-option :value="currentNodeKey" :label="currentNodeLabel">
-        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
-          :current-node-key="currentNodeKey" default-expand-all @node-click="nodeClick" :expand-on-click-node="false"
-          :filter-method="treeFilter"></el-tree-v2>
-      </el-option>
-    </el-select>
-  </div>
-</template>
-
-
 <script lang="ts">
-import { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
-import { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
-import { defineComponent, nextTick, onMounted, PropType, reactive, ref, toRefs, watch } from 'vue'
+import type { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
+import type { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
+import type { PropType } from 'vue'
+import { defineComponent, nextTick, onMounted, reactive, ref, toRefs, watch } from 'vue'
 interface PropsIter {
   value: string
   label: string
@@ -34,12 +21,11 @@
   children?: TreeIter[]
 }
 export default defineComponent({
-  name: 'tree select',
   props: {
     // 组件绑定的options
     options: {
       type: Array as PropType<TreeIter[]>,
-      required: true
+      required: true,
     },
     // 配置选项
     keyProps: Object as PropType<PropsIter>,
@@ -48,25 +34,22 @@
     // 组件样式宽
     width: {
       type: String,
-      default: '240px'
+      default: '240px',
     },
     // 空占位字符
     placeholder: String,
+    // eslint-disable-next-line vue/prop-name-casing
     TreeProps: {
       type: Object,
-      default: () => ({
-        value: 'id',
-        label: 'label',
-        children: 'children'
-      })
-    }
+      default: () => { return {} },
+    },
   },
   setup(props, { emit }) {
     const { modelValue } = toRefs(props)
-    const select: any = reactive({
+    const select: { value: string | number | undefined; currentNodeLabel: string | number | undefined; currentNodeKey: string | number | undefined } = reactive({
       value: modelValue.value,
       currentNodeKey: '',
-      currentNodeLabel: ''
+      currentNodeLabel: '',
     })
     const treeSelect = ref<HTMLElement | null>(null)
     const nodeClick = (data: TreeNodeData, node: TreeNode) => {
@@ -117,21 +100,34 @@
         setCurrent()
       }
     })
-    const { TreeProps } = toRefs(props)
+    const TreeProps = toRefs(props)
     return {
       treeSelect,
       treeV2,
+      // eslint-disable-next-line vue/no-dupe-keys
       TreeProps,
       ...toRefs(select),
       nodeClick,
       selectFilter,
       treeFilter,
-      clearSelected
+      clearSelected,
     }
-  }
+  },
 })
 </script>
 
+<template>
+  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
+    <el-select v-model="value" clearable filterable ref="treeSelect" :placeholder="placeholder || '请选择'"
+      :filter-method="selectFilter" @clear="clearSelected">
+      <el-option :value="currentNodeKey" :label="currentNodeLabel">
+        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
+          :current-node-key="currentNodeKey" default-expand-all @node-click="nodeClick" :expand-on-click-node="false"
+          :filter-method="treeFilter"></el-tree-v2>
+      </el-option>
+    </el-select>
+  </div>
+</template>
 
 <style lang="scss" scoped>
 .tree_box {
diff --git a/src/views/system/user/list.user.vue b/src/views/system/user/list.user.vue
index 3c8639a..85e66f6 100644
--- a/src/views/system/user/list.user.vue
+++ b/src/views/system/user/list.user.vue
@@ -1,13 +1,13 @@
 <script lang="ts" setup name="SystemDictListDict">
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQueryType, TreeStructure, userType, changePageType } from './user_interface'
-import { getDeptTreeList } from '@/api/system/dept'
-import { delUser, freezeUserApi, getUserList, unfreezeUser, resetPwdApi } from '@/api/system/user'
-import { toTreeList } from '@/utils/structure'
-import { Menu, Plus, Delete, EditPen, Key, MagicStick } from '@element-plus/icons-vue'
-import { RSAencrypt } from '@/utils/security'
-import RoleAssignment from './role.assignment.vue'
+import { Delete, EditPen, Key, MagicStick, Plus } from '@element-plus/icons-vue'
+import type { IlistQueryType, TreeStructure, changePageType, userType } from './user_interface'
 import AddUser from './user.add.vue'
+import RoleAssignment from './role.assignment.vue'
+import { getDeptTreeList } from '@/api/system/dept'
+import { delUser, freezeUserApi, getUserList, resetPwdApi, unfreezeUser } from '@/api/system/user'
+import { toTreeList } from '@/utils/structure'
+import { RSAencrypt } from '@/utils/security'
 // 逻辑代码
 interface Tree {
   name: string
@@ -93,10 +93,10 @@
   if (select.value) {
     const user: userType = list.value[select.value - 1]
     addUserRef.value.initDialog('update', user)
-  } else {
+  }
+  else {
     ElMessage.error('必须选中一项')
   }
-
 }
 // 重置密码
 const resetPwd = () => {
@@ -113,13 +113,14 @@
     ).then(async () => {
       const params = {
         id: String(user.id),
-        newPwd: await RSAencrypt(resetPwdFlag.value)
+        newPwd: await RSAencrypt(resetPwdFlag.value),
       }
       resetPwdApi(params).then(() => {
         ElMessage.success('操作成功')
       })
     }).catch(() => { })
-  } else {
+  }
+  else {
     ElMessage.error('必须选中一项')
   }
 }
@@ -172,13 +173,14 @@
     }
   }).catch(() => { })
 }
-const roleAssignmentRef = ref() //角色分配弹窗
+const roleAssignmentRef = ref() // 角色分配弹窗
 // 角色分配
 const assignmentRole = () => {
   if (select.value) {
     const user: userType = list.value[select.value - 1]
     roleAssignmentRef.value.initDialog(user)
-  } else {
+  }
+  else {
     ElMessage.error('必须选中一项')
   }
 }
@@ -228,8 +230,10 @@
                 <span>组织机构</span>
               </div>
             </template>
-            <el-tree v-loading="loadingTree" :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick" />
+            <el-tree
+              v-loading="loadingTree" :data="treeData" :props="defaultProps" default-expand-all
+              :expand-on-click-node="false" @node-click="handleNodeClick"
+            />
           </el-card>
         </div>
       </div>
@@ -241,12 +245,16 @@
             <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
           </search-item>
           <search-item>
-            <el-date-picker v-model="listQuery.beginTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-              placeholder="选择开始时间" />
+            <el-date-picker
+              v-model="listQuery.beginTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+              placeholder="选择开始时间"
+            />
           </search-item>
           <search-item>
-            <el-date-picker v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-              placeholder="选择结束时间" />
+            <el-date-picker
+              v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+              placeholder="选择结束时间"
+            />
           </search-item>
         </search-area>
         <!-- 操作 -->
@@ -263,8 +271,10 @@
           <el-button v-if="proxy.hasPerm('/sys/mgr/reset')" type="primary" :icon="Key" @click="resetPwd">
             重置密码
           </el-button>
-          <el-button v-if="proxy.hasPerm('/sys/mgr/roleAssign')" type="primary" :icon="MagicStick"
-            @click="assignmentRole">
+          <el-button
+            v-if="proxy.hasPerm('/sys/mgr/roleAssign')" type="primary" :icon="MagicStick"
+            @click="assignmentRole"
+          >
             角色分配
           </el-button>
         </div>
@@ -278,8 +288,10 @@
           </div>
         </div> -->
         <!-- 查询结果Table显示 -->
-        <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-          @change="changePage">
+        <normal-table
+          :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="loadingTable"
+          @change="changePage"
+        >
           <template #preColumns>
             <el-table-column label="选择" width="60" header-align="center">
               <template #default="scope">
diff --git a/src/views/system/user/role.assignment.vue b/src/views/system/user/role.assignment.vue
index 78fd3b0..52b9073 100644
--- a/src/views/system/user/role.assignment.vue
+++ b/src/views/system/user/role.assignment.vue
@@ -1,4 +1,4 @@
-<!-- 角色分配弹窗 -->ey
+<!-- 角色分配弹窗 -->
 <script lang="ts" setup name="roleAssigmentDialog">
 import { ElMessage } from 'element-plus'
 import type { userType } from './user_interface'
@@ -19,7 +19,7 @@
   label: 'name',
   children: 'children',
 })
-const userId = ref('') // 用户id
+const userId = ref('')// 用户id
 const userName = ref('') // 用户名称
 const ids = ref([]) // 选中项id
 const defaultExpanded = ref<string[]>([]) // 默认展开的项
@@ -28,14 +28,30 @@
 const handleCheckChange = () => {
 
 }
+const treeRef = ref()
 // 获取角色列表
 const fetchRoleTree = () => {
   getRoleTreeListByUser(userId.value).then((response) => {
     if (response.data) {
       roleTreeList.value = toTreeList(response.data)
-      const temp = getShowItem(response.data) // 获取展开项和选中项
-      defaultExpanded.value = temp.openedList
-      defaultChecked.value = temp.expandList
+      // 获取展开项和选中项
+      const expArr: string[] = []
+      const cheArr: string[] = []
+      response.data.forEach((element: any) => {
+        if (element.open && element.checked) {
+          expArr.push(element.id)
+          cheArr.push(element.id)
+        }
+        else if (element.open) {
+          expArr.push(element.id)
+        }
+        else if (element.checked) {
+          cheArr.push(element.id)
+        }
+      })
+      defaultExpanded.value = expArr
+      defaultChecked.value = cheArr
+      treeRef.value?.setCheckedNodes(defaultChecked.value)
       loading.value = false
     }
   })
@@ -48,7 +64,7 @@
   dialogFormVisible.value = true
   fetchRoleTree()
 }
-const treeRef = ref()
+
 defineExpose({ initDialog })
 const saveData = () => {
   ids.value = treeRef.value.getCheckedKeys()
@@ -62,6 +78,11 @@
 }
 const cancel = () => {
   dialogFormVisible.value = false
+  userId.value = ''
+  userName.value = ''
+  defaultExpanded.value = []
+  defaultChecked.value = []
+  treeRef.value?.setCheckedNodes([])
   emits('resetData')
 }
 </script>
@@ -69,14 +90,12 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="titleText" width="330px" append-to-body>
     <el-scrollbar>
-      <el-tree
-        ref="treeRef" v-loading="loading" :props="defaultProps" :data="roleTreeList"
+      <el-tree ref="treeRef" v-loading="loading" :props="defaultProps" :data="roleTreeList"
         :default-expanded-keys="defaultExpanded" :default-checked-keys="defaultChecked"
         :default-expand-all="defaultExpandAll" show-checkbox check-strictly node-key="id"
-        @check-change="handleCheckChange"
-      />
+        @check-change="handleCheckChange" />
     </el-scrollbar>
-    <div slot="footer" class="dialog-footer footer">
+    <div class="dialog-footer footer">
       <el-button type="primary" @click="saveData">
         保存
       </el-button>

diff --git a/src/components/SelectTree/index.vue b/src/components/SelectTree/index.vue
index 98c86df..7c087f8 100644
--- a/src/components/SelectTree/index.vue
+++ b/src/components/SelectTree/index.vue
@@ -4,24 +4,11 @@
       最好是 符合elementui类型的树形结构
        -->
 <!-- 树状选择器 -->
-<template>
-  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
-    <el-select v-model="value" clearable filterable ref="treeSelect" :placeholder="placeholder || '请选择'"
-      :filter-method="selectFilter" @clear="clearSelected">
-      <el-option :value="currentNodeKey" :label="currentNodeLabel">
-        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
-          :current-node-key="currentNodeKey" default-expand-all @node-click="nodeClick" :expand-on-click-node="false"
-          :filter-method="treeFilter"></el-tree-v2>
-      </el-option>
-    </el-select>
-  </div>
-</template>
-
-
 <script lang="ts">
-import { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
-import { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
-import { defineComponent, nextTick, onMounted, PropType, reactive, ref, toRefs, watch } from 'vue'
+import type { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
+import type { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
+import type { PropType } from 'vue'
+import { defineComponent, nextTick, onMounted, reactive, ref, toRefs, watch } from 'vue'
 interface PropsIter {
   value: string
   label: string
@@ -34,12 +21,11 @@
   children?: TreeIter[]
 }
 export default defineComponent({
-  name: 'tree select',
   props: {
     // 组件绑定的options
     options: {
       type: Array as PropType<TreeIter[]>,
-      required: true
+      required: true,
     },
     // 配置选项
     keyProps: Object as PropType<PropsIter>,
@@ -48,25 +34,22 @@
     // 组件样式宽
     width: {
       type: String,
-      default: '240px'
+      default: '240px',
     },
     // 空占位字符
     placeholder: String,
+    // eslint-disable-next-line vue/prop-name-casing
     TreeProps: {
       type: Object,
-      default: () => ({
-        value: 'id',
-        label: 'label',
-        children: 'children'
-      })
-    }
+      default: () => { return {} },
+    },
   },
   setup(props, { emit }) {
     const { modelValue } = toRefs(props)
-    const select: any = reactive({
+    const select: { value: string | number | undefined; currentNodeLabel: string | number | undefined; currentNodeKey: string | number | undefined } = reactive({
       value: modelValue.value,
       currentNodeKey: '',
-      currentNodeLabel: ''
+      currentNodeLabel: '',
     })
     const treeSelect = ref<HTMLElement | null>(null)
     const nodeClick = (data: TreeNodeData, node: TreeNode) => {
@@ -117,21 +100,34 @@
         setCurrent()
       }
     })
-    const { TreeProps } = toRefs(props)
+    const TreeProps = toRefs(props)
     return {
       treeSelect,
       treeV2,
+      // eslint-disable-next-line vue/no-dupe-keys
       TreeProps,
       ...toRefs(select),
       nodeClick,
       selectFilter,
       treeFilter,
-      clearSelected
+      clearSelected,
     }
-  }
+  },
 })
 </script>
 
+<template>
+  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
+    <el-select v-model="value" clearable filterable ref="treeSelect" :placeholder="placeholder || '请选择'"
+      :filter-method="selectFilter" @clear="clearSelected">
+      <el-option :value="currentNodeKey" :label="currentNodeLabel">
+        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
+          :current-node-key="currentNodeKey" default-expand-all @node-click="nodeClick" :expand-on-click-node="false"
+          :filter-method="treeFilter"></el-tree-v2>
+      </el-option>
+    </el-select>
+  </div>
+</template>
 
 <style lang="scss" scoped>
 .tree_box {
diff --git a/src/views/system/user/list.user.vue b/src/views/system/user/list.user.vue
index 3c8639a..85e66f6 100644
--- a/src/views/system/user/list.user.vue
+++ b/src/views/system/user/list.user.vue
@@ -1,13 +1,13 @@
 <script lang="ts" setup name="SystemDictListDict">
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQueryType, TreeStructure, userType, changePageType } from './user_interface'
-import { getDeptTreeList } from '@/api/system/dept'
-import { delUser, freezeUserApi, getUserList, unfreezeUser, resetPwdApi } from '@/api/system/user'
-import { toTreeList } from '@/utils/structure'
-import { Menu, Plus, Delete, EditPen, Key, MagicStick } from '@element-plus/icons-vue'
-import { RSAencrypt } from '@/utils/security'
-import RoleAssignment from './role.assignment.vue'
+import { Delete, EditPen, Key, MagicStick, Plus } from '@element-plus/icons-vue'
+import type { IlistQueryType, TreeStructure, changePageType, userType } from './user_interface'
 import AddUser from './user.add.vue'
+import RoleAssignment from './role.assignment.vue'
+import { getDeptTreeList } from '@/api/system/dept'
+import { delUser, freezeUserApi, getUserList, resetPwdApi, unfreezeUser } from '@/api/system/user'
+import { toTreeList } from '@/utils/structure'
+import { RSAencrypt } from '@/utils/security'
 // 逻辑代码
 interface Tree {
   name: string
@@ -93,10 +93,10 @@
   if (select.value) {
     const user: userType = list.value[select.value - 1]
     addUserRef.value.initDialog('update', user)
-  } else {
+  }
+  else {
     ElMessage.error('必须选中一项')
   }
-
 }
 // 重置密码
 const resetPwd = () => {
@@ -113,13 +113,14 @@
     ).then(async () => {
       const params = {
         id: String(user.id),
-        newPwd: await RSAencrypt(resetPwdFlag.value)
+        newPwd: await RSAencrypt(resetPwdFlag.value),
       }
       resetPwdApi(params).then(() => {
         ElMessage.success('操作成功')
       })
     }).catch(() => { })
-  } else {
+  }
+  else {
     ElMessage.error('必须选中一项')
   }
 }
@@ -172,13 +173,14 @@
     }
   }).catch(() => { })
 }
-const roleAssignmentRef = ref() //角色分配弹窗
+const roleAssignmentRef = ref() // 角色分配弹窗
 // 角色分配
 const assignmentRole = () => {
   if (select.value) {
     const user: userType = list.value[select.value - 1]
     roleAssignmentRef.value.initDialog(user)
-  } else {
+  }
+  else {
     ElMessage.error('必须选中一项')
   }
 }
@@ -228,8 +230,10 @@
                 <span>组织机构</span>
               </div>
             </template>
-            <el-tree v-loading="loadingTree" :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick" />
+            <el-tree
+              v-loading="loadingTree" :data="treeData" :props="defaultProps" default-expand-all
+              :expand-on-click-node="false" @node-click="handleNodeClick"
+            />
           </el-card>
         </div>
       </div>
@@ -241,12 +245,16 @@
             <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
           </search-item>
           <search-item>
-            <el-date-picker v-model="listQuery.beginTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-              placeholder="选择开始时间" />
+            <el-date-picker
+              v-model="listQuery.beginTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+              placeholder="选择开始时间"
+            />
           </search-item>
           <search-item>
-            <el-date-picker v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-              placeholder="选择结束时间" />
+            <el-date-picker
+              v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+              placeholder="选择结束时间"
+            />
           </search-item>
         </search-area>
         <!-- 操作 -->
@@ -263,8 +271,10 @@
           <el-button v-if="proxy.hasPerm('/sys/mgr/reset')" type="primary" :icon="Key" @click="resetPwd">
             重置密码
           </el-button>
-          <el-button v-if="proxy.hasPerm('/sys/mgr/roleAssign')" type="primary" :icon="MagicStick"
-            @click="assignmentRole">
+          <el-button
+            v-if="proxy.hasPerm('/sys/mgr/roleAssign')" type="primary" :icon="MagicStick"
+            @click="assignmentRole"
+          >
             角色分配
           </el-button>
         </div>
@@ -278,8 +288,10 @@
           </div>
         </div> -->
         <!-- 查询结果Table显示 -->
-        <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-          @change="changePage">
+        <normal-table
+          :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="loadingTable"
+          @change="changePage"
+        >
           <template #preColumns>
             <el-table-column label="选择" width="60" header-align="center">
               <template #default="scope">
diff --git a/src/views/system/user/role.assignment.vue b/src/views/system/user/role.assignment.vue
index 78fd3b0..52b9073 100644
--- a/src/views/system/user/role.assignment.vue
+++ b/src/views/system/user/role.assignment.vue
@@ -1,4 +1,4 @@
-<!-- 角色分配弹窗 -->ey
+<!-- 角色分配弹窗 -->
 <script lang="ts" setup name="roleAssigmentDialog">
 import { ElMessage } from 'element-plus'
 import type { userType } from './user_interface'
@@ -19,7 +19,7 @@
   label: 'name',
   children: 'children',
 })
-const userId = ref('') // 用户id
+const userId = ref('')// 用户id
 const userName = ref('') // 用户名称
 const ids = ref([]) // 选中项id
 const defaultExpanded = ref<string[]>([]) // 默认展开的项
@@ -28,14 +28,30 @@
 const handleCheckChange = () => {
 
 }
+const treeRef = ref()
 // 获取角色列表
 const fetchRoleTree = () => {
   getRoleTreeListByUser(userId.value).then((response) => {
     if (response.data) {
       roleTreeList.value = toTreeList(response.data)
-      const temp = getShowItem(response.data) // 获取展开项和选中项
-      defaultExpanded.value = temp.openedList
-      defaultChecked.value = temp.expandList
+      // 获取展开项和选中项
+      const expArr: string[] = []
+      const cheArr: string[] = []
+      response.data.forEach((element: any) => {
+        if (element.open && element.checked) {
+          expArr.push(element.id)
+          cheArr.push(element.id)
+        }
+        else if (element.open) {
+          expArr.push(element.id)
+        }
+        else if (element.checked) {
+          cheArr.push(element.id)
+        }
+      })
+      defaultExpanded.value = expArr
+      defaultChecked.value = cheArr
+      treeRef.value?.setCheckedNodes(defaultChecked.value)
       loading.value = false
     }
   })
@@ -48,7 +64,7 @@
   dialogFormVisible.value = true
   fetchRoleTree()
 }
-const treeRef = ref()
+
 defineExpose({ initDialog })
 const saveData = () => {
   ids.value = treeRef.value.getCheckedKeys()
@@ -62,6 +78,11 @@
 }
 const cancel = () => {
   dialogFormVisible.value = false
+  userId.value = ''
+  userName.value = ''
+  defaultExpanded.value = []
+  defaultChecked.value = []
+  treeRef.value?.setCheckedNodes([])
   emits('resetData')
 }
 </script>
@@ -69,14 +90,12 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="titleText" width="330px" append-to-body>
     <el-scrollbar>
-      <el-tree
-        ref="treeRef" v-loading="loading" :props="defaultProps" :data="roleTreeList"
+      <el-tree ref="treeRef" v-loading="loading" :props="defaultProps" :data="roleTreeList"
         :default-expanded-keys="defaultExpanded" :default-checked-keys="defaultChecked"
         :default-expand-all="defaultExpandAll" show-checkbox check-strictly node-key="id"
-        @check-change="handleCheckChange"
-      />
+        @check-change="handleCheckChange" />
     </el-scrollbar>
-    <div slot="footer" class="dialog-footer footer">
+    <div class="dialog-footer footer">
       <el-button type="primary" @click="saveData">
         保存
       </el-button>
diff --git a/src/views/system/user/select.tree.vue b/src/views/system/user/select.tree.vue
index 141d7ac..07eabd3 100644
--- a/src/views/system/user/select.tree.vue
+++ b/src/views/system/user/select.tree.vue
@@ -1,45 +1,31 @@
 <!-- 树状选择器 -->
-<template>
-  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
-    <el-select v-model="value" clearable filterable ref="treeSelect" :placeholder="placeholder || '请选择'"
-      :filter-method="selectFilter" @clear="clearSelected">
-      <el-option :value="currentNodeKey" :label="currentNodeLabel">
-        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
-          :current-node-key="currentNodeKey" default-expand-all @node-click="nodeClick" :expand-on-click-node="false"
-          :filter-method="treeFilter"></el-tree-v2>
-      </el-option>
-    </el-select>
-  </div>
-</template>
-
-
 <script lang="ts">
-import { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
-import { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
-import { defineComponent, nextTick, onMounted, PropType, reactive, ref, toRefs, watch } from 'vue'
+import type { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
+import type { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
+import type { PropType } from 'vue'
+import { defineComponent, nextTick, onMounted, reactive, ref, toRefs, watch } from 'vue'
 interface PropsIter {
   value: string
   label: string
   children: string
   disabled?: boolean
 }
-// const TreeProps: PropsIter = {
-//   value: 'id',
-//   label: 'name',
-//   children: 'children'
-// }
+const TreeProps: PropsIter = {
+  value: 'id',
+  label: 'name',
+  children: 'children',
+}
 interface TreeIter {
   id: string
   label: string
   children?: TreeIter[]
 }
 export default defineComponent({
-  name: 'tree select',
   props: {
     // 组件绑定的options
     options: {
       type: Array as PropType<TreeIter[]>,
-      required: true
+      required: true,
     },
     // 配置选项
     keyProps: Object as PropType<PropsIter>,
@@ -48,26 +34,19 @@
     // 组件样式宽
     width: {
       type: String,
-      default: '240px'
+      default: '240px',
     },
     // 空占位字符
     placeholder: String,
-    TreeProps: {
-      type: Object,
-      default: () => ({
-        value: 'id',
-        label: 'label',
-        children: 'children'
-      })
-    }
   },
+  emits: ['update:modelValue'],
   setup(props, { emit }) {
     // 解决 props道具变异
     const { modelValue } = toRefs(props)
-    const select: any = reactive({
+    const select: { value: string | number | undefined; currentNodeLabel: string | number | undefined; currentNodeKey: string | number | undefined } = reactive({
       value: modelValue.value,
       currentNodeKey: '',
-      currentNodeLabel: ''
+      currentNodeLabel: '',
     })
     const treeSelect = ref<HTMLElement | null>(null)
     const nodeClick = (data: TreeNodeData, node: TreeNode) => {
@@ -119,7 +98,6 @@
         setCurrent()
       }
     })
-    const { TreeProps } = toRefs(props)
     return {
       treeSelect,
       treeV2,
@@ -128,12 +106,24 @@
       nodeClick,
       selectFilter,
       treeFilter,
-      clearSelected
+      clearSelected,
     }
-  }
+  },
 })
 </script>
 
+<template>
+  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
+    <el-select ref="treeSelect" v-model="value" clearable filterable :placeholder="placeholder || '请选择'"
+      :filter-method="selectFilter" @clear="clearSelected">
+      <el-option :value="currentNodeKey" :label="currentNodeLabel">
+        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
+          :current-node-key="currentNodeKey" default-expand-all :expand-on-click-node="false"
+          :filter-method="treeFilter" @node-click="nodeClick" />
+      </el-option>
+    </el-select>
+  </div>
+</template>
 
 <style lang="scss" scoped>
 .tree_box {

diff --git a/src/components/SelectTree/index.vue b/src/components/SelectTree/index.vue
index 98c86df..7c087f8 100644
--- a/src/components/SelectTree/index.vue
+++ b/src/components/SelectTree/index.vue
@@ -4,24 +4,11 @@
       最好是 符合elementui类型的树形结构
        -->
 <!-- 树状选择器 -->
-<template>
-  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
-    <el-select v-model="value" clearable filterable ref="treeSelect" :placeholder="placeholder || '请选择'"
-      :filter-method="selectFilter" @clear="clearSelected">
-      <el-option :value="currentNodeKey" :label="currentNodeLabel">
-        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
-          :current-node-key="currentNodeKey" default-expand-all @node-click="nodeClick" :expand-on-click-node="false"
-          :filter-method="treeFilter"></el-tree-v2>
-      </el-option>
-    </el-select>
-  </div>
-</template>
-
-
 <script lang="ts">
-import { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
-import { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
-import { defineComponent, nextTick, onMounted, PropType, reactive, ref, toRefs, watch } from 'vue'
+import type { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
+import type { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
+import type { PropType } from 'vue'
+import { defineComponent, nextTick, onMounted, reactive, ref, toRefs, watch } from 'vue'
 interface PropsIter {
   value: string
   label: string
@@ -34,12 +21,11 @@
   children?: TreeIter[]
 }
 export default defineComponent({
-  name: 'tree select',
   props: {
     // 组件绑定的options
     options: {
       type: Array as PropType<TreeIter[]>,
-      required: true
+      required: true,
     },
     // 配置选项
     keyProps: Object as PropType<PropsIter>,
@@ -48,25 +34,22 @@
     // 组件样式宽
     width: {
       type: String,
-      default: '240px'
+      default: '240px',
     },
     // 空占位字符
     placeholder: String,
+    // eslint-disable-next-line vue/prop-name-casing
     TreeProps: {
       type: Object,
-      default: () => ({
-        value: 'id',
-        label: 'label',
-        children: 'children'
-      })
-    }
+      default: () => { return {} },
+    },
   },
   setup(props, { emit }) {
     const { modelValue } = toRefs(props)
-    const select: any = reactive({
+    const select: { value: string | number | undefined; currentNodeLabel: string | number | undefined; currentNodeKey: string | number | undefined } = reactive({
       value: modelValue.value,
       currentNodeKey: '',
-      currentNodeLabel: ''
+      currentNodeLabel: '',
     })
     const treeSelect = ref<HTMLElement | null>(null)
     const nodeClick = (data: TreeNodeData, node: TreeNode) => {
@@ -117,21 +100,34 @@
         setCurrent()
       }
     })
-    const { TreeProps } = toRefs(props)
+    const TreeProps = toRefs(props)
     return {
       treeSelect,
       treeV2,
+      // eslint-disable-next-line vue/no-dupe-keys
       TreeProps,
       ...toRefs(select),
       nodeClick,
       selectFilter,
       treeFilter,
-      clearSelected
+      clearSelected,
     }
-  }
+  },
 })
 </script>
 
+<template>
+  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
+    <el-select v-model="value" clearable filterable ref="treeSelect" :placeholder="placeholder || '请选择'"
+      :filter-method="selectFilter" @clear="clearSelected">
+      <el-option :value="currentNodeKey" :label="currentNodeLabel">
+        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
+          :current-node-key="currentNodeKey" default-expand-all @node-click="nodeClick" :expand-on-click-node="false"
+          :filter-method="treeFilter"></el-tree-v2>
+      </el-option>
+    </el-select>
+  </div>
+</template>
 
 <style lang="scss" scoped>
 .tree_box {
diff --git a/src/views/system/user/list.user.vue b/src/views/system/user/list.user.vue
index 3c8639a..85e66f6 100644
--- a/src/views/system/user/list.user.vue
+++ b/src/views/system/user/list.user.vue
@@ -1,13 +1,13 @@
 <script lang="ts" setup name="SystemDictListDict">
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQueryType, TreeStructure, userType, changePageType } from './user_interface'
-import { getDeptTreeList } from '@/api/system/dept'
-import { delUser, freezeUserApi, getUserList, unfreezeUser, resetPwdApi } from '@/api/system/user'
-import { toTreeList } from '@/utils/structure'
-import { Menu, Plus, Delete, EditPen, Key, MagicStick } from '@element-plus/icons-vue'
-import { RSAencrypt } from '@/utils/security'
-import RoleAssignment from './role.assignment.vue'
+import { Delete, EditPen, Key, MagicStick, Plus } from '@element-plus/icons-vue'
+import type { IlistQueryType, TreeStructure, changePageType, userType } from './user_interface'
 import AddUser from './user.add.vue'
+import RoleAssignment from './role.assignment.vue'
+import { getDeptTreeList } from '@/api/system/dept'
+import { delUser, freezeUserApi, getUserList, resetPwdApi, unfreezeUser } from '@/api/system/user'
+import { toTreeList } from '@/utils/structure'
+import { RSAencrypt } from '@/utils/security'
 // 逻辑代码
 interface Tree {
   name: string
@@ -93,10 +93,10 @@
   if (select.value) {
     const user: userType = list.value[select.value - 1]
     addUserRef.value.initDialog('update', user)
-  } else {
+  }
+  else {
     ElMessage.error('必须选中一项')
   }
-
 }
 // 重置密码
 const resetPwd = () => {
@@ -113,13 +113,14 @@
     ).then(async () => {
       const params = {
         id: String(user.id),
-        newPwd: await RSAencrypt(resetPwdFlag.value)
+        newPwd: await RSAencrypt(resetPwdFlag.value),
       }
       resetPwdApi(params).then(() => {
         ElMessage.success('操作成功')
       })
     }).catch(() => { })
-  } else {
+  }
+  else {
     ElMessage.error('必须选中一项')
   }
 }
@@ -172,13 +173,14 @@
     }
   }).catch(() => { })
 }
-const roleAssignmentRef = ref() //角色分配弹窗
+const roleAssignmentRef = ref() // 角色分配弹窗
 // 角色分配
 const assignmentRole = () => {
   if (select.value) {
     const user: userType = list.value[select.value - 1]
     roleAssignmentRef.value.initDialog(user)
-  } else {
+  }
+  else {
     ElMessage.error('必须选中一项')
   }
 }
@@ -228,8 +230,10 @@
                 <span>组织机构</span>
               </div>
             </template>
-            <el-tree v-loading="loadingTree" :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick" />
+            <el-tree
+              v-loading="loadingTree" :data="treeData" :props="defaultProps" default-expand-all
+              :expand-on-click-node="false" @node-click="handleNodeClick"
+            />
           </el-card>
         </div>
       </div>
@@ -241,12 +245,16 @@
             <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
           </search-item>
           <search-item>
-            <el-date-picker v-model="listQuery.beginTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-              placeholder="选择开始时间" />
+            <el-date-picker
+              v-model="listQuery.beginTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+              placeholder="选择开始时间"
+            />
           </search-item>
           <search-item>
-            <el-date-picker v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-              placeholder="选择结束时间" />
+            <el-date-picker
+              v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+              placeholder="选择结束时间"
+            />
           </search-item>
         </search-area>
         <!-- 操作 -->
@@ -263,8 +271,10 @@
           <el-button v-if="proxy.hasPerm('/sys/mgr/reset')" type="primary" :icon="Key" @click="resetPwd">
             重置密码
           </el-button>
-          <el-button v-if="proxy.hasPerm('/sys/mgr/roleAssign')" type="primary" :icon="MagicStick"
-            @click="assignmentRole">
+          <el-button
+            v-if="proxy.hasPerm('/sys/mgr/roleAssign')" type="primary" :icon="MagicStick"
+            @click="assignmentRole"
+          >
             角色分配
           </el-button>
         </div>
@@ -278,8 +288,10 @@
           </div>
         </div> -->
         <!-- 查询结果Table显示 -->
-        <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-          @change="changePage">
+        <normal-table
+          :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="loadingTable"
+          @change="changePage"
+        >
           <template #preColumns>
             <el-table-column label="选择" width="60" header-align="center">
               <template #default="scope">
diff --git a/src/views/system/user/role.assignment.vue b/src/views/system/user/role.assignment.vue
index 78fd3b0..52b9073 100644
--- a/src/views/system/user/role.assignment.vue
+++ b/src/views/system/user/role.assignment.vue
@@ -1,4 +1,4 @@
-<!-- 角色分配弹窗 -->ey
+<!-- 角色分配弹窗 -->
 <script lang="ts" setup name="roleAssigmentDialog">
 import { ElMessage } from 'element-plus'
 import type { userType } from './user_interface'
@@ -19,7 +19,7 @@
   label: 'name',
   children: 'children',
 })
-const userId = ref('') // 用户id
+const userId = ref('')// 用户id
 const userName = ref('') // 用户名称
 const ids = ref([]) // 选中项id
 const defaultExpanded = ref<string[]>([]) // 默认展开的项
@@ -28,14 +28,30 @@
 const handleCheckChange = () => {
 
 }
+const treeRef = ref()
 // 获取角色列表
 const fetchRoleTree = () => {
   getRoleTreeListByUser(userId.value).then((response) => {
     if (response.data) {
       roleTreeList.value = toTreeList(response.data)
-      const temp = getShowItem(response.data) // 获取展开项和选中项
-      defaultExpanded.value = temp.openedList
-      defaultChecked.value = temp.expandList
+      // 获取展开项和选中项
+      const expArr: string[] = []
+      const cheArr: string[] = []
+      response.data.forEach((element: any) => {
+        if (element.open && element.checked) {
+          expArr.push(element.id)
+          cheArr.push(element.id)
+        }
+        else if (element.open) {
+          expArr.push(element.id)
+        }
+        else if (element.checked) {
+          cheArr.push(element.id)
+        }
+      })
+      defaultExpanded.value = expArr
+      defaultChecked.value = cheArr
+      treeRef.value?.setCheckedNodes(defaultChecked.value)
       loading.value = false
     }
   })
@@ -48,7 +64,7 @@
   dialogFormVisible.value = true
   fetchRoleTree()
 }
-const treeRef = ref()
+
 defineExpose({ initDialog })
 const saveData = () => {
   ids.value = treeRef.value.getCheckedKeys()
@@ -62,6 +78,11 @@
 }
 const cancel = () => {
   dialogFormVisible.value = false
+  userId.value = ''
+  userName.value = ''
+  defaultExpanded.value = []
+  defaultChecked.value = []
+  treeRef.value?.setCheckedNodes([])
   emits('resetData')
 }
 </script>
@@ -69,14 +90,12 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="titleText" width="330px" append-to-body>
     <el-scrollbar>
-      <el-tree
-        ref="treeRef" v-loading="loading" :props="defaultProps" :data="roleTreeList"
+      <el-tree ref="treeRef" v-loading="loading" :props="defaultProps" :data="roleTreeList"
         :default-expanded-keys="defaultExpanded" :default-checked-keys="defaultChecked"
         :default-expand-all="defaultExpandAll" show-checkbox check-strictly node-key="id"
-        @check-change="handleCheckChange"
-      />
+        @check-change="handleCheckChange" />
     </el-scrollbar>
-    <div slot="footer" class="dialog-footer footer">
+    <div class="dialog-footer footer">
       <el-button type="primary" @click="saveData">
         保存
       </el-button>
diff --git a/src/views/system/user/select.tree.vue b/src/views/system/user/select.tree.vue
index 141d7ac..07eabd3 100644
--- a/src/views/system/user/select.tree.vue
+++ b/src/views/system/user/select.tree.vue
@@ -1,45 +1,31 @@
 <!-- 树状选择器 -->
-<template>
-  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
-    <el-select v-model="value" clearable filterable ref="treeSelect" :placeholder="placeholder || '请选择'"
-      :filter-method="selectFilter" @clear="clearSelected">
-      <el-option :value="currentNodeKey" :label="currentNodeLabel">
-        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
-          :current-node-key="currentNodeKey" default-expand-all @node-click="nodeClick" :expand-on-click-node="false"
-          :filter-method="treeFilter"></el-tree-v2>
-      </el-option>
-    </el-select>
-  </div>
-</template>
-
-
 <script lang="ts">
-import { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
-import { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
-import { defineComponent, nextTick, onMounted, PropType, reactive, ref, toRefs, watch } from 'vue'
+import type { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
+import type { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
+import type { PropType } from 'vue'
+import { defineComponent, nextTick, onMounted, reactive, ref, toRefs, watch } from 'vue'
 interface PropsIter {
   value: string
   label: string
   children: string
   disabled?: boolean
 }
-// const TreeProps: PropsIter = {
-//   value: 'id',
-//   label: 'name',
-//   children: 'children'
-// }
+const TreeProps: PropsIter = {
+  value: 'id',
+  label: 'name',
+  children: 'children',
+}
 interface TreeIter {
   id: string
   label: string
   children?: TreeIter[]
 }
 export default defineComponent({
-  name: 'tree select',
   props: {
     // 组件绑定的options
     options: {
       type: Array as PropType<TreeIter[]>,
-      required: true
+      required: true,
     },
     // 配置选项
     keyProps: Object as PropType<PropsIter>,
@@ -48,26 +34,19 @@
     // 组件样式宽
     width: {
       type: String,
-      default: '240px'
+      default: '240px',
     },
     // 空占位字符
     placeholder: String,
-    TreeProps: {
-      type: Object,
-      default: () => ({
-        value: 'id',
-        label: 'label',
-        children: 'children'
-      })
-    }
   },
+  emits: ['update:modelValue'],
   setup(props, { emit }) {
     // 解决 props道具变异
     const { modelValue } = toRefs(props)
-    const select: any = reactive({
+    const select: { value: string | number | undefined; currentNodeLabel: string | number | undefined; currentNodeKey: string | number | undefined } = reactive({
       value: modelValue.value,
       currentNodeKey: '',
-      currentNodeLabel: ''
+      currentNodeLabel: '',
     })
     const treeSelect = ref<HTMLElement | null>(null)
     const nodeClick = (data: TreeNodeData, node: TreeNode) => {
@@ -119,7 +98,6 @@
         setCurrent()
       }
     })
-    const { TreeProps } = toRefs(props)
     return {
       treeSelect,
       treeV2,
@@ -128,12 +106,24 @@
       nodeClick,
       selectFilter,
       treeFilter,
-      clearSelected
+      clearSelected,
     }
-  }
+  },
 })
 </script>
 
+<template>
+  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
+    <el-select ref="treeSelect" v-model="value" clearable filterable :placeholder="placeholder || '请选择'"
+      :filter-method="selectFilter" @clear="clearSelected">
+      <el-option :value="currentNodeKey" :label="currentNodeLabel">
+        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
+          :current-node-key="currentNodeKey" default-expand-all :expand-on-click-node="false"
+          :filter-method="treeFilter" @node-click="nodeClick" />
+      </el-option>
+    </el-select>
+  </div>
+</template>
 
 <style lang="scss" scoped>
 .tree_box {
diff --git a/src/views/system/user/user.add.vue b/src/views/system/user/user.add.vue
index 43547ea..2505000 100644
--- a/src/views/system/user/user.add.vue
+++ b/src/views/system/user/user.add.vue
@@ -1,23 +1,24 @@
 <!-- 添加修改用户弹窗 -->
 <script lang="ts" setup name="SystemUserAddDialog">
 import type { FormInstance } from 'element-plus'
-import { toTreeList } from '@/utils/structure'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import type { addInfo } from './user_interface'
+import comTreeSelect from './select.tree.vue'
+import { toTreeList } from '@/utils/structure'
 import { addUser, updateUser } from '@/api/system/user'
 import { getRoleTreeList } from '@/api/system/role'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { addInfo } from './user_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { RSAencrypt } from '@/utils/security'
-import comTreeSelect from './select.tree.vue'
+const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>()
 const dialogFormVisible = ref<boolean>(false)// 对话框是否显示
 const dialogStatus = ref<string>('')// 对话框类型：create,update
-let userForm = reactive<addInfo>({
+const userForm = reactive<addInfo>({
   id: '', // 编号
   account: '', // 账号
   name: '', // 姓名
-  email: '', // 邮箱，
+  email: '', // 邮箱，/
   phone: '', // 手机号，
   deptId: '', // 组织机构编号
   roleid: '', // 角色
@@ -32,10 +33,9 @@
 const roleProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const emits = defineEmits(['resetData'])
 const roleTreeList = ref([])// 角色树列表数据
 const deptTreeList = ref([])
-const sexList = ref([])// 性别选项
+const sexList = ref<{ id: string; value: string; name: string }[]>()// 性别选项
 const textMap = reactive<{ update: string; create: string }>({
   update: '编辑用户',
   create: '新增用户',
@@ -43,9 +43,10 @@
 const validatePass = (rule: any, value: any, callback: any) => {
   if (value === '') {
     callback(new Error('密码不能为空'))
-  } else {
+  }
+  else {
     if (userForm.rePassword !== '') {
-      ruleFormRef.value.validateField('rePassword')
+      ruleFormRef.value?.validateField('rePassword')
     }
     callback()
   }
@@ -53,9 +54,11 @@
 const validatePass2 = (rule: any, value: any, callback: any) => {
   if (value === '') {
     callback(new Error('重复密码不能为空'))
-  } else if (value !== userForm.password) {
+  }
+  else if (value !== userForm.password) {
     callback(new Error('两次输入密码不一致!'))
-  } else {
+  }
+  else {
     callback()
   }
 }
@@ -69,8 +72,100 @@
   email: [{ required: false, message: '请输入邮箱地址', trigger: 'blur' }, { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
   phone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 })// 前端校验规则
-let roleName = ref<string>()// 角色名，展示用
+const roleName = ref<string>()// 角色名，展示用
 const btnLoading = ref<boolean>(false)// 保存按钮的加载中状态
+
+// 加载角色树形下拉菜单
+const fetchRoleTree = () => {
+  getRoleTreeList().then((res) => {
+    if (res.data.list) { // 将列表转树结构
+      roleTreeList.value = toTreeList(res.data.list, '0', true)
+    }
+  })
+}
+// 加载组织机构树形下拉
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+// 重置表单
+const resetForm1 = () => {
+  userForm.account = ''
+  userForm.id = ''
+  userForm.name = ''
+  userForm.email = ''
+  userForm.phone = ''
+  userForm.deptId = ''
+  userForm.sex = ''
+  userForm.birthday = ''
+  userForm.roleid = ''
+  userForm.password = ''
+  userForm.rePassword = ''
+}
+// 新增数据
+const createData = () => {
+  ruleFormRef.value?.validate(async (valid) => {
+    const userForm1 = JSON.parse(JSON.stringify(userForm))
+    userForm1.password = await RSAencrypt(userForm1.password)
+    userForm1.rePassword = await RSAencrypt(userForm1.rePassword)
+    if (valid) {
+      btnLoading.value = true
+      addUser(userForm1).then((response) => {
+        ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
+          confirmButtonText: '是',
+          cancelButtonText: '否',
+          type: 'info',
+        }).then(() => {
+          btnLoading.value = false
+          resetForm1()
+          nextTick(() => {
+            ruleFormRef.value?.clearValidate()
+          })
+        }).catch(() => {
+          dialogFormVisible.value = false
+          emits('resetData')
+        })
+      }).catch(() => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+// 修改数据
+const updateData = () => {
+  ruleFormRef.value?.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      updateUser(userForm).then((response) => {
+        ElMessage.success('修改成功')
+        dialogFormVisible.value = false
+        emits('resetData')
+      }).catch(() => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'update') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'create') {
+    createData()
+  }
+}
+
+const cancel = () => {
+  dialogFormVisible.value = false
+  // resetForm1()
+  ruleFormRef.value?.resetFields()
+  emits('resetData')
+}
 // 初始化对话框
 const initDialog = (dialogStatusflag: string, row: addInfo = {
   id: '', // 编号
@@ -106,9 +201,10 @@
     roleName.value = row.roleName
     resetForm1()
     nextTick(() => {
-      ruleFormRef.value.clearValidate()
+      ruleFormRef.value?.clearValidate()
     })
-  } else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
+  }
+  else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
     userForm.account = row.account
     userForm.id = row.id
     userForm.name = row.name
@@ -119,114 +215,31 @@
     userForm.birthday = row.birthday
     userForm.roleid = row.roleid
     roleName.value = row.roleName
-    delete userForm['password']
-    delete userForm['rePassword']
+    delete userForm.password
+    delete userForm.rePassword
   }
 }
+const title = computed(() => {
+  const props = Object.keys(textMap)
+  const keyValues = props.map((el: string) => {
+    return [el, el]
+  })
+  const keys: object = Object.fromEntries(keyValues)
+  return textMap[dialogStatus as keyof typeof keys]
+})
 defineExpose({ initDialog })
-// 加载角色树形下拉菜单
-const fetchRoleTree = () => {
-  getRoleTreeList().then((res) => {
-    if (res.data.list) { // 将列表转树结构
-      roleTreeList.value = toTreeList(res.data.list, '0', true)
-    }
-  })
-}
-// 加载组织机构树形下拉
-const fetchDeptTree = () => {
-  getDeptTreeList().then((res) => {
-    if (res.data) { // 将列表转树结构
-      deptTreeList.value = toTreeList(res.data, '0', true)
-    }
-  })
-}
-// 重置表单
-const resetForm1 = () => {
-  userForm.account = ''
-  userForm.id = ''
-  userForm.name = ''
-  userForm.email = ''
-  userForm.phone = ''
-  userForm.deptId = ''
-  userForm.sex = ''
-  userForm.birthday = ''
-  userForm.roleid = ''
-  userForm.password = ''
-  userForm.rePassword = ''
-}
-// 保存数据
-const saveData = (formEl: FormInstance | undefined) => {
-  if (dialogStatus.value === 'update') {
-    updateData()
-  } else if (dialogStatus.value === 'create') {
-    createData()
-  }
-}
-// 新增数据
-const createData = () => {
-  ruleFormRef.value.validate(async (valid) => {
-    const userForm1 = JSON.parse(JSON.stringify(userForm))
-    userForm1.password = await RSAencrypt(userForm1.password)
-    userForm1.rePassword = await RSAencrypt(userForm1.rePassword)
-    if (valid) {
-      btnLoading.value = true
-      addUser(userForm1).then((response) => {
-        if (response.code === 200) {
-          ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
-            confirmButtonText: '是',
-            cancelButtonText: '否',
-            type: 'info'
-          }).then(() => {
-            btnLoading.value = false
-            resetForm1()
-            nextTick(() => {
-              ruleFormRef.value.clearValidate()
-            })
-          }).catch(() => {
-            dialogFormVisible.value = false
-            emits('resetData')
-          })
-        }
-      }).catch(() => { // 异常情况，loading置为false
-        btnLoading.value = false
-      })
-    }
-  })
-}
-// 修改数据
-const updateData = () => {
-  ruleFormRef.value.validate((valid) => {
-    if (valid) {
-      btnLoading.value = true
-      updateUser(userForm).then((response) => {
-        if (response.code === 200) {
-          ElMessage.success('修改成功')
-          dialogFormVisible.value = false
-          emits('resetData')
-        }
-      }).catch(() => { // 异常情况，loading置为false
-        btnLoading.value = false
-      })
-    }
-  })
-}
-const cancel = (formEl: FormInstance | undefined) => {
-  dialogFormVisible.value = false
-  // resetForm1()
-  ruleFormRef.value.resetFields()
-  emits('resetData')
-}
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" width="700" :title="textMap[dialogStatus]" append-to-body
-    v-if="dialogFormVisible">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" width="700" :title="title" append-to-body>
     <el-form ref="ruleFormRef" :rules="rules" :model="userForm" label-position="right" label-width="80px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="账号" prop="account">
-            <el-input v-model.trim="userForm.account" :disabled="dialogStatus === 'update'" type="text"
-              placeholder="必填" />
+            <el-input
+              v-model.trim="userForm.account" :disabled="dialogStatus === 'update'" type="text"
+              placeholder="必填"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -245,8 +258,10 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="出生日期" prop="birthday">
-            <el-date-picker v-model="userForm.birthday" type="date" format="YYYY-MM-DD" placeholder="选择日期"
-              style="width: 100%;" />
+            <el-date-picker
+              v-model="userForm.birthday" type="date" format="YYYY-MM-DD" placeholder="选择日期"
+              style="width: 100%;"
+            />
           </el-form-item>
         </el-col>
       </el-row>
@@ -265,8 +280,10 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item v-if="dialogStatus === 'create'" label="角色" prop="roleid">
-            <com-tree-select :options="roleTreeList" v-model="userForm.roleid" placeholder="选择角色"
-              :TreeProps="roleProps" />
+            <com-tree-select
+              v-model="userForm.roleid" :options="roleTreeList" placeholder="选择角色"
+              :tree-props="roleProps"
+            />
           </el-form-item>
           <el-form-item v-else label="角色">
             <el-input v-model="roleName" :disabled="dialogStatus === 'update'" type="text" placeholder="无" />
@@ -276,8 +293,10 @@
           <el-form-item label="组织机构" prop="deptId">
             <!-- <dept-select v-model="userForm.deptId" :dept-show="true" :default-expanded-keys="[userForm.roleid]"
               placeholder="请选择组织机构" /> -->
-              <com-tree-select :options="deptTreeList" v-model="userForm.deptId" placeholder="选择组织机构"
-              :TreeProps="deptProps" />
+            <com-tree-select
+              v-model="userForm.deptId" :options="deptTreeList" placeholder="选择组织机构"
+              :tree-props="deptProps"
+            />
           </el-form-item>
         </el-col>
       </el-row>
@@ -294,11 +313,11 @@
         </el-col>
       </el-row>
     </el-form>
-    <div slot="footer" class="dialog-footer footer">
-      <el-button :loading="btnLoading" type="primary" @click="saveData(ruleFormRef)">
+    <div class="dialog-footer footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">
         保存
       </el-button>
-      <el-button @click="cancel(ruleFormRef)">
+      <el-button @click="cancel">
         取消
       </el-button>
     </div>