From ebb5d0e65f88a84d20e4f2cd8c6fcf4946fe0688 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Tue, 11 Mar 2025 16:37:35 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9E=E0=B8=B1=E0=B8=92=E0=B8=99=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=B8=E0=B8=84=E0=B8=A5=E0=B8=B2=E0=B8=81=E0=B8=A3?=
 =?UTF-8?q?=20=20convertDate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../15_development/components/ProjectDetail.vue |  4 +++-
 .../components/scholarship/DetailView.vue       | 17 ++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/modules/15_development/components/ProjectDetail.vue b/src/modules/15_development/components/ProjectDetail.vue
index 15f04d24e..bde2519d2 100644
--- a/src/modules/15_development/components/ProjectDetail.vue
+++ b/src/modules/15_development/components/ProjectDetail.vue
@@ -23,7 +23,7 @@ const $q = useQuasar();
 const store = useDevelopmentDataStore();
 const route = useRoute();
 const itemsDevelopment = uselistDevelopmentDataStore();
-const { showLoader, hideLoader, messageError, date2Thai, diffDay, success } =
+const { showLoader, hideLoader, messageError, date2Thai, diffDay, success,convertDateToAPI } =
   useCounterMixin();
 
 const isChangeData = defineModel<boolean>("isChangeData", { required: true });
@@ -247,6 +247,8 @@ async function onSubmit() {
   await http
     .put(config.API.developmentMainTab("tab3", projectId.value), {
       ...formData,
+      dateEnd:convertDateToAPI(formData.dateEnd),
+      dateStart:convertDateToAPI(formData.dateStart),
       totalDate: formData.totalDate === "" ? null : formData.totalDate,
       projectDayBackPlanned:
         formData.projectDayBackPlanned === ""
diff --git a/src/modules/15_development/components/scholarship/DetailView.vue b/src/modules/15_development/components/scholarship/DetailView.vue
index 8d1fcd4ec..1990e71d4 100644
--- a/src/modules/15_development/components/scholarship/DetailView.vue
+++ b/src/modules/15_development/components/scholarship/DetailView.vue
@@ -29,6 +29,7 @@ const {
   success,
   date2Thai,
   calculateDurationYmd,
+  convertDateToAPI,
 } = useCounterMixin();
 
 const checkRouteDetail = ref<boolean>(
@@ -298,12 +299,26 @@ function onSubmit() {
       formBody.reportBackDate = null;
       formBody.changeDetail = "";
     }
+
     try {
       const url = scholarshipId.value
         ? config.API.devScholarshipByid(scholarshipId.value)
         : config.API.devScholarship;
       const method = scholarshipId.value ? "put" : "post";
-      await http[method](url, formBody);
+      await http[method](url, {
+        ...formBody,
+        bookApproveDate: convertDateToAPI(formBody.bookApproveDate),
+        bookNoDate: convertDateToAPI(formBody.bookNoDate),
+        contractDate: convertDateToAPI(formBody.contractDate),
+        endDate: convertDateToAPI(formBody.endDate),
+        reportBackDate: convertDateToAPI(formBody.reportBackDate),
+        reportBackNoDate: convertDateToAPI(formBody.reportBackNoDate),
+        startDate: convertDateToAPI(formBody.startDate),
+        studyAbroadEndDate: convertDateToAPI(formBody.studyAbroadEndDate),
+        studyAbroadStartDate: convertDateToAPI(formBody.studyAbroadStartDate),
+        studyEndDate: convertDateToAPI(formBody.studyEndDate),
+        studyStartDate: convertDateToAPI(formBody.studyStartDate),
+      });
 
       scholarshipId.value
         ? await fetchDataDetail(scholarshipId.value)