1. 统一化代码

2. 增加 DocAlert 关联文档
This commit is contained in:
YunaiV
2023-04-05 20:13:35 +08:00
parent bb88e3d77c
commit 4404554cfc
111 changed files with 640 additions and 567 deletions

View File

@@ -11,7 +11,7 @@
<el-tree-select
v-model="formData.parentId"
:data="deptTree"
:props="{ value: 'id', label: 'name', children: 'children' }"
:props="defaultProps"
value-key="deptId"
placeholder="请选择上级部门"
check-strictly
@@ -25,12 +25,7 @@
<el-input-number v-model="formData.sort" controls-position="right" :min="0" />
</el-form-item>
<el-form-item label="负责人" prop="leaderUserId">
<el-select
v-model="formData.leaderUserId"
placeholder="请输入负责人"
clearable
style="width: 100%"
>
<el-select v-model="formData.leaderUserId" placeholder="请输入负责人" clearable>
<el-option
v-for="item in userList"
:key="item.id"
@@ -64,7 +59,7 @@
</template>
<script setup lang="ts">
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import { handleTree } from '@/utils/tree'
import { handleTree, defaultProps } from '@/utils/tree'
import * as DeptApi from '@/api/system/dept'
import * as UserApi from '@/api/system/user'
import { CommonStatusEnum } from '@/utils/constants'
@@ -93,7 +88,8 @@ const formRules = reactive({
email: [{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
phone: [
{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: '请输入正确的手机号码', trigger: 'blur' }
]
],
status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
})
const formRef = ref() // 表单 Ref
const deptTree = ref() // 树形结构
@@ -109,7 +105,7 @@ const open = async (type: string, id?: number) => {
if (id) {
formLoading.value = true
try {
formData.value = await DeptApi.getDeptApi(id)
formData.value = await DeptApi.getDept(id)
} finally {
formLoading.value = false
}
@@ -133,10 +129,10 @@ const submitForm = async () => {
try {
const data = formData.value as unknown as DeptApi.DeptVO
if (formType.value === 'create') {
await DeptApi.createDeptApi(data)
await DeptApi.createDept(data)
message.success(t('common.createSuccess'))
} else {
await DeptApi.updateDeptApi(data)
await DeptApi.updateDept(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false

View File

@@ -51,7 +51,13 @@
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" row-key="id" default-expand-all v-if="refreshTable">
<el-table
v-loading="loading"
:data="list"
row-key="id"
:default-expand-all="isExpandAll"
v-if="refreshTable"
>
<el-table-column prop="name" label="部门名称" width="260" />
<el-table-column prop="leader" label="负责人" width="120">
<template #default="scope">
@@ -125,7 +131,7 @@ const userList = ref<UserApi.UserVO[]>([]) // 用户列表
const getList = async () => {
loading.value = true
try {
const data = await DeptApi.getDeptPageApi(queryParams)
const data = await DeptApi.getDeptPage(queryParams)
list.value = handleTree(data)
} finally {
loading.value = false
@@ -136,7 +142,6 @@ const getList = async () => {
const toggleExpandAll = () => {
refreshTable.value = false
isExpandAll.value = !isExpandAll.value
console.log(isExpandAll.value)
nextTick(() => {
refreshTable.value = true
})
@@ -166,7 +171,7 @@ const handleDelete = async (id: number) => {
// 删除的二次确认
await message.delConfirm()
// 发起删除
await DeptApi.deleteDeptApi(id)
await DeptApi.deleteDept(id)
message.success(t('common.delSuccess'))
// 刷新列表
await getList()