Merge branch 'develop' of github.com:Frappet/hrms-mgt into develop

* 'develop' of github.com:Frappet/hrms-mgt:
  fix(development):display btn projectStatus !== 'FINISH'
  fix(registry):display govAgeBkk

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">

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;

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"