Skip to content

Commit 0a69041

Browse files
committed
REVIEW 用户管理(修改用户)
1 parent 7d84f86 commit 0a69041

File tree

3 files changed

+93
-116
lines changed

3 files changed

+93
-116
lines changed

src/api/system/user/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ export const getUserPage = (params: PageParam) => {
2323
}
2424

2525
// 查询用户详情
26-
export const getUserApi = (id: number) => {
26+
export const getUser = (id: number) => {
2727
return request.get({ url: '/system/user/get?id=' + id })
2828
}
2929

3030
// 新增用户
31-
export const createUserApi = (data: UserVO | Recordable) => {
31+
export const createUser = (data: UserVO) => {
3232
return request.post({ url: '/system/user/create', data })
3333
}
3434

3535
// 修改用户
36-
export const updateUserApi = (data: UserVO | Recordable) => {
36+
export const updateUser = (data: UserVO) => {
3737
return request.put({ url: '/system/user/update', data })
3838
}
3939

Lines changed: 89 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
<template>
2-
<!-- 添加或修改参数配置对话框 -->
3-
<Dialog :title="title" :modelValue="showDialog" width="600px" append-to-body @close="closeDialog">
4-
<el-form ref="formRef" :model="formData" :rules="rules" label-width="80px">
2+
<Dialog :title="modelTitle" v-model="modelVisible">
3+
<el-form
4+
ref="formRef"
5+
:model="formData"
6+
:rules="formRules"
7+
label-width="80px"
8+
v-loading="formLoading"
9+
>
510
<el-row>
611
<el-col :span="12">
712
<el-form-item label="用户昵称" prop="nickname">
@@ -13,7 +18,7 @@
1318
<el-tree-select
1419
node-key="id"
1520
v-model="formData.deptId"
16-
:data="deptOptions"
21+
:data="deptList"
1722
:props="defaultProps"
1823
check-strictly
1924
placeholder="请选择归属部门"
@@ -67,7 +72,7 @@
6772
<el-form-item label="岗位">
6873
<el-select v-model="formData.postIds" multiple placeholder="请选择">
6974
<el-option
70-
v-for="item in postOptions"
75+
v-for="item in postList"
7176
:key="item.id"
7277
:label="item.name"
7378
:value="item.id"
@@ -85,68 +90,40 @@
8590
</el-row>
8691
</el-form>
8792
<template #footer>
88-
<div class="dialog-footer">
89-
<el-button type="primary" @click="submitForm">确 定</el-button>
90-
<el-button @click="cancel">取 消</el-button>
91-
</div>
93+
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
94+
<el-button @click="modelVisible = false">取 消</el-button>
9295
</template>
9396
</Dialog>
9497
</template>
9598
<script lang="ts" setup>
96-
import { PostVO } from '@/api/system/post'
97-
import * as PostApi from '@/api/system/post'
98-
import { createUserApi, getUserApi, updateUserApi } from '@/api/system/user'
99-
import * as DeptApi from '@/api/system/dept'
100-
10199
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
100+
import { CommonStatusEnum } from '@/utils/constants'
102101
import { defaultProps, handleTree } from '@/utils/tree'
103-
import { ElForm, FormItemRule } from 'element-plus'
104-
import { Arrayable } from 'element-plus/es/utils'
105-
106-
type Form = InstanceType<typeof ElForm>
107-
108-
const emits = defineEmits(['success'])
109-
102+
import * as PostApi from '@/api/system/post'
103+
import * as DeptApi from '@/api/system/dept'
104+
import * as UserApi from '@/api/system/user'
110105
const { t } = useI18n() // 国际化
111106
const message = useMessage() // 消息弹窗
112107
113-
const showDialog = ref(false)
114-
// 弹出层标题
115-
const title = computed(() => {
116-
return formData.value?.id ? '修改用户' : '添加用户'
117-
})
118-
119-
const deptOptions = ref<Tree[]>([]) // 树形结构
120-
const getTree = async () => {
121-
const res = await DeptApi.getSimpleDeptList()
122-
deptOptions.value = []
123-
deptOptions.value.push(...handleTree(res))
124-
}
125-
// 获取岗位列表
126-
const postOptions = ref<PostVO[]>([]) //岗位列表
127-
const getPostOptions = async () => {
128-
const res = (await PostApi.getSimplePostList()) as PostVO[]
129-
postOptions.value.push(...res)
130-
}
131-
132-
// 表单初始化参数
133-
const initParams = {
108+
const modelVisible = ref(false) // 弹窗的是否展示
109+
const modelTitle = ref('') // 弹窗的标题
110+
const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
111+
const formType = ref('') // 表单的类型:create - 新增;update - 修改
112+
const formData = ref({
134113
nickname: '',
135114
deptId: '',
136115
mobile: '',
137116
email: '',
138117
id: undefined,
139118
username: '',
140119
password: '',
141-
sex: 1,
120+
sex: undefined,
142121
postIds: [],
143122
remark: '',
144-
status: '0',
123+
status: CommonStatusEnum.ENABLE,
145124
roleIds: []
146-
}
147-
148-
// 校验规则
149-
const rules = {
125+
})
126+
const formRules = reactive({
150127
username: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
151128
nickname: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
152129
password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }],
@@ -164,74 +141,75 @@ const rules = {
164141
trigger: 'blur'
165142
}
166143
]
167-
} as Partial<Record<string, Arrayable<FormItemRule>>>
168-
const formRef = ref<Form | null>()
169-
const formData = ref<Recordable>({ ...initParams })
144+
})
145+
const formRef = ref() // 表单 Ref
146+
const deptList = ref<Tree[]>([]) // 树形结构
147+
const postList = ref([]) // 岗位列表
170148
171-
const resetForm = () => {
172-
let form = formRef?.value
173-
if (!form) return
174-
formData.value = { ...initParams }
175-
form && (form as Form).resetFields()
176-
}
177-
const closeDialog = () => {
178-
showDialog.value = false
179-
}
180-
// 操作成功
181-
const operateOk = () => {
182-
emits('success', true)
183-
closeDialog()
184-
}
185-
const submitForm = () => {
186-
let form = formRef.value as Form
187-
form.validate(async (valid) => {
188-
let data = formData.value
189-
if (valid) {
190-
try {
191-
if (data?.id !== undefined) {
192-
await updateUserApi(data)
193-
message.success(t('common.updateSuccess'))
194-
operateOk()
195-
} else {
196-
await createUserApi(data)
197-
message.success(t('common.createSuccess'))
198-
operateOk()
199-
}
200-
} catch (err) {
201-
console.error(err)
202-
}
149+
/** 打开弹窗 */
150+
const open = async (type: string, id?: number) => {
151+
modelVisible.value = true
152+
modelTitle.value = t('action.' + type)
153+
formType.value = type
154+
resetForm()
155+
// 修改时,设置数据
156+
if (id) {
157+
formLoading.value = true
158+
try {
159+
formData.value = await UserApi.getUser(id)
160+
} finally {
161+
formLoading.value = false
203162
}
204-
})
205-
}
206-
/* 取消 */
207-
const cancel = () => {
208-
closeDialog()
163+
}
164+
// 加载部门树
165+
deptList.value = handleTree(await DeptApi.getSimpleDeptList())
166+
// 加载岗位列表
167+
postList.value = await PostApi.getSimplePostList()
209168
}
169+
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
210170
211-
/* 打开弹框 */
212-
const open = (type: string, id?: number) => {
213-
console.log(type, id)
214-
resetForm()
215-
getTree() // 部门树
216-
if (row && row.id) {
217-
const id = row.id
218-
getUserApi(id).then((response) => {
219-
formData.value = response
220-
})
221-
} else {
222-
formData.value = { ...initParams }
171+
/** 提交表单 */
172+
const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调
173+
const submitForm = async () => {
174+
// 校验表单
175+
if (!formRef) return
176+
const valid = await formRef.value.validate()
177+
if (!valid) return
178+
// 提交请求
179+
formLoading.value = true
180+
try {
181+
const data = formData.value as unknown as UserApi.UserVO
182+
if (formType.value === 'create') {
183+
await UserApi.createUser(data)
184+
message.success(t('common.createSuccess'))
185+
} else {
186+
await UserApi.updateUser(data)
187+
message.success(t('common.updateSuccess'))
188+
}
189+
modelVisible.value = false
190+
// 发送操作成功的事件
191+
emit('success')
192+
} finally {
193+
formLoading.value = false
223194
}
224-
225-
showDialog.value = true
226195
}
227196
228-
// ========== 初始化 ==========
229-
onMounted(async () => {
230-
await getPostOptions()
231-
})
232-
233-
defineExpose({
234-
resetForm,
235-
open
236-
})
197+
/** 重置表单 */
198+
const resetForm = () => {
199+
formData.value = {
200+
nickname: '',
201+
deptId: '',
202+
mobile: '',
203+
email: '',
204+
id: undefined,
205+
username: '',
206+
password: '',
207+
sex: undefined,
208+
postIds: [],
209+
remark: '',
210+
status: CommonStatusEnum.ENABLE,
211+
roleIds: []
212+
}
213+
formRef.value?.resetFields()
214+
}
237215
</script>

src/views/system/user/index.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,14 +187,13 @@
187187
<!-- 分配角色 -->
188188
<UserAssignRoleForm ref="assignRoleFormRef" @success="getList" />
189189
</template>
190-
191190
<script setup lang="ts" name="User">
192191
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
193192
import { dateFormatter } from '@/utils/formatTime'
194193
import download from '@/utils/download'
195194
import { CommonStatusEnum } from '@/utils/constants'
196195
import * as UserApi from '@/api/system/user'
197-
import UserForm from './components/UserForm.vue'
196+
import UserForm from './UserForm.vue'
198197
import UserImportForm from './components/UserImportForm.vue'
199198
import UserAssignRoleForm from './UserAssignRoleForm.vue'
200199
import DeptTree from './DeptTree.vue'

0 commit comments

Comments
 (0)