From b223c2433e97adcfb85e7b21ec753c850290e011 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 17 Sep 2024 10:40:54 +0700
Subject: [PATCH] fix bug

---
 src/modules/05_placement/components/Main.vue | 40 ++++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/modules/05_placement/components/Main.vue b/src/modules/05_placement/components/Main.vue
index 9cfde991a..d94385083 100644
--- a/src/modules/05_placement/components/Main.vue
+++ b/src/modules/05_placement/components/Main.vue
@@ -161,27 +161,27 @@ async function fetchPlacementData(val: number) {
   await http
     .get(config.API.MainDetail(val))
     .then(async (res) => {
-      dataPlacement.value = res.data.result;
+      const data = await res.data.result;
+      dataPlacement.value = data.data;
       DataStore.DataMainOrig = dataPlacement.value;
-      const dataArr: any = [];
-      await DataStore.DataMainOrig.map((e: any) => {
-        dataArr.push({
-          id: e.id,
-          examRound: e.examRound,
-          examOrder: e.examOrder,
-          examTypeName: e.examTypeName,
-          examTypeValue: e.examTypeValue,
-          accountEndDate: date2Thai(e.accountEndDate),
-          accountExpirationDate: date2Thai(e.accountExpirationDate),
-          accountStartDate: date2Thai(e.accountStartDate),
-          fiscalYear: e.fiscalYear,
-          numberOfCandidates: e.numberOfCandidates,
-        });
-      });
-      rows.value = dataArr;
-      examTypeFilter();
-      examTimeFilter();
-      expiredAccountFilter();
+      rows.value = DataStore.DataMainOrig.map((e: any) => ({
+        id: e.id,
+        examRound: e.examRound,
+        examOrder: e.examOrder,
+        examTypeName: e.examTypeName,
+        examTypeValue: e.examTypeValue,
+        accountEndDate: date2Thai(e.accountEndDate),
+        accountExpirationDate: date2Thai(e.accountExpirationDate),
+        accountStartDate: date2Thai(e.accountStartDate),
+        fiscalYear: e.fiscalYear,
+        numberOfCandidates: e.numberOfCandidates,
+      }));
+
+      await Promise.all([
+        examTypeFilter(),
+        examTimeFilter(),
+        expiredAccountFilter(),
+      ]);
     })
     .catch((e) => {
       messageError($q, e);