From 29bf68b4e6b804dd871bb797f05c023b209ece28 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Mon, 21 Jul 2025 10:41:16 +0700
Subject: [PATCH] =?UTF-8?q?fix:=20=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=95?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=A7=E0=B9=81=E0=B8=9B=E0=B8=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/15_development/components/FormHistory.vue      | 2 +-
 src/modules/15_development/components/history/AddPage.vue  | 7 +++----
 .../15_development/components/historyEmployee/AddPage.vue  | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/modules/15_development/components/FormHistory.vue b/src/modules/15_development/components/FormHistory.vue
index a1ae652ee..6e850b9d9 100644
--- a/src/modules/15_development/components/FormHistory.vue
+++ b/src/modules/15_development/components/FormHistory.vue
@@ -34,7 +34,7 @@ const dateOrder = defineModel<Date | null>("dateOrder", { required: true });
       </div>
       <div class="col-4">
         <q-input
-          :model-value="dateHisEnd ? date2Thai(dateHisStart) : '-'"
+          :model-value="dateHisEnd ? date2Thai(dateHisEnd) : '-'"
           dense
           outlined
           readonly
diff --git a/src/modules/15_development/components/history/AddPage.vue b/src/modules/15_development/components/history/AddPage.vue
index a7876af7d..e65a2942f 100644
--- a/src/modules/15_development/components/history/AddPage.vue
+++ b/src/modules/15_development/components/history/AddPage.vue
@@ -18,7 +18,7 @@ import FormHistory from "@/modules/15_development/components/FormHistory.vue";
 
 const $q = useQuasar();
 const mixin = useCounterMixin();
-const { showLoader, hideLoader, messageError, date2Thai } = mixin;
+const { showLoader, hideLoader, messageError, date2Thai,convertDateToAPI ,convertDateDisplay} = mixin;
 
 const router = useRouter();
 const route = useRoute();
@@ -130,9 +130,8 @@ async function fetchData() {
       dateOrder.value = data.dateOrder;
       order.value = data.order;
       rows.value = data.academic;
-
-      dateHisStart.value = data.dateStart;
-      dateHisEnd.value = data.dateEnd;
+      dateHisStart.value = data.dateHisStart;
+      dateHisEnd.value = data.dateHisEnd;
       trainingDays.value = data.trainingDays;
     })
     .catch((e) => {
diff --git a/src/modules/15_development/components/historyEmployee/AddPage.vue b/src/modules/15_development/components/historyEmployee/AddPage.vue
index 7392364f1..194e01ea4 100644
--- a/src/modules/15_development/components/historyEmployee/AddPage.vue
+++ b/src/modules/15_development/components/historyEmployee/AddPage.vue
@@ -142,8 +142,8 @@ function fetchDataDetail() {
       order.value = data.order;
       rows.value = data.academic;
 
-      dateHisStart.value = data.dateStart;
-      dateHisEnd.value = data.dateEnd;
+      dateHisStart.value = data.dateHisStart;
+      dateHisEnd.value = data.dateHisEnd;
       trainingDays.value = data.trainingDays;
     })
     .catch((e) => {