diff --git a/src/api/user.ts b/src/api/user.ts index 5088166..ac48d74 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -39,7 +39,7 @@ export interface CreateRecord { enabled: string; address: string; deptId: DeptRecord | undefined; - roleId: string | RoleRecord | undefined; + roleIds: string[] | RoleRecord | undefined; permissionIds: (number | undefined)[]; authorities: string[]; } @@ -55,9 +55,9 @@ export interface SelfRecord { // 用户数据 export interface UserRecord extends CreateRecord { value: any; - id: string; - avatar: string; - createAt: string; + id?: string; + avatar?: string; + createAt?: string; } export interface UserParams extends Partial { diff --git a/src/views/system/user/components/user-edit.vue b/src/views/system/user/components/user-edit.vue index f40b235..e042824 100644 --- a/src/views/system/user/components/user-edit.vue +++ b/src/views/system/user/components/user-edit.vue @@ -109,19 +109,20 @@ @@ -164,7 +165,7 @@ enabled: '', address: '', deptId: undefined, - roleId: undefined, + roleIds: [], permissionIds: [], authorities: [], }); @@ -229,21 +230,28 @@ CreateRef.value?.resetFields(); } else { // 编辑 - formDifer = diffDataForm(formData.value, formDifer); - if (Object.keys(formDifer).length === 0) { + // formDifer = diffDataForm(formData.value, formDifer); + // if (Object.keys(formDifer).length === 0) { + // Message.success({ + // content: '未编辑', + // duration: 3 * 1000, + // }); + // } else { + // formDifer.id = formData.value.id; + // const res = await userStore.updateUser(formData.value); + // if (res.status === 200) { + // Message.success({ + // content: '修改成功', + // duration: 5 * 1000, + // }); + // } + // } + const res = await userStore.updateUser(formData.value); + if (res.status === 200) { Message.success({ - content: '未编辑', - duration: 3 * 1000, + content: '修改成功', + duration: 5 * 1000, }); - } else { - formDifer.id = formData.value.id; - const res = await userStore.updateUser(formDifer); - if (res.status === 200) { - Message.success({ - content: '修改成功', - duration: 5 * 1000, - }); - } } } checkKeys.value = [];