diff --git a/src/pages/02_personnel-management/MainPage.vue b/src/pages/02_personnel-management/MainPage.vue index e99fb65e..f144fa66 100644 --- a/src/pages/02_personnel-management/MainPage.vue +++ b/src/pages/02_personnel-management/MainPage.vue @@ -609,8 +609,8 @@ async function assignFormData(idEdit: string) { (foundUser.citizenIssue && new Date(foundUser.citizenIssue)) || null, citizenExpire: (foundUser.citizenExpire && new Date(foundUser.citizenExpire)) || null, - remark: foundUser.remark, - agencyStatus: foundUser.agencyStatus, + remark: foundUser.remark || '', + agencyStatus: foundUser.agencyStatus || '', }; formData.value.status === 'ACTIVE' || 'CREATED' diff --git a/src/stores/user/types.ts b/src/stores/user/types.ts index bf4632e9..bb0395a9 100644 --- a/src/stores/user/types.ts +++ b/src/stores/user/types.ts @@ -110,7 +110,7 @@ export type UserCreate = { citizenId: string; remark?: string; - agencyStatus?: AgencyStatus; + agencyStatus?: AgencyStatus | string; }; export enum AgencyStatus {