Merge branch 'develop' into devTee

src/modules/04_registryNew/components/detail/GovernmentInformation/01_Info.vue

@@ -406,7 +406,8 @@ function getData() {
       formMain.containDate = data.dateAppoint;
       formMain.workDate = data.dateStart;
       formMain.reasonSameDate = data.reasonSameDate;
-      formMain.retireDate = data.retireDate;
+      formMain.retireDate = data.dateRetire;
+      formMain.dateRetireLaw = data.dateRetireLaw;
       formMain.ageAll = data.govAge;
       formMain.absent = data.govAgeAbsent;
       formMain.age = data.govAgePlus;
@@ -440,7 +441,8 @@ function getDataHistory() {
           positionExecutiveSide: e.positionExecutiveSide,
           dateAppoint: new Date(e.dateAppoint),
           dateStart: new Date(e.dateStart),
-          retireDate: e.retireDate,
+          dateRetire: e.dateRetire,
+          dateRetireLaw: e.dateRetireLaw,
           govAge: e.govAge,
           govAgeAbsent: e.govAgeAbsent,
           govAgePlus: e.govAgePlus,
@@ -454,7 +456,7 @@ function getDataHistory() {
     })
     .catch((e) => {
       messageError($q, e);
-      modalHistory.value = false
+      modalHistory.value = false;
     })
     .finally(() => {
       hideLoader();
@@ -508,12 +510,12 @@ onMounted(() => {
           v-for="(field, index) in Object.keys(fieldLabels).slice(0, 5)"
           :key="index"
         >
-          <div class="col-12 col-sm-12 col-md-4">
+          <div class="col-12 col-sm-12 col-md-5">
             <span class="text-grey-6 text-weight-medium">{{
               fieldLabels[field as keyof typeof fieldLabels]
             }}</span>
           </div>
-          <div class="col-12 col-sm-12 col-md-8">
+          <div class="col-12 col-sm-12 col-md-7">
             <span>{{ formMain[field] ? formMain[field] : "-" }}</span>
           </div>
         </div>
@@ -524,12 +526,12 @@ onMounted(() => {
           v-for="(field, index) in Object.keys(fieldLabels).slice(5, 9)"
           :key="index"
         >
-          <div class="col-12 col-sm-12 col-md-4">
+          <div class="col-12 col-sm-12 col-md-5">
             <span class="text-grey-6 text-weight-medium">{{
               fieldLabels[field as keyof typeof fieldLabels]
             }}</span>
           </div>
-          <div class="col-12 col-sm-12 col-md-8">
+          <div class="col-12 col-sm-12 col-md-7">
             <span>{{ formMain[field] ? formMain[field] : "-" }}</span>
           </div>
         </div>
@@ -540,12 +542,12 @@ onMounted(() => {
       <div class="col-12 col-sm-6 col-md-6 q-gutter-y-sm">
         <div class="col-12 col-sm-6 col-md-6">
           <div class="row">
-            <div class="col-12 col-sm-12 col-md-4">
+            <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-8">
+            <div class="col-12 col-sm-12 col-md-7">
               <span>{{
                 formMain.containDate ? date2Thai(formMain.containDate) : "-"
               }}</span>
@@ -554,12 +556,12 @@ onMounted(() => {
         </div>
         <div class="col-12 col-sm-6 col-md-6">
           <div class="row">
-            <div class="col-12 col-sm-12 col-md-4">
+            <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-8">
+            <div class="col-12 col-sm-12 col-md-7">
               <span>{{
                 formMain.workDate !== null
                   ? date2Thai(formMain.workDate as Date)
@@ -573,12 +575,12 @@ onMounted(() => {
           class="col-12 col-sm-6 col-md-6"
         >
           <div class="row">
-            <div class="col-12 col-sm-12 col-md-4">
+            <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-8">
+            <div class="col-12 col-sm-12 col-md-7">
               <span>{{
                 formMain.reasonSameDate !== "" ? formMain.reasonSameDate : "-"
               }}</span>
@@ -587,26 +589,29 @@ onMounted(() => {
         </div>
         <div class="col-12 col-sm-6 col-md-6">
           <div class="row">
-            <div class="col-12 col-sm-12 col-md-4">
-              <span class="text-grey-6 text-weight-medium">วันเกษียณอายุ</span>
+            <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-8">
+            <div class="col-12 col-sm-12 col-md-7">
               <span>{{
-                formMain.retireDate
-                  ? date2Thai(formMain.retireDate as Date)
+                formMain.dateRetire
+                  ? date2Thai(formMain.dateRetire as Date)
                   : "-"
               }}</span>
             </div>
           </div>
         </div>
       </div>
+
       <div class="col-12 col-sm-6 col-md-6 q-gutter-y-sm">
         <div class="col-12 col-sm-6 col-md-6">
           <div class="row">
-            <div class="col-12 col-sm-12 col-md-4">
+            <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-8">
+            <div class="col-12 col-sm-12 col-md-7">
               <span>{{
                 formMain.ageAll
                   ? `${formMain.ageAll.day} วัน ${formMain.ageAll.month} เดือน ${formMain.ageAll.year} ปี`
@@ -617,26 +622,42 @@ onMounted(() => {
         </div>
         <div class="col-12 col-sm-6 col-md-6">
           <div class="row">
-            <div class="col-12 col-sm-12 col-md-4">
+            <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-8">
+            <div class="col-12 col-sm-12 col-md-7">
               <span>{{ formMain.absent ? formMain.absent : 0 }}</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-4">
+            <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-8">
+            <div class="col-12 col-sm-12 col-md-7">
               <span>{{ formMain.age ? formMain.age : 0 }}</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">
+              <span class="text-grey-6 text-weight-medium"
+                >วันที่เกษียณอายุราชการตามกฏหมาย</span
+              >
+            </div>
+            <div class="col-12 col-sm-12 col-md-7">
+              <span>{{
+                formMain.dateRetireLaw
+                  ? date2Thai(formMain.dateRetireLaw as Date)
+                  : "-"
+              }}</span>
+            </div>
+          </div>
+        </div>
       </div>
     </div>
   </q-card>

src/modules/04_registryNew/interface/index/government.ts

@@ -1,27 +1,27 @@
 interface FormMain {
-  ocId: string
-  positionId: string
-  positionLine: string
-  positionLevel: string
-  numberId: string
-  positionExecutive: string
-  positionExecutiveSide: string
-  positionType: string
-  positionPathSide: string
+  ocId: string;
+  positionId: string;
+  positionLine: string;
+  positionLevel: string;
+  numberId: string;
+  positionExecutive: string;
+  positionExecutiveSide: string;
+  positionType: string;
+  positionPathSide: string;
 
-  containDate: any
-  workDate: any
-  reasonSameDate: string
-  retireDate: any
-  ageAll: GovAgeForm
-  absent: number
-  age: number
+  containDate: any;
+  workDate: any;
+  reasonSameDate: string;
+  retireDate: any;
+  ageAll: GovAgeForm;
+  absent: number;
+  age: number;
   [key: string]: any;
 }
 interface GovAgeForm {
-  year: number,
-  month: number,
-  day: number
+  year: number;
+  month: number;
+  day: number;
 }
 
 interface MyObjectRef {
@@ -32,8 +32,8 @@ interface MyObjectRef {
 }
 
 interface RequestItemsHistoryObject {
-  lastUpdatedAt: Date,
-  lastUpdateFullName: string,
+  lastUpdatedAt: Date;
+  lastUpdateFullName: string;
   oc: string | null;
   position: string | null;
   positionPathSide: string | null;
@@ -45,7 +45,8 @@ interface RequestItemsHistoryObject {
   positionExecutiveSide: string | null;
   dateAppoint: Date;
   dateStart: Date;
-  retireDate: string | null;
+  dateRetire: string | null;
+  dateRetireLaw: string | null;
   govAge: string | null;
   govAgeAbsent: string | null;
   govAgePlus: string | null;