diff --git a/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue b/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue index be80e8e25..62ff4f3e5 100644 --- a/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue +++ b/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue @@ -11,7 +11,7 @@ import { useDisciplineSuspendStore } from "@/modules/11_discipline/store/Suspend /**Import type */ import type { QForm } from "quasar"; -import type { DataDetail } from "@/modules/11_discipline/interface/response/Suspend"; +import type { DataDetail } from "@/modules/11_discipline/interface/response/suspend"; import type { DataProfile } from "@/modules/05_placement/interface/index/Main"; import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue"; diff --git a/src/modules/12_evaluatePersonal/components/Meeting/EditPage.vue b/src/modules/12_evaluatePersonal/components/Meeting/EditPage.vue index 01da68e70..30b7f9df1 100644 --- a/src/modules/12_evaluatePersonal/components/Meeting/EditPage.vue +++ b/src/modules/12_evaluatePersonal/components/Meeting/EditPage.vue @@ -85,12 +85,8 @@ function onSubmit(formData: FormData) { .put(config.API.meetingById(personalId.value), { round: formData.rounded ?? "", title: formData.title, - dateStart: formData.dateMeetingStart - ? dateToISO(formData.dateMeetingStart) - : null, - dateEnd: formData.dateMeetingEnd - ? dateToISO(formData.dateMeetingEnd) - : null, + dateStart: formData.dateMeetingStart, + dateEnd: formData.dateMeetingEnd, result: formData.consider, duration: formData.period, }) diff --git a/src/modules/12_evaluatePersonal/components/Meeting/Form.vue b/src/modules/12_evaluatePersonal/components/Meeting/Form.vue index 7376eb1b9..1202d1be1 100644 --- a/src/modules/12_evaluatePersonal/components/Meeting/Form.vue +++ b/src/modules/12_evaluatePersonal/components/Meeting/Form.vue @@ -24,6 +24,7 @@ const { date2Thai, hideLoader, dialogRemove, + convertDatetimeToAPI, } = useCounterMixin(); /** @@ -62,7 +63,11 @@ const fileDataDownload = ref([]); ///รายการเอกสาร /** บันทึกข้อมูล */ function submit() { - props.onSubmit(formData); + props.onSubmit({ + ...formData, + dateMeetingStart: convertDatetimeToAPI(formData.dateMeetingStart), + dateMeetingEnd: convertDatetimeToAPI(formData.dateMeetingEnd), + }); } /**