diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue index 184482da2..5da73bfb0 100644 --- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue +++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue @@ -57,6 +57,11 @@ const formMain = reactive({ }, //อายุราชการ absent: 0, //ขาดราชการ age: 0, //อายุราชการเกื้อกูล + govAgeBkk:{ + year: 0, + month: 0, + day: 0, + } }); const modalEdit = ref(false); //แสดง popup แก้ไขข้อมูลราชการ @@ -163,6 +168,7 @@ async function getData() { formMain.ageAll = data.govAge; formMain.absent = data.govAgeAbsent; formMain.age = data.govAgePlus; + formMain.govAgeBkk = data.govAgeBkk; }) .catch((e) => { messageError($q, e); @@ -457,6 +463,21 @@ onMounted(() => { +
+
+
+ อายุราชการ (กทม.) +
+
+ {{ + formMain.govAgeBkk + ? `${formMain.govAgeBkk.year} ปี ${formMain.govAgeBkk.month} เดือน ${formMain.govAgeBkk.day} วัน` + : "-" + }} +
+
+
+
diff --git a/src/modules/04_registryPerson/interface/index/government.ts b/src/modules/04_registryPerson/interface/index/government.ts index ab594c210..b9796889c 100644 --- a/src/modules/04_registryPerson/interface/index/government.ts +++ b/src/modules/04_registryPerson/interface/index/government.ts @@ -14,6 +14,7 @@ interface FormMain { reasonSameDate: string; retireDate: any; ageAll: GovAgeForm; + govAgeBkk: GovAgeForm; absent: number; age: number; [key: string]: any;