From fd74ca29db946a105f77b1e94a9242b527c3315e Mon Sep 17 00:00:00 2001 From: AnandaTon Date: Thu, 7 Dec 2023 18:45:01 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?= =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B9=80=E0=B8=95?= =?UTF-8?q?=E0=B8=B4=E0=B8=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../componenst/Forms/06_OrdinationForm.vue | 3 + src/modules/05_leave/views/AddPage.vue | 72 ------------------- 2 files changed, 3 insertions(+), 72 deletions(-) diff --git a/src/modules/05_leave/componenst/Forms/06_OrdinationForm.vue b/src/modules/05_leave/componenst/Forms/06_OrdinationForm.vue index 9007d3e..2d2a336 100644 --- a/src/modules/05_leave/componenst/Forms/06_OrdinationForm.vue +++ b/src/modules/05_leave/componenst/Forms/06_OrdinationForm.vue @@ -6,9 +6,11 @@ import type { OrdinationForm } from "@/modules/05_leave/interface/request/AddAbs import { useLeaveStore } from "@/modules/05_leave/store" import http from "@/plugins/http" import config from "@/app.config" +import { useRouter } from "vue-router" const dataStore = useLeaveStore() const $q = useQuasar() +const router = useRouter() const mixin = useCounterMixin() const { date2Thai, dialogConfirm, calculateDurationYmd, dateToISO, success, messageError } = mixin @@ -165,6 +167,7 @@ async function saveFormData() { .post(config.API.leaveUser(), formData) .then((res: any) => { success($q, "บันทึกสำเร็จ") + router.push(`/leave`) }) .catch((e: any) => { messageError($q, e) diff --git a/src/modules/05_leave/views/AddPage.vue b/src/modules/05_leave/views/AddPage.vue index 3989e67..85d804f 100644 --- a/src/modules/05_leave/views/AddPage.vue +++ b/src/modules/05_leave/views/AddPage.vue @@ -99,78 +99,6 @@ async function FetchCheck(formData: any) { messageError($q, e) }) } - -async function saveformdata() { - const formData = new FormData() - - // if (formDataLeave.value.leaveDocument > 0) { - // const blob = formDataLeave.value.leaveDocument.slice(0, formDataLeave.value.leaveDocument[0].size) - // const newFile = new File(blob, nameFile.value, { - // type: formDataLeave.value.leaveDocument[0].type, - // }) - // formData.append("leaveDocument", newFile) - // } - // if (formDataLeave.value.leaveDraftDocument > 0) { - // const blob = formDataLeave.value.leaveDraftDocument.slice(0, formDataLeave.value.leaveDraftDocument[0].size) - // const newFileDraft = new File(blob, nameFile.value, { - // type: formDataLeave.value.leaveDraftDocument[0].type, - // }) - // formData.append("leaveDraftDocument", newFileDraft) - // } - formData.append("type", "6d8430db-da6d-4234-8499-6c98ea1de1cd") - // formData.append("leaveStartDate", formDataLeave.value.leaveStartDate) - // formData.append("leaveEndDate", formDataLeave.value.leaveEndDate) - // formData.append("leaveWrote", formDataLeave.value.leaveWrote) - // formData.append("leaveAddress", formDataLeave.value.leaveAddress) - // formData.append("leaveNumber", formDataLeave.value.leaveNumber) - // formData.append("leaveDetail", formDataLeave.value.leaveDetail) - // formData.append("leaveSalaryText", formDataLeave.value.leaveSalaryText) - // formData.append("wifeDayName", formDataLeave.value.wifeDayName) - // formData.append("wifeDayDateBorn", formDataLeave.value.wifeDayDateBorn) - // formData.append("restDayOldTotal", formDataLeave.value.restDayOldTotal) - // formData.append("restDayCurrentTotal", formDataLeave.value.restDayCurrentTotal) - // formData.append("ordainDayStatus", formDataLeave.value.ordainDayStatus) - // formData.append("ordainDayLocationName", formDataLeave.value.ordainDayLocationName) - // formData.append("ordainDayLocationAddress", formDataLeave.value.ordainDayLocationAddress) - // formData.append("ordainDayLocationNumber", formDataLeave.value.ordainDayLocationNumber) - // formData.append("ordainDayOrdination", formDataLeave.value.ordainDayOrdination) - // formData.append("ordainDayBuddhistLentName", formDataLeave.value.ordainDayBuddhistLentName) - // formData.append("ordainDayBuddhistLentAddress", formDataLeave.value.ordainDayBuddhistLentAddress) - // formData.append("hajjDayStatus", formDataLeave.value.hajjDayStatus) - // formData.append("absentDaySummon", formDataLeave.value.absentDaySummon) - // formData.append("absentDayLocation", formDataLeave.value.absentDayLocation) - // formData.append("absentDayRegistorDate", formDataLeave.value.absentDayRegistorDate) - // formData.append("absentDayGetIn", formDataLeave.value.absentDayGetIn) - // formData.append("absentDayAt", formDataLeave.value.absentDayAt) - // formData.append("studyDaySubject", formDataLeave.value.studyDaySubject) - // formData.append("studyDayDegreeLevel", formDataLeave.value.studyDayDegreeLevel) - // formData.append("studyDayUniversityName", formDataLeave.value.studyDayUniversityName) - // formData.append("studyDayTrainingSubject", formDataLeave.value.studyDayTrainingSubject) - // formData.append("studyDayTrainingName", formDataLeave.value.studyDayTrainingName) - // formData.append("studyDayCountry", formDataLeave.value.studyDayCountry) - // formData.append("studyDayScholarship", formDataLeave.value.studyDayScholarship) - // formData.append("coupleDayName", formDataLeave.value.coupleDayName) - // formData.append("coupleDayPosition", formDataLeave.value.coupleDayPosition) - // formData.append("coupleDayLevel", formDataLeave.value.coupleDayLevel) - // formData.append("coupleDayLevelCountry", formDataLeave.value.coupleDayLevelCountry) - // formData.append("coupleDayCountryHistory", formDataLeave.value.coupleDayCountryHistory) - // formData.append("coupleDayTotalHistory", formDataLeave.value.coupleDayTotalHistory) - // formData.append("coupleDayStartDateHistory", formDataLeave.value.coupleDayStartDateHistory) - // formData.append("coupleDayEndDateHistory", formDataLeave.value.coupleDayEndDateHistory) - // formData.append("coupleDaySumTotalHistory", formDataLeave.value.coupleDaySumTotalHistory) - // formData.append("leaveSalary", formDataLeave.value.leaveSalary) - await http - .post(config.API.leaveUser(), { - formData, - }) - .then((res: any) => { - success($q, "บันทึกสำเร็จ") - router.push(`/probation/detail`) - }) - .catch((e: any) => { - messageError($q, e) - }) -}