From bd715e5f6b5165edd8893260051a8afd2c58d00c Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Thu, 27 Feb 2025 10:36:57 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20sort?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../06_retirement/views/08_dismissOrderEmp.vue    |  2 ++
 .../components/Meeting/MainPage.vue               |  3 ++-
 .../12_evaluatePersonal/store/MeetingStore.ts     | 15 ++++++++++-----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/modules/06_retirement/views/08_dismissOrderEmp.vue b/src/modules/06_retirement/views/08_dismissOrderEmp.vue
index 93f47b5ae..41e91aa34 100644
--- a/src/modules/06_retirement/views/08_dismissOrderEmp.vue
+++ b/src/modules/06_retirement/views/08_dismissOrderEmp.vue
@@ -160,6 +160,7 @@ async function getData() {
     .then((res) => {
       const data = res.data.result;
       rows.value = data;
+      console.log("🚀 ~ .then ~ data:", data)
       rowsData.value = data;
       filters.value = data;
       onSearch();
@@ -269,6 +270,7 @@ onMounted(async () => {
 
           <q-space />
           <div class="row q-col-gutter-sm">
+            {{ filterKeyword }}
             <q-input
               standout
               dense
diff --git a/src/modules/12_evaluatePersonal/components/Meeting/MainPage.vue b/src/modules/12_evaluatePersonal/components/Meeting/MainPage.vue
index bc41ace68..323a8277a 100644
--- a/src/modules/12_evaluatePersonal/components/Meeting/MainPage.vue
+++ b/src/modules/12_evaluatePersonal/components/Meeting/MainPage.vue
@@ -73,7 +73,8 @@ function resetFilter() {
  *pagination ของตาราง
  */
 const pagination = ref({
-  descending: false,
+  descending: true,
+  sortBy:'date',
   page: 1,
   rowsPerPage: 10,
 });
diff --git a/src/modules/12_evaluatePersonal/store/MeetingStore.ts b/src/modules/12_evaluatePersonal/store/MeetingStore.ts
index c9af83995..70adae168 100644
--- a/src/modules/12_evaluatePersonal/store/MeetingStore.ts
+++ b/src/modules/12_evaluatePersonal/store/MeetingStore.ts
@@ -50,6 +50,13 @@ export const useEvaluateMeetingDataStore = defineStore(
         field: "date",
         headerStyle: "font-size: 14px",
         style: "font-size: 14px",
+        format(val, row) {
+          return `${date2Thai(
+            row.dateStart as Date,
+            false,
+            true
+          )} - ${date2Thai(row.dateEnd as Date, false, true)}`;
+        },
       },
     ]);
 
@@ -67,11 +74,9 @@ export const useEvaluateMeetingDataStore = defineStore(
         lastUpdateFullName: item.lastUpdateFullName,
         title: item.title,
         round: item.round,
-        date: `${date2Thai(item.dateStart as Date, false, true)} - ${date2Thai(
-          item.dateEnd as Date,
-          false,
-          true
-        )}`,
+        dateStart: item.dateStart,
+        date: item.dateStart,
+        dateEnd: item.dateEnd,
         result: item.result,
         duration: item.duration,
       }));