From fe672a5aff0e8a6660c1137894f3bac91e635ea5 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Wed, 20 Sep 2023 15:27:03 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B9=80=E0=B8=81=E0=B9=89=E0=B9=83?=
 =?UTF-8?q?=E0=B8=AB=E0=B9=89=E0=B8=9B=E0=B8=B5=20=E0=B8=95=E0=B9=88?=
 =?UTF-8?q?=E0=B8=B3=E0=B8=AA=E0=B8=B8=E0=B8=94=20=E0=B8=84=E0=B8=A8=20000?=
 =?UTF-8?q?1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PersonalList/TableDetail.vue   |  2 +-
 src/stores/mixin.ts                           | 24 ++++++-------------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/modules/05_placement/components/PersonalList/TableDetail.vue b/src/modules/05_placement/components/PersonalList/TableDetail.vue
index 3feca51af..55057aa91 100644
--- a/src/modules/05_placement/components/PersonalList/TableDetail.vue
+++ b/src/modules/05_placement/components/PersonalList/TableDetail.vue
@@ -129,7 +129,7 @@ const close = async () => {
 };
 </script>
 <template>
-  <q-dialog v-model="props.Modal">
+  <q-dialog v-model="props.Modal" persistent>
     <q-card style="max-width: 100%; width: 80%">
       <q-form ref="myForm">
         <div class="row">
diff --git a/src/stores/mixin.ts b/src/stores/mixin.ts
index d6ee99b61..0f6125590 100644
--- a/src/stores/mixin.ts
+++ b/src/stores/mixin.ts
@@ -76,13 +76,12 @@ export const useCounterMixin = defineStore("mixin", () => {
   ) {
     if (srcDate == null) {
       return null;
-      `
-    `;
     }
+  
     const date = new Date(srcDate);
     const isValidDate = Boolean(+date);
     if (!isValidDate) return srcDate.toString();
-    if (isValidDate && date.getFullYear() < 1000) return srcDate.toString();
+  
     const fullMonthThai = [
       "มกราคม",
       "กุมภาพันธ์",
@@ -111,26 +110,17 @@ export const useCounterMixin = defineStore("mixin", () => {
       "พ.ย.",
       "ธ.ค.",
     ];
-    let dstYear = 0;
-    if (date.getFullYear() > 2500) {
-      dstYear = date.getFullYear();
-    } else {
-      dstYear = date.getFullYear() + 543;
-    }
-    let dstMonth = "";
-    if (isFullMonth) {
-      dstMonth = fullMonthThai[date.getMonth()];
-    } else {
-      dstMonth = abbrMonthThai[date.getMonth()];
-    }
+  
+    let dstYear = date.getFullYear() < 1 ? "0001" : (date.getFullYear() + 543).toString();
+    let dstMonth = isFullMonth ? fullMonthThai[date.getMonth()] : abbrMonthThai[date.getMonth()];
     let dstTime = "";
+  
     if (isTime) {
       const H = date.getHours().toString().padStart(2, "0");
       const M = date.getMinutes().toString().padStart(2, "0");
-      // const S = date.getSeconds().toString().padStart(2, "0")
-      // dstTime = " " + H + ":" + M + ":" + S + " น."
       dstTime = " " + H + ":" + M + " น.";
     }
+  
     return (
       date.getDate().toString().padStart(2, "0") +
       " " +