From ef9a805cb4ddeacf4a45721412ab25fc90b62778 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 11 Jun 2025 16:55:14 +0700
Subject: [PATCH] fix display and sort registry

---
 .../01_Information/05_Educations.vue          |  2 +-
 .../02_Government/01_Government.vue           | 36 +++++++++----------
 .../10_registry/02_Government/07_Position.vue |  2 +-
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/modules/10_registry/01_Information/05_Educations.vue b/src/modules/10_registry/01_Information/05_Educations.vue
index 515fe2a..83dd3ef 100644
--- a/src/modules/10_registry/01_Information/05_Educations.vue
+++ b/src/modules/10_registry/01_Information/05_Educations.vue
@@ -267,7 +267,7 @@ const columns = ref<QTableProps["columns"]>([
   },
 ]);
 const pagination = ref({
-  sortBy: "lastUpdatedAt",
+  // sortBy: "lastUpdatedAt",
 });
 
 const columnsHistory = ref<QTableProps["columns"]>([
diff --git a/src/modules/10_registry/02_Government/01_Government.vue b/src/modules/10_registry/02_Government/01_Government.vue
index 153d08b..f47c4db 100644
--- a/src/modules/10_registry/02_Government/01_Government.vue
+++ b/src/modules/10_registry/02_Government/01_Government.vue
@@ -497,19 +497,19 @@ onMounted(async () => {
       <div class="row">
         <div class="col-12 col-sm-12 col-md-6 q-gutter-y-sm">
           <div class="row">
-            <div class="col-5 text-grey-6 text-weight-medium">
+            <div class="col-6 text-grey-6 text-weight-medium">
               วันที่สั่งบรรจุ
             </div>
-            <div class="col-7">
+            <div class="col-6">
               {{ formData.dateAppoint ? date2Thai(formData.dateAppoint) : "-" }}
             </div>
           </div>
 
           <div class="row">
-            <div class="col-5 text-grey-6 text-weight-medium">
+            <div class="col-6 text-grey-6 text-weight-medium">
               วันที่เริ่มปฏิบัติราชการ
             </div>
-            <div class="col-7">
+            <div class="col-6">
               {{ formData.dateStart ? date2Thai(formData.dateStart) : "-" }}
             </div>
           </div>
@@ -518,22 +518,32 @@ onMounted(async () => {
             v-if="dateToISO(formData.dateAppoint as Date) !== dateToISO(formData.dateStart as Date)"
             class="row"
           >
-            <div class="col-5 text-grey-6 text-weight-medium">
+            <div class="col-6 text-grey-6 text-weight-medium">
               เหตุผลที่วันที่ไม่ตรงกัน
             </div>
-            <div class="col-7">
+            <div class="col-6">
               {{ formData.reasonSameDate ? formData.reasonSameDate : "-" }}
             </div>
           </div>
 
           <div class="row">
-            <div class="col-5 text-grey-6 text-weight-medium">
+            <div class="col-6 text-grey-6 text-weight-medium">
               วันครบเกษียณอายุ
             </div>
-            <div class="col-7">
+            <div class="col-6">
               {{ formData.dateLeave ? date2Thai(formData.dateLeave) : "-" }}
             </div>
           </div>
+          <div class="row">
+            <div class="col-6 text-grey-6 text-weight-medium">
+              วันที่เกษียณอายุราชการตามกฏหมาย
+            </div>
+            <div class="col-6">
+              {{
+                formData.dateRetireLaw ? date2Thai(formData.dateRetireLaw) : "-"
+              }}
+            </div>
+          </div>
         </div>
 
         <div class="col-12 col-sm-12 col-md-6 q-gutter-y-sm">
@@ -561,16 +571,6 @@ onMounted(async () => {
               {{ formData.govAgePlus ? formData.govAgePlus : 0 }}
             </div>
           </div>
-          <div class="row">
-            <div class="col-5 text-grey-6 text-weight-medium">
-              วันที่เกษียณอายุราชการตามกฏหมาย
-            </div>
-            <div class="col-7">
-              {{
-                formData.dateRetireLaw ? date2Thai(formData.dateRetireLaw) : "-"
-              }}
-            </div>
-          </div>
         </div>
       </div>
     </q-card>
diff --git a/src/modules/10_registry/02_Government/07_Position.vue b/src/modules/10_registry/02_Government/07_Position.vue
index c32aba6..7989543 100644
--- a/src/modules/10_registry/02_Government/07_Position.vue
+++ b/src/modules/10_registry/02_Government/07_Position.vue
@@ -114,7 +114,7 @@ const baseColumns = ref<QTableColumn[]>([
     style: "font-size: 14px",
     format(val, row) {
       return row.posNoAbb && row.posNo
-        ? `${row.posNoAbb}${row.posNo}`
+        ? `${row.posNoAbb} ${row.posNo}`
         : row.posNo
         ? row.posNo
         : "-";