From 4ce008fa457d45c7e2532cbc7fc2956d39940525 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Fri, 28 Apr 2023 12:05:49 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=9B=E0=B8=A5=E0=B8=87=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=AB=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=94=E0=B8=AD=E0=B8=B2=E0=B8=A2=E0=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/01_exam/components/ExamCard.vue | 7 +++++--
 src/modules/01_exam/views/ExamDetail.vue    | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/modules/01_exam/components/ExamCard.vue b/src/modules/01_exam/components/ExamCard.vue
index 79d0a8d..b705bbd 100644
--- a/src/modules/01_exam/components/ExamCard.vue
+++ b/src/modules/01_exam/components/ExamCard.vue
@@ -108,11 +108,14 @@
 
 <script setup lang="ts">
 import { onMounted, ref } from 'vue'
+import { useRoute } from 'vue-router'
+import { useCounterMixin } from '@/stores/mixin'
 import http from '@/plugins/http'
 import config from '@/app.config'
-import { useRoute } from 'vue-router'
 
 const route = useRoute()
+const mixin = useCounterMixin() //เรียกฟังก์ชันกลาง
+const { dateThaiRange, modalDelete, modalConfirm, dateToISO, success } = mixin
 const examId = ref<string>(route.params.id.toString())
 const positionId = ref<string>(route.params.positionId.toString())
 const loader = ref<boolean>(false)
@@ -159,7 +162,7 @@ const fetchStatus = async () => {
       scoreC.value = data.pointC
       examResultinscore.value = data.pass
       avatar.value = data.avatar
-      score_expired.value = data.announcementDate
+      score_expired.value = new Date(data.announcementDate)
     })
     .catch(() => {
       //   acceptTermOfUse.value = false
diff --git a/src/modules/01_exam/views/ExamDetail.vue b/src/modules/01_exam/views/ExamDetail.vue
index 9b11fe4..ef2390e 100644
--- a/src/modules/01_exam/views/ExamDetail.vue
+++ b/src/modules/01_exam/views/ExamDetail.vue
@@ -3,7 +3,7 @@
   <q-toolbar class="q-pa-sm text-center">
     <q-toolbar-title class="text-dark">
       {{ tittle }}
-      {{ `ครั้งที่${round}/${yearly + 543}` }}
+      {{ `ครั้งที่${round}/${yearly == null ? '' : yearly + 543}` }}
       <div class="text-light text-body2">{{ position }}</div>
     </q-toolbar-title>
   </q-toolbar>