feat: 优化重构用户管理代码

src/types/auto-components.d.ts

@@ -67,11 +67,7 @@ declare module '@vue/runtime-core' {
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
     ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTabs: typeof import('element-plus/es')['ElTabs']
-    ElTag: typeof import('element-plus/es')['ElTag']
-    ElTimeline: typeof import('element-plus/es')['ElTimeline']
-    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
-    ElTransfer: typeof import('element-plus/es')['ElTransfer']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
     ElUpload: typeof import('element-plus/es')['ElUpload']
     ElUpload: typeof import('element-plus/es')['ElUpload']

src/views/system/user/RoleForm.vue → src/views/system/user/components/UserAssignRoleForm.vue

 <template>
 <template>
-  <el-dialog title="分配角色" :modelValue="show" width="500px" append-to-body @close="closeDialog">
+  <Dialog
+    title="分配角色"
+    :modelValue="showDialog"
+    width="500px"
+    append-to-body
+    @close="closeDialog"
+  >
     <el-form :model="formData" label-width="80px" ref="formRef">
     <el-form :model="formData" label-width="80px" ref="formRef">
       <el-form-item label="用户名称">
       <el-form-item label="用户名称">
         <el-input v-model="formData.username" :disabled="true" />
         <el-input v-model="formData.username" :disabled="true" />
@@ -24,25 +30,19 @@
         <el-button @click="cancel">取 消</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
       </div>
     </template>
     </template>
-  </el-dialog>
+  </Dialog>
 </template>
 </template>
 
 
 <script setup lang="ts">
 <script setup lang="ts">
-// TODO el-dialog 用 Dialog 组件
-import { assignUserRoleApi, PermissionAssignUserRoleReqVO } from '@/api/system/permission'
+import {
+  assignUserRoleApi,
+  listUserRolesApi,
+  PermissionAssignUserRoleReqVO
+} from '@/api/system/permission'
+import { UserVO } from '@/api/system/user'
+import * as RoleApi from '@/api/system/role'
 
 
-interface Props {
-  show: boolean
-  roleOptions: any[]
-  formInitValue?: Recordable & Partial<typeof initParams>
-}
-
-const props = withDefaults(defineProps<Props>(), {
-  show: false,
-  roleOptions: () => [],
-  formInitValue: () => ({})
-})
-const emits = defineEmits(['update:show', 'success'])
+const emits = defineEmits(['success'])
 
 
 const { t } = useI18n() // 国际化
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 const message = useMessage() // 消息弹窗
@@ -55,13 +55,7 @@ const initParams = {
   roleIds: [] as number[]
   roleIds: [] as number[]
 }
 }
 const formData = ref<Recordable>({ ...initParams })
 const formData = ref<Recordable>({ ...initParams })
-watch(
-  () => props.formInitValue,
-  (val) => {
-    formData.value = { ...val }
-  },
-  { deep: true }
-)
+
 /* 弹框按钮操作 */
 /* 弹框按钮操作 */
 // 点击取消
 // 点击取消
 const cancel = () => {
 const cancel = () => {
@@ -69,7 +63,7 @@ const cancel = () => {
 }
 }
 // 关闭弹窗
 // 关闭弹窗
 const closeDialog = () => {
 const closeDialog = () => {
-  emits('update:show', false)
+  showDialog.value = false
 }
 }
 // 提交
 // 提交
 const submit = async () => {
 const submit = async () => {
@@ -86,4 +80,29 @@ const submit = async () => {
     console.error(error)
     console.error(error)
   }
   }
 }
 }
+
+const roleOptions = ref()
+const userRole = reactive(initParams)
+const showDialog = ref(false)
+const formRef = ref()
+const openForm = async (row: UserVO) => {
+  formRef.value?.resetFields()
+  userRole.id = row.id
+  userRole.username = row.username
+  userRole.nickname = row.nickname
+
+  // 获得角色列表
+  const roleOpt = await RoleApi.getSimpleRoleList()
+  roleOptions.value = [...roleOpt]
+
+  // 获得角色拥有的菜单集合
+  const roles = await listUserRolesApi(row.id)
+  userRole.roleIds = roles
+  formData.value = { ...userRole }
+
+  showDialog.value = true
+}
+defineExpose({
+  openForm
+})
 </script>
 </script>

src/views/system/user/components/UserDeptTree.vue

+<template>
+  <div class="head-container">
+    <el-input v-model="deptName" placeholder="请输入部门名称" clearable style="margin-bottom: 20px">
+      <template #prefix>
+        <Icon icon="ep:search" />
+      </template>
+    </el-input>
+  </div>
+  <div class="head-container">
+    <el-tree
+      :data="deptOptions"
+      :props="defaultProps"
+      :expand-on-click-node="false"
+      :filter-node-method="filterNode"
+      ref="treeRef"
+      node-key="id"
+      default-expand-all
+      highlight-current
+      @node-click="handleDeptNodeClick"
+    />
+  </div>
+</template>
+
+<script setup lang="ts" name="UserDeptTree">
+import { ElTree } from 'element-plus'
+import * as DeptApi from '@/api/system/dept'
+import { defaultProps, handleTree } from '@/utils/tree'
+
+const emits = defineEmits(['node-click'])
+const deptName = ref('')
+const deptOptions = ref<Tree[]>([]) // 树形结构
+const treeRef = ref<InstanceType<typeof ElTree>>()
+const getTree = async () => {
+  const res = await DeptApi.getSimpleDeptList()
+  deptOptions.value = []
+  deptOptions.value.push(...handleTree(res))
+}
+
+const filterNode = (value: string, data: Tree) => {
+  if (!value) return true
+  return data.name.includes(value)
+}
+
+const handleDeptNodeClick = async (row: { [key: string]: any }) => {
+  emits('node-click', row)
+}
+
+onMounted(async () => {
+  await getTree()
+})
+</script>

src/views/system/user/AddForm.vue → src/views/system/user/components/UserForm.vue

 <template>
 <template>
   <!-- 添加或修改参数配置对话框 -->
   <!-- 添加或修改参数配置对话框 -->
-  <el-dialog
-    :title="title"
-    :modelValue="modelValue"
-    width="600px"
-    append-to-body
-    @close="closeDialog"
-  >
+  <Dialog :title="title" :modelValue="showDialog" width="600px" append-to-body @close="closeDialog">
     <el-form ref="formRef" :model="formData" :rules="rules" label-width="80px">
     <el-form ref="formRef" :model="formData" :rules="rules" label-width="80px">
       <el-row>
       <el-row>
         <el-col :span="12">
         <el-col :span="12">
@@ -61,10 +55,10 @@
           <el-form-item label="用户性别">
           <el-form-item label="用户性别">
             <el-select v-model="formData.sex" placeholder="请选择">
             <el-select v-model="formData.sex" placeholder="请选择">
               <el-option
               <el-option
-                v-for="dict in sexDictDatas"
-                :key="parseInt(dict.value)"
+                v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
+                :key="dict.value as number"
                 :label="dict.label"
                 :label="dict.label"
-                :value="parseInt(dict.value)"
+                :value="dict.value"
               />
               />
             </el-select>
             </el-select>
           </el-form-item>
           </el-form-item>
@@ -76,7 +70,7 @@
                 v-for="item in postOptions"
                 v-for="item in postOptions"
                 :key="item.id"
                 :key="item.id"
                 :label="item.name"
                 :label="item.name"
-                :value="item.id"
+                :value="item.id as number"
               />
               />
             </el-select>
             </el-select>
           </el-form-item>
           </el-form-item>
@@ -96,41 +90,45 @@
         <el-button @click="cancel">取 消</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
       </div>
     </template>
     </template>
-  </el-dialog>
+  </Dialog>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
 import { PostVO } from '@/api/system/post'
 import { PostVO } from '@/api/system/post'
-import { createUserApi, updateUserApi } from '@/api/system/user'
-import { DICT_TYPE, getDictOptions } from '@/utils/dict'
-import { defaultProps } from '@/utils/tree'
+import * as PostApi from '@/api/system/post'
+import { createUserApi, getUserApi, updateUserApi } from '@/api/system/user'
+import * as DeptApi from '@/api/system/dept'
+
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { defaultProps, handleTree } from '@/utils/tree'
 import { ElForm, FormItemRule } from 'element-plus'
 import { ElForm, FormItemRule } from 'element-plus'
 import { Arrayable } from 'element-plus/es/utils'
 import { Arrayable } from 'element-plus/es/utils'
+import { UserVO } from '@/api/login/types'
 
 
 type Form = InstanceType<typeof ElForm>
 type Form = InstanceType<typeof ElForm>
-interface Props {
-  deptOptions?: Tree[]
-  postOptions?: PostVO[] //岗位列表
-  modelValue: boolean
-  formInitValue?: Recordable & Partial<typeof initParams>
-}
 
 
-const props = withDefaults(defineProps<Props>(), {
-  deptOptions: () => [],
-  postOptions: () => [],
-  modelValue: false,
-  formInitValue: () => ({})
-})
-const emits = defineEmits(['update:modelValue', 'success'])
+const emits = defineEmits(['success'])
 
 
 const { t } = useI18n() // 国际化
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 const message = useMessage() // 消息弹窗
+
+const showDialog = ref(false)
 // 弹出层标题
 // 弹出层标题
 const title = computed(() => {
 const title = computed(() => {
   return formData.value?.id ? '修改用户' : '添加用户'
   return formData.value?.id ? '修改用户' : '添加用户'
 })
 })
 
 
-// 性别字典
-const sexDictDatas = getDictOptions(DICT_TYPE.SYSTEM_USER_SEX)
+const deptOptions = ref<Tree[]>([]) // 树形结构
+const getTree = async () => {
+  const res = await DeptApi.getSimpleDeptList()
+  deptOptions.value = []
+  deptOptions.value.push(...handleTree(res))
+}
+// 获取岗位列表
+const postOptions = ref<PostVO[]>([]) //岗位列表
+const getPostOptions = async () => {
+  const res = (await PostApi.getSimplePostList()) as PostVO[]
+  postOptions.value.push(...res)
+}
 
 
 // 表单初始化参数
 // 表单初始化参数
 const initParams = {
 const initParams = {
@@ -156,7 +154,7 @@ const rules = {
   email: [
   email: [
     {
     {
       type: 'email',
       type: 'email',
-      message: "'请输入正确的邮箱地址",
+      message: '请输入正确的邮箱地址',
       trigger: ['blur', 'change']
       trigger: ['blur', 'change']
     }
     }
   ],
   ],
@@ -170,13 +168,6 @@ const rules = {
 } as Partial<Record<string, Arrayable<FormItemRule>>>
 } as Partial<Record<string, Arrayable<FormItemRule>>>
 const formRef = ref<Form | null>()
 const formRef = ref<Form | null>()
 const formData = ref<Recordable>({ ...initParams })
 const formData = ref<Recordable>({ ...initParams })
-watch(
-  () => props.formInitValue,
-  (val) => {
-    formData.value = { ...val }
-  },
-  { deep: true }
-)
 
 
 const resetForm = () => {
 const resetForm = () => {
   let form = formRef?.value
   let form = formRef?.value
@@ -185,7 +176,7 @@ const resetForm = () => {
   form && (form as Form).resetFields()
   form && (form as Form).resetFields()
 }
 }
 const closeDialog = () => {
 const closeDialog = () => {
-  emits('update:modelValue', false)
+  showDialog.value = false
 }
 }
 // 操作成功
 // 操作成功
 const operateOk = () => {
 const operateOk = () => {
@@ -213,11 +204,34 @@ const submitForm = () => {
     }
     }
   })
   })
 }
 }
+/* 取消 */
 const cancel = () => {
 const cancel = () => {
   closeDialog()
   closeDialog()
 }
 }
 
 
+/* 打开弹框 */
+const openForm = (row: undefined | UserVO) => {
+  resetForm()
+  getTree() // 部门树
+  if (row && row.id) {
+    const id = row.id
+    getUserApi(id).then((response) => {
+      formData.value = response
+    })
+  } else {
+    formData.value = { ...initParams }
+  }
+
+  showDialog.value = true
+}
+
+// ========== 初始化 ==========
+onMounted(async () => {
+  await getPostOptions()
+})
+
 defineExpose({
 defineExpose({
-  resetForm
+  resetForm,
+  openForm
 })
 })
 </script>
 </script>

src/views/system/user/ImportForm.vue → src/views/system/user/components/UserImportForm.vue

 <template>
 <template>
-  <el-dialog
+  <Dialog
     :title="upload.title"
     :title="upload.title"
-    :modelValue="modelValue"
+    :modelValue="showDialog"
     width="400px"
     width="400px"
     append-to-body
     append-to-body
     @close="closeDialog"
     @close="closeDialog"
@@ -45,7 +45,7 @@
         <el-button @click="cancel">取 消</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
       </div>
     </template>
     </template>
-  </el-dialog>
+  </Dialog>
 </template>
 </template>
 
 
 <script lang="ts" setup>
 <script lang="ts" setup>
@@ -53,19 +53,11 @@ import { importUserTemplateApi } from '@/api/system/user'
 import { getAccessToken, getTenantId } from '@/utils/auth'
 import { getAccessToken, getTenantId } from '@/utils/auth'
 import download from '@/utils/download'
 import download from '@/utils/download'
 
 
-interface Props {
-  modelValue: boolean
-}
-
-// const props =
-withDefaults(defineProps<Props>(), {
-  modelValue: false
-})
-
-const emits = defineEmits(['update:modelValue', 'success'])
+const emits = defineEmits(['success'])
 
 
 const message = useMessage() // 消息弹窗
 const message = useMessage() // 消息弹窗
 
 
+const showDialog = ref(false)
 const uploadRef = ref()
 const uploadRef = ref()
 
 
 // 用户导入参数
 // 用户导入参数
@@ -123,7 +115,8 @@ const handleExceed = (): void => {
   message.error('最多只能上传一个文件！')
   message.error('最多只能上传一个文件！')
 }
 }
 // 上传错误提示
 // 上传错误提示
-const excelUploadError = (): void => {
+const excelUploadError = (e): void => {
+  console.log(e)
   message.error('导入数据失败，请您重新上传！')
   message.error('导入数据失败，请您重新上传！')
 }
 }
 
 
@@ -144,10 +137,18 @@ const cancel = () => {
 }
 }
 // 关闭弹窗
 // 关闭弹窗
 const closeDialog = () => {
 const closeDialog = () => {
-  emits('update:modelValue', false)
+  showDialog.value = false
 }
 }
 // 提交上传文件
 // 提交上传文件
 const submitFileForm = () => {
 const submitFileForm = () => {
   uploadRef.value?.submit()
   uploadRef.value?.submit()
 }
 }
+
+const openForm = () => {
+  uploadRef.value?.clearFiles()
+  showDialog.value = true
+}
+defineExpose({
+  openForm
+})
 </script>
 </script>

src/views/system/user/utils.ts

-export const parseTime = (time) => {
-  if (!time) {
-    return null
-  }
-  const format = '{y}-{m}-{d} {h}:{i}:{s}'
-  let date
-  if (typeof time === 'object') {
-    date = time
-  } else {
-    if (typeof time === 'string' && /^[0-9]+$/.test(time)) {
-      time = parseInt(time)
-    } else if (typeof time === 'string') {
-      time = time
-        .replace(new RegExp(/-/gm), '/')
-        .replace('T', ' ')
-        .replace(new RegExp(/\.[\d]{3}/gm), '')
-    }
-    if (typeof time === 'number' && time.toString().length === 10) {
-      time = time * 1000
-    }
-    date = new Date(time)
-  }
-  const formatObj = {
-    y: date.getFullYear(),
-    m: date.getMonth() + 1,
-    d: date.getDate(),
-    h: date.getHours(),
-    i: date.getMinutes(),
-    s: date.getSeconds(),
-    a: date.getDay()
-  }
-  const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
-    let value = formatObj[key]
-    // Note: getDay() returns 0 on Sunday
-    if (key === 'a') {
-      return ['日', '一', '二', '三', '四', '五', '六'][value]
-    }
-    if (result.length > 0 && value < 10) {
-      value = '0' + value
-    }
-    return value || 0
-  })
-  return time_str
-}