From d1600281f95158580b753ba1683cedd70c8ceeb5 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 6 Feb 2026 15:06:28 +0700
Subject: [PATCH 1/2] fix(registry):display govAgeBkk

---
 .../detail/GovernmentInformation/01_Info.vue  | 21 +++++++++++++++++++
 .../interface/index/government.ts             |  1 +
 2 files changed, 22 insertions(+)

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<FormMain>({
   }, //อายุราชการ
   absent: 0, //ขาดราชการ
   age: 0, //อายุราชการเกื้อกูล
+  govAgeBkk:{
+    year: 0,
+    month: 0,
+    day: 0,
+  }
 });
 
 const modalEdit = ref<boolean>(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(() => {
             </div>
           </div>
         </div>
+        <div class="col-12 col-sm-6 col-md-6">
+          <div class="row">
+            <div class="col-12 col-sm-12 col-md-5">
+              <span class="text-grey-6 text-weight-medium">อายุราชการ (กทม.)</span>
+            </div>
+            <div class="col-12 col-sm-12 col-md-7">
+                    <span>{{
+                formMain.govAgeBkk
+                  ? `${formMain.govAgeBkk.year} ปี ${formMain.govAgeBkk.month} เดือน ${formMain.govAgeBkk.day} วัน`
+                  : "-"
+              }}</span>
+            </div>
+          </div>
+        </div>
+
         <div class="col-12 col-sm-6 col-md-6">
           <div class="row">
             <div class="col-12 col-sm-12 col-md-5">
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;

From b0b64059f1e7a6ed613a353852c779ce1d5eba2c Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 6 Feb 2026 17:03:11 +0700
Subject: [PATCH 2/2] fix(development):display btn projectStatus !== 'FINISH'

---
 src/modules/15_development/components/Target.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/15_development/components/Target.vue b/src/modules/15_development/components/Target.vue
index 360cd4b26..f5a33abbd 100644
--- a/src/modules/15_development/components/Target.vue
+++ b/src/modules/15_development/components/Target.vue
@@ -634,8 +634,9 @@ onMounted(() => {
       class="col-xs-12 col-sm-12 text-weight-medium bg-grey-1 q-py-xs q-px-md"
     >
       เป้าหมายตามแผน
+      <!-- store.projectStatus !== 'FINISH' -->
       <q-btn
-        v-if="store.projectStatus !== 'FINISH' && !checkRoutePermission"
+        v-if="!checkRoutePermission"
         flat
         round
         dense
@@ -700,10 +701,9 @@ onMounted(() => {
           <template v-slot:body="props">
             <q-tr :props="props" class="vertical-top">
               <q-td>
+                <!-- store.projectStatus !== 'FINISH' &&  -->
                 <q-btn
-                  v-if="
-                    store.projectStatus !== 'FINISH' && !checkRoutePermission
-                  "
+                  v-if="!checkRoutePermission"
                   round
                   flat
                   color="edit"