From 1e4dd426f3fa22eda27a81a5be9dabfb862f0d62 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Fri, 22 Nov 2024 14:03:32 +0700 Subject: [PATCH] prefix --- .../components/detail/PersonalInformation/01_Profile.vue | 3 ++- .../detail/PersonalInformation/02_NameChangeHistory.vue | 3 +-- src/modules/04_registryPerson/interface/request/Profile.ts | 3 ++- src/modules/04_registryPerson/interface/response/Main.ts | 3 ++- src/modules/04_registryPerson/interface/response/Profile.ts | 1 + 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue index 3a23f8c2b..785abe568 100644 --- a/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue +++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue @@ -316,10 +316,11 @@ async function getData() { function onClickOpenDialog() { if (!informaData.value) return; modal.value = true; + id.value = informaData.value.id; age.value = calculateAge(informaData.value.birthDate); formData.citizenId = informaData.value.citizenId; - formData.prefix = informaData.value.prefix; + formData.prefix = informaData.value.prefixMain; formData.rank = informaData.value.rank; formData.firstName = informaData.value.firstName; formData.lastName = informaData.value.lastName; diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue index 4dc42acaf..493ab8a4a 100644 --- a/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue +++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue @@ -461,7 +461,7 @@ onMounted(async () => { icon="add" @click=" () => { - changeNameData.prefix = profileInfo?.prefix; + changeNameData.prefix = profileInfo?.prefixMain; changeNameData.firstName = profileInfo?.firstName; changeNameData.lastName = profileInfo?.lastName; prefixChange = changeNameData.prefix; @@ -496,7 +496,6 @@ onMounted(async () => { outlined emit-value map-options - options-dense option-value="name" style="min-width: 140px" diff --git a/src/modules/04_registryPerson/interface/request/Profile.ts b/src/modules/04_registryPerson/interface/request/Profile.ts index c4f49124c..c75f5e536 100644 --- a/src/modules/04_registryPerson/interface/request/Profile.ts +++ b/src/modules/04_registryPerson/interface/request/Profile.ts @@ -1,5 +1,5 @@ interface RequestObject { - birthDate: Date | null | string; + birthDate: Date | null; bloodGroup: string | null; citizenId: string; // email: string | null; @@ -15,6 +15,7 @@ interface RequestObject { relationship?: string | null; religion?: string | null; phone?: string | null; + prefixMain: string; // telephoneNumber: string | null; } diff --git a/src/modules/04_registryPerson/interface/response/Main.ts b/src/modules/04_registryPerson/interface/response/Main.ts index 1c5a9bc45..a1664d686 100644 --- a/src/modules/04_registryPerson/interface/response/Main.ts +++ b/src/modules/04_registryPerson/interface/response/Main.ts @@ -27,7 +27,7 @@ interface DataPerson { } interface DataRequest { - createdAt: string|Date; + createdAt: string | Date; createdFullName?: string; detail: string; fullname: string; @@ -117,6 +117,7 @@ interface DataProfile { posTypeName: string; posTypeRank: number; }; + prefixMain: string; } interface DataLeave { diff --git a/src/modules/04_registryPerson/interface/response/Profile.ts b/src/modules/04_registryPerson/interface/response/Profile.ts index 6cc8bc90b..1742e7825 100644 --- a/src/modules/04_registryPerson/interface/response/Profile.ts +++ b/src/modules/04_registryPerson/interface/response/Profile.ts @@ -32,6 +32,7 @@ interface ResponseObject { relationship: string | null; religion: string | null; telephoneNumber: string | null; + prefixMain: string; } interface Religion {