From a8b3b0dcb0b14001a3ea09334a2882daa99f3f16 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Thu, 7 Sep 2023 18:28:14 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9A=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=99=E0=B8=97=E0=B8=B6=E0=B8=81=E0=B8=9C=E0=B8=A5=E0=B9=80?=
 =?UTF-8?q?=E0=B8=84=E0=B8=A3=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=87=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=8A=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B4=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B9=84=E0=B8=94?=
 =?UTF-8?q?=E0=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../04_registry/components/Insignia.vue       | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/modules/04_registry/components/Insignia.vue b/src/modules/04_registry/components/Insignia.vue
index 0e3317d15..5db852439 100644
--- a/src/modules/04_registry/components/Insignia.vue
+++ b/src/modules/04_registry/components/Insignia.vue
@@ -23,17 +23,18 @@
               @click="selectData(props)"
               class="cursor-pointer"
             >
-              <!-- <div
+              <div
                 v-if="
                   col.name == 'receiveDate' ||
                   col.name == 'dateAnnounce' ||
+                  col.name == 'createdAt' ||
                   col.name == 'refCommandDate'
                 "
                 class="table_ellipsis"
               >
                 {{ col.value == null ? null : date2Thai(col.value) }}
-              </div> -->
-              <div v-if="col.name == 'year'" class="table_ellipsis">
+              </div>
+              <div v-else-if="col.name == 'year'" class="table_ellipsis">
                 {{ col.value + 543 }}
               </div>
               <div v-else class="table_ellipsis">
@@ -550,7 +551,7 @@ profileData.insignia.columns.length == 0
       "dateAnnounce",
       "refCommandNo",
       "refCommandDate",
-      "createdAt"
+      "createdAt",
     ])
   : (visibleColumns.value = profileData.insignia.columns);
 const columns = ref<QTableProps["columns"]>([
@@ -953,7 +954,7 @@ const fetchData = async () => {
           rows.value.push({
             id: e.id,
             insignia: e.insignia == null ? null : e.insignia.name,
-            insigniaId: e.insigniaId,
+            insigniaId: e.insignia == null ? null : e.insignia.id,
             insigniaType: e.insigniaType,
             year: e.year,
             no: e.no,
@@ -962,13 +963,13 @@ const fetchData = async () => {
             volume: e.volume,
             section: e.section,
             page: e.page,
-            receiveDate: date2Thai(e.receiveDate),
-            dateAnnounce: date2Thai(e.dateAnnounce),
+            receiveDate: new Date(e.receiveDate),
+            dateAnnounce: new Date(e.dateAnnounce),
             refCommandNo: e.refCommandNo,
             refCommandDate:
-              e.refCommandDate == null ? null : date2Thai(e.refCommandDate),
+              e.refCommandDate == null ? null : new Date(e.refCommandDate),
             createdFullName: e.createdFullName,
-            createdAt: date2Thai(e.createdAt),
+            createdAt: new Date(e.createdAt),
           });
         });
       })