From ebfae7437e848b7ed20c934865d87fcb9cc5468e Mon Sep 17 00:00:00 2001 From: waruneeta Date: Thu, 11 Jan 2024 18:03:47 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9F=E0=B8=AD?= =?UTF-8?q?=E0=B8=A3=E0=B9=8C=E0=B8=A1=E0=B8=A5=E0=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../05_leave/components/DialogDetail.vue | 16 +++--- .../components/FormLeave/01_SickForm.vue | 1 + .../components/FormLeave/03_Birth.vue | 1 - .../FormLeave/04_HelpWifeBirthForm.vue | 8 +-- .../components/FormLeave/05_VacationForm.vue | 6 +-- .../FormLeave/06_OrdinationForm.vue | 54 +++++++------------ .../components/FormLeave/07_HajjForm.vue | 41 +++++--------- .../components/FormLeave/08_MilitaryForm.vue | 9 ++-- .../{formLeave.vue => 01_SickForm.vue} | 2 +- ...hildbirth.vue => 04_HelpWifeBirthForm.vue} | 2 +- .../{formHoliday.vue => 05_VacationForm.vue} | 2 +- .../{formUpasom.vue => 06_OrdinationForm.vue} | 0 .../{formHajj.vue => 07_HajjForm.vue} | 0 ...ormCheckSelect.vue => 08_MilitaryForm.vue} | 0 .../05_leave/interface/response/leave.ts | 1 + src/modules/05_leave/views/EditPage.vue | 9 ++-- src/modules/07_appealComplain/views/Edit.vue | 4 +- 17 files changed, 64 insertions(+), 92 deletions(-) rename src/modules/05_leave/components/formDetail/{formLeave.vue => 01_SickForm.vue} (93%) rename src/modules/05_leave/components/formDetail/{formChildbirth.vue => 04_HelpWifeBirthForm.vue} (97%) rename src/modules/05_leave/components/formDetail/{formHoliday.vue => 05_VacationForm.vue} (94%) rename src/modules/05_leave/components/formDetail/{formUpasom.vue => 06_OrdinationForm.vue} (100%) rename src/modules/05_leave/components/formDetail/{formHajj.vue => 07_HajjForm.vue} (100%) rename src/modules/05_leave/components/formDetail/{formCheckSelect.vue => 08_MilitaryForm.vue} (100%) diff --git a/src/modules/05_leave/components/DialogDetail.vue b/src/modules/05_leave/components/DialogDetail.vue index 76b9922..8eb7ea8 100644 --- a/src/modules/05_leave/components/DialogDetail.vue +++ b/src/modules/05_leave/components/DialogDetail.vue @@ -8,12 +8,12 @@ import config from "@/app.config" import type { FremDetail, FormDelete, FormDeleteRef, FromCancelDetail } from "@/modules/05_leave/interface/response/leave" /** import componest*/ -import FormLeave from "@/modules/05_leave/components/formDetail/formLeave.vue" -import FormChildbirth from "@/modules/05_leave/components/formDetail/formChildbirth.vue" -import FormHoliday from "@/modules/05_leave/components/formDetail/formHoliday.vue" -import FormUpasom from "@/modules/05_leave/components/formDetail/formUpasom.vue" -import FormHajj from "@/modules/05_leave/components/formDetail/formHajj.vue" -import FormCheckSelect from "@/modules/05_leave/components/formDetail/formCheckSelect.vue" +import FormLeave from "@/modules/05_leave/components/formDetail/01_SickForm.vue" +import FormChildbirth from "@/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue" +import FormHoliday from "@/modules/05_leave/components/formDetail/05_VacationForm.vue" +import FormUpasom from "@/modules/05_leave/components/formDetail/06_OrdinationForm.vue" +import FormHajj from "@/modules/05_leave/components/formDetail/07_HajjForm.vue" +import FormCheckSelect from "@/modules/05_leave/components/formDetail/08_MilitaryForm.vue" import FormStudy from "@/modules/05_leave/components/formDetail/formStudy.vue" import FormLeaveToTraining from "@/modules/05_leave/components/formDetail/formLeaveToTraining.vue" import FormLeaveToWorkInternational from "@/modules/05_leave/components/formDetail/formLeaveToWorkInternational.vue" @@ -125,6 +125,7 @@ const formData = reactive({ coupleDaySumTotalHistory: "", //ประวัติ ในกรณีลาติดต่อกับครั้งก่อน รวมทั้งนี้ด้วย เป็นเวลา กี่ปี กี่เดือน กี่วัน (ลาติดตามคู่สมรส) approveStep: "", dear: "", + leaveRange: "" }) /** Form รายละเอียดข้อมูล*/ const formDataCancle = reactive({ @@ -184,7 +185,8 @@ async function fetchDataDetail(id: string) { formData.leaveNumber = data.leaveNumber ?? "-" formData.leaveDetail = data.leaveDetail ?? "-" formData.leaveDocument = data.leaveDocument - formData.leaveDraftDocument = data.leaveDraftDocument + formData.leaveDocument = data.leaveDocument + formData.leaveRange = data.leaveRange formData.leaveLastStart = data.leaveLastStart && date2Thai(data.leaveLastStart) formData.leaveLastEnd = data.leaveLastStart && date2Thai(data.leaveLastEnd) // formData.leaveTotal = calculateDurationYmd(data.leaveStartDate, data.leaveEndDate) diff --git a/src/modules/05_leave/components/FormLeave/01_SickForm.vue b/src/modules/05_leave/components/FormLeave/01_SickForm.vue index 14b0f9f..b0ccf80 100644 --- a/src/modules/05_leave/components/FormLeave/01_SickForm.vue +++ b/src/modules/05_leave/components/FormLeave/01_SickForm.vue @@ -196,6 +196,7 @@ onMounted(() => { formDataSick.leaveTotal = props.data.leaveTotal; formDataSick.leaveNumber = props.data.leaveNumber; formDataSick.leaveDetail = props.data.leaveDetail; + formDataSick.leaveRange = props.data.leaveRange; leaveDocumentList.value = props.data.leaveDocument; formDataSick.leaveAddress = props.data.leaveAddress; statusCheck.value = props.data.status; diff --git a/src/modules/05_leave/components/FormLeave/03_Birth.vue b/src/modules/05_leave/components/FormLeave/03_Birth.vue index 58ac4e6..718939a 100644 --- a/src/modules/05_leave/components/FormLeave/03_Birth.vue +++ b/src/modules/05_leave/components/FormLeave/03_Birth.vue @@ -413,7 +413,6 @@ onMounted(() => { {{ "เอกสารแนบที่ " + (index + 1) }} { {{ "เอกสารแนบที่ " + (index + 1) }} { formDataVacation.leaveDetail = props.data.leaveDetail; leaveDocumentList.value = props.data.leaveDocument; statusCheck.value = props.data.status; + formDataVacation.leaveRange = props.data.leaveRange; // formDataVacation.leaveDocument = props.data.leaveDocument; } }); @@ -481,7 +482,6 @@ onMounted(() => { {{ "เอกสารแนบที่ " + (index + 1) }} ({ ordainDayLocationAddress: "", ordainDayBuddhistLentName: "", ordainDayBuddhistLentAddress: "", - ordainDayStatus: "true", - leaveDocument: null, + ordainDayStatus: true, + leaveDocument: [], + leaveDetail: "" }); /** maping ref เข้าตัวแปรเพื่อเตรียมตรวจสอบ */ @@ -113,21 +114,28 @@ function onValidate() { } } } + if (hasError.every((result) => result === true)) { const formData = new FormData(); - formDataOrdination.leaveDocument.forEach((file: File) => { - formData.append("leaveDocument", file); - }); + + if (formDataOrdination.leaveDocument) { + formDataOrdination.leaveDocument.forEach((file: File) => { + formData.append("leaveDocument", file); + }); + } // formData.append("leaveDocument", formDataOrdination.leaveDocument); formData.append("type", formDataOrdination.type); formData.append( "leaveStartDate", - dateToISO(formDataOrdination.leaveStartDate) + dateToISO(new Date(formDataOrdination.leaveStartDate)) + ); + formData.append( + "leaveEndDate", + dateToISO(new Date(formDataOrdination.leaveEndDate)) ); - formData.append("leaveEndDate", dateToISO(formDataOrdination.leaveEndDate)); formData.append( "ordainDayOrdination", - dateToISO(formDataOrdination.ordainDayOrdination) + dateToISO(new Date(formDataOrdination.ordainDayOrdination)) ); formData.append( "ordainDayLocationName", @@ -611,7 +619,7 @@ onMounted(() => { label="รายละเอียด" :readonly="!edit || statusCheck === 'NEW'" /> -
+
{ outlined bg-color="white" use-chips + class="col-12 q-pl-sm col-12" >