From c2ed540633d8c771fa3c43abb79c4865fd50c58f Mon Sep 17 00:00:00 2001 From: waruneeta Date: Tue, 23 Jan 2024 10:20:31 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=AA=E0=B9=88?= =?UTF-8?q?=E0=B8=87=20totalLeave=20=E0=B8=88=E0=B8=B2=E0=B8=81=20Frontend?= =?UTF-8?q?=20=E0=B9=81=E0=B8=97=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/FormLeave/01_SickForm.vue | 1 + .../components/FormLeave/03_Birth.vue | 1 + .../FormLeave/04_HelpWifeBirthForm.vue | 2 + .../components/FormLeave/05_VacationForm.vue | 1 + .../FormLeave/06_OrdinationForm.vue | 1 + .../components/FormLeave/07_HajjForm.vue | 1 + .../components/FormLeave/08_MilitaryForm.vue | 1 + .../components/FormLeave/09_StudyForm.vue | 1260 +++++++++-------- .../components/FormLeave/10_TrainForm.vue | 6 +- .../FormLeave/11_WorkInternationalForm.vue | 3 +- .../FormLeave/12_FollowSpouseForm.vue | 4 +- .../FormLeave/13_RehabilitationForm.vue | 2 + 12 files changed, 650 insertions(+), 633 deletions(-) diff --git a/src/modules/05_leave/components/FormLeave/01_SickForm.vue b/src/modules/05_leave/components/FormLeave/01_SickForm.vue index d9b8126..2e1567e 100644 --- a/src/modules/05_leave/components/FormLeave/01_SickForm.vue +++ b/src/modules/05_leave/components/FormLeave/01_SickForm.vue @@ -135,6 +135,7 @@ function onValidate() { formData.append("leaveAddress", formDataSick.leaveAddress); formData.append("leaveNumber", formDataSick.leaveNumber); formData.append("leaveDetail", formDataSick.leaveDetail); + formData.append("leaveTotal", formDataSick.leaveTotal); props.onSubmit(formData, isLeave.value); } } diff --git a/src/modules/05_leave/components/FormLeave/03_Birth.vue b/src/modules/05_leave/components/FormLeave/03_Birth.vue index 5dfb8e2..7c5b7dc 100644 --- a/src/modules/05_leave/components/FormLeave/03_Birth.vue +++ b/src/modules/05_leave/components/FormLeave/03_Birth.vue @@ -116,6 +116,7 @@ function onValidate() { formData.append("leaveAddress", formDataBirth.leaveAddress); formData.append("leaveNumber", formDataBirth.leaveNumber); formData.append("leaveDetail", formDataBirth.leaveDetail); + formData.append("leaveTotal", formDataBirth.leaveTotal); props.onSubmit(formData, isLeave.value); } diff --git a/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue b/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue index 16dac1b..8059f15 100644 --- a/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue +++ b/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue @@ -135,6 +135,8 @@ function onValidate() { "wifeDayDateBorn", dateToISO(new Date(formDataHelpWife.wifeDayDateBorn)) ); + formData.append("leaveTotal", formDataHelpWife.leaveTotal); + props.onSubmit(formData, isLeave.value); } } diff --git a/src/modules/05_leave/components/FormLeave/05_VacationForm.vue b/src/modules/05_leave/components/FormLeave/05_VacationForm.vue index 1434c07..817c835 100644 --- a/src/modules/05_leave/components/FormLeave/05_VacationForm.vue +++ b/src/modules/05_leave/components/FormLeave/05_VacationForm.vue @@ -128,6 +128,7 @@ function onValidate() { formData.append("leaveAddress", formDataVacation.leaveAddress); formData.append("leaveNumber", formDataVacation.leaveNumber); formData.append("leaveDetail", formDataVacation.leaveDetail); + formData.append("leaveTotal", formDataVacation.leaveTotal); props.onSubmit(formData, isLeave.value); } } diff --git a/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue b/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue index 839713b..26a4c4f 100644 --- a/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue +++ b/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue @@ -165,6 +165,7 @@ function onValidate() { formData.append("ordainDayStatus", formDataOrdination.ordainDayStatus); formData.append("leaveWrote", formDataOrdination.leaveWrote); formData.append("leaveDetail", formDataOrdination.leaveDetail); + formData.append("leaveTotal", formDataOrdination.leaveTotal); props.onSubmit(formData, isLeave.value); } } diff --git a/src/modules/05_leave/components/FormLeave/07_HajjForm.vue b/src/modules/05_leave/components/FormLeave/07_HajjForm.vue index 09e7e51..50e3bd6 100644 --- a/src/modules/05_leave/components/FormLeave/07_HajjForm.vue +++ b/src/modules/05_leave/components/FormLeave/07_HajjForm.vue @@ -116,6 +116,7 @@ function onValidate() { formData.append("hajjDayStatus", formDataHaji.hajjDayStatus); formData.append("leaveWrote", formDataHaji.leaveWrote); formData.append("leaveDetail", formDataHaji.leaveDetail); + formData.append("leaveTotal", formDataHaji.leaveTotal); props.onSubmit(formData, isLeave.value); } } diff --git a/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue b/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue index 3e55514..9ab3a9a 100644 --- a/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue +++ b/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue @@ -134,6 +134,7 @@ function onValidate() { formData.append("absentDayAt", formDataMilitary.absentDayAt); formData.append("leaveWrote", formDataMilitary.leaveWrote); formData.append("leaveDetail", formDataMilitary.leaveDetail); + formData.append("leaveTotal", formDataMilitary.leaveTotal); props.onSubmit(formData, isLeave.value); } } diff --git a/src/modules/05_leave/components/FormLeave/09_StudyForm.vue b/src/modules/05_leave/components/FormLeave/09_StudyForm.vue index d3b0fd8..0810791 100644 --- a/src/modules/05_leave/components/FormLeave/09_StudyForm.vue +++ b/src/modules/05_leave/components/FormLeave/09_StudyForm.vue @@ -14,14 +14,14 @@ const $q = useQuasar(); const router = useRouter(); const mixin = useCounterMixin(); const { - date2Thai, - dialogRemove, - calculateDurationYmd, - fails, - dateToISO, - success, - messageError, - arabicNumberToText, + date2Thai, + dialogRemove, + calculateDurationYmd, + fails, + dateToISO, + success, + messageError, + arabicNumberToText, } = mixin; const edit = ref(true); const files = ref(null); @@ -44,124 +44,126 @@ const leaveWroteRef = ref(null); /** รับ props มาจากหน้าหลัก */ const props = defineProps({ - data: { - type: Object, - default: null, - }, - onSubmit: { - type: Function, - default: () => "", - }, - onConfirm: { - type: Function, - default: () => "", - }, - clickDelete: { - type: Function, - default: () => "", - }, + data: { + type: Object, + default: null, + }, + onSubmit: { + type: Function, + default: () => "", + }, + onConfirm: { + type: Function, + default: () => "", + }, + clickDelete: { + type: Function, + default: () => "", + }, }); /** ข้อมูล v-model ของฟอร์ม */ const formDataStudy = reactive({ - type: dataStore.typeId, // - leaveWrote: "", // - leaveStartDate: null, - leaveEndDate: null, - leavebirthDate: new Date(), - leavegovernmentDate: new Date(), - leaveSalary: 10000, - leaveSalaryText: arabicNumberToText(10000), - leaveNumber: "", - leaveAddress: "", - studyDayScholarship: "", - studyDayCountry: "", - studyDayUniversityName: "", // - studyDayDegreeLevel: "", // - studyDaySubject: "", // - leaveDocument: [], // - leaveDetail: "", - leaveTotal: "", + type: dataStore.typeId, // + leaveWrote: "", // + leaveStartDate: null, + leaveEndDate: null, + leavebirthDate: new Date(), + leavegovernmentDate: new Date(), + leaveSalary: 10000, + leaveSalaryText: arabicNumberToText(10000), + leaveNumber: "", + leaveAddress: "", + studyDayScholarship: "", + studyDayCountry: "", + studyDayUniversityName: "", // + studyDayDegreeLevel: "", // + studyDaySubject: "", // + leaveDocument: [], // + leaveDetail: "", + leaveTotal: "", + leaveTotalDay: "", //จำนวนวันลา }); /** maping ref เข้าตัวแปรเพื่อเตรียมตรวจสอบ */ const formRef: studyDaySubjectForm = { - leaveStartDate: leaveStartDateRef, - leaveEndDate: leaveEndDateRef, - leavebirthDate: leavebirthDateRef, - leavegovernmentDate: leavegovernmentDateRef, - leaveSalary: leaveSalaryRef, - leaveNumber: leaveNumberRef, - leaveAddress: leaveAddressRef, - studyDayScholarship: studyDayScholarshipRef, - studyDayCountry: studyDayCountryRef, - studyDayUniversityName: studyDayUniversityNameRef, - studyDayDegreeLevel: studyDayDegreeLevelRef, - studyDaySubject: studyDaySubjectRef, - leaveWrote: leaveWroteRef, + leaveStartDate: leaveStartDateRef, + leaveEndDate: leaveEndDateRef, + leavebirthDate: leavebirthDateRef, + leavegovernmentDate: leavegovernmentDateRef, + leaveSalary: leaveSalaryRef, + leaveNumber: leaveNumberRef, + leaveAddress: leaveAddressRef, + studyDayScholarship: studyDayScholarshipRef, + studyDayCountry: studyDayCountryRef, + studyDayUniversityName: studyDayUniversityNameRef, + studyDayDegreeLevel: studyDayDegreeLevelRef, + studyDaySubject: studyDaySubjectRef, + leaveWrote: leaveWroteRef, }; /** ส่วนของการประกาศและเลือกไฟล์เอกสารประกอบ */ const nameFile = ref(""); const fileDocDataUpload = ref([]); const fileUploadDoc = async (files: any) => { - files.forEach((file: any) => { - fileDocDataUpload.value.push(file); - }); + files.forEach((file: any) => { + fileDocDataUpload.value.push(file); + }); }; /** ฟังก์ชั่นตรวจสอบความถูกต้องก่อน บันทึก */ function onValidate() { - const hasError = []; - for (const key in formRef) { - if (Object.prototype.hasOwnProperty.call(formRef, key)) { - const property = formRef[key]; - if (property.value && typeof property.value.validate === "function") { - const isValid = property.value.validate(); - hasError.push(isValid); - } - } - } - if (hasError.every((result) => result === true)) { - const formData = new FormData(); - if (formDataStudy.leaveDocument) { - formDataStudy.leaveDocument.forEach((file: File) => { - formData.append("leaveDocument", file); - }); - } - // formData.append("leaveDocument", formDataStudy.leaveDocument); - formData.append("type", formDataStudy.type); // - formData.append( - "leaveStartDate", - dateToISO(new Date(formDataStudy.leaveStartDate)) - ); - formData.append( - "leaveEndDate", - dateToISO(new Date(formDataStudy.leaveEndDate)) - ); - formData.append("studyDaySubject", formDataStudy.studyDaySubject); - formData.append("studyDayDegreeLevel", formDataStudy.studyDayDegreeLevel); - // formData.append( - // "leavegovernmentDate", - // dateToISO(new Date(formDataStudy.leavegovernmentDate)) - // ); - formData.append( - "studyDayUniversityName", - formDataStudy.studyDayUniversityName - ); - formData.append("studyDayCountry", formDataStudy.studyDayCountry); - formData.append("leaveWrote", formDataStudy.leaveWrote); // - formData.append("leaveDetail", formDataStudy.leaveDetail); // - formData.append("studyDayScholarship", formDataStudy.studyDayScholarship); - formData.append("leaveAddress", formDataStudy.leaveAddress); // - formData.append("leaveNumber", formDataStudy.leaveNumber); // - props.onSubmit(formData, isLeave.value); - } + const hasError = []; + for (const key in formRef) { + if (Object.prototype.hasOwnProperty.call(formRef, key)) { + const property = formRef[key]; + if (property.value && typeof property.value.validate === "function") { + const isValid = property.value.validate(); + hasError.push(isValid); + } + } + } + if (hasError.every((result) => result === true)) { + const formData = new FormData(); + if (formDataStudy.leaveDocument) { + formDataStudy.leaveDocument.forEach((file: File) => { + formData.append("leaveDocument", file); + }); + } + // formData.append("leaveDocument", formDataStudy.leaveDocument); + formData.append("type", formDataStudy.type); // + formData.append( + "leaveStartDate", + dateToISO(new Date(formDataStudy.leaveStartDate)) + ); + formData.append( + "leaveEndDate", + dateToISO(new Date(formDataStudy.leaveEndDate)) + ); + formData.append("studyDaySubject", formDataStudy.studyDaySubject); + formData.append("studyDayDegreeLevel", formDataStudy.studyDayDegreeLevel); + // formData.append( + // "leavegovernmentDate", + // dateToISO(new Date(formDataStudy.leavegovernmentDate)) + // ); + formData.append( + "studyDayUniversityName", + formDataStudy.studyDayUniversityName + ); + formData.append("studyDayCountry", formDataStudy.studyDayCountry); + formData.append("leaveWrote", formDataStudy.leaveWrote); // + formData.append("leaveDetail", formDataStudy.leaveDetail); // + formData.append("studyDayScholarship", formDataStudy.studyDayScholarship); + formData.append("leaveAddress", formDataStudy.leaveAddress); // + formData.append("leaveNumber", formDataStudy.leaveNumber); // + formData.append("leaveTotal", formDataStudy.leaveTotalDay); // + props.onSubmit(formData, isLeave.value); + } } /** แจ้งเมื่อวันลาไม่ถูกต้อง */ const dateEndInputStyle = computed(() => { - return !isLeave.value ? "input-alert" : ""; + return !isLeave.value ? "input-alert" : ""; }); /** @@ -170,567 +172,567 @@ const dateEndInputStyle = computed(() => { */ const isLeave = ref(true); async function fetchCheck() { - await http - .post(config.API.leaveCheck(), { - type: dataStore.typeId ?? null, - StartLeaveDate: formDataStudy.leaveStartDate ?? null, - EndLeaveDate: formDataStudy.leaveEndDate ?? null, - }) - .then((res: any) => { - const data = res.data.result; - isLeave.value = data.isLeave; - // formDataStudy.leaveTotal = formDataStudy.leaveStartDatee; - }) - .catch((e: any) => { - messageError($q, e); - }); + await http + .post(config.API.leaveCheck(), { + type: dataStore.typeId ?? null, + StartLeaveDate: formDataStudy.leaveStartDate ?? null, + EndLeaveDate: formDataStudy.leaveEndDate ?? null, + }) + .then((res: any) => { + const data = res.data.result; + isLeave.value = data.isLeave; + formDataStudy.leaveTotalDay = data.totalDate; + }) + .catch((e: any) => { + messageError($q, e); + }); } /** * function อัพเดทค่า LeaveTotal */ function updateLeaveTotal() { - const newLeaveTotal = calculateDurationYmd( - formDataStudy.leaveStartDate, - formDataStudy.leaveEndDate - ); - formDataStudy.leaveTotal = newLeaveTotal; + const newLeaveTotal = calculateDurationYmd( + formDataStudy.leaveStartDate, + formDataStudy.leaveEndDate + ); + formDataStudy.leaveTotal = newLeaveTotal; } /** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาที่ฟอร์มไหม เมื่อมีการส่งจะ map ข้อมูลเข้า v-model ของฟอร์ม */ const leaveDocumentList = ref(); const statusCheck = ref(""); watch(props.data, async () => { - if (props.data) { - formDataStudy.leaveWrote = props.data.leaveWrote; - formDataStudy.leaveStartDate = props.data.leaveStartDate; - formDataStudy.leaveEndDate = props.data.leaveEndDate; - formDataStudy.leaveTotal = props.data.leaveTotal; - formDataStudy.leavebirthDate = props.data.leavebirthDate; - formDataStudy.leavegovernmentDate = props.data.leavegovernmentDate; - formDataStudy.leaveSalary = props.data.leaveSalary; - formDataStudy.leaveSalaryText = props.data.leaveSalaryText; - formDataStudy.leaveNumber = props.data.leaveNumber; - formDataStudy.leaveAddress = props.data.leaveAddress; - formDataStudy.studyDayScholarship = props.data.studyDayScholarship; - formDataStudy.studyDayCountry = props.data.studyDayCountry; - formDataStudy.studyDayUniversityName = props.data.studyDayUniversityName; - formDataStudy.studyDayDegreeLevel = props.data.studyDayDegreeLevel; - formDataStudy.studyDaySubject = props.data.studyDaySubject; - // formDataStudy.leaveDocument = props.data.leaveDocument; - formDataStudy.leaveDetail = props.data.leaveDetail; - formDataStudy.leaveDocument = []; - leaveDocumentList.value = props.data.leaveDocument; - const leaveTotal = await calculateDurationYmd( - props.data.leaveStartDate, - props.data.leaveEndDate - ); - formDataStudy.leaveTotal = leaveTotal; - statusCheck.value = props.data.status; - } + if (props.data) { + formDataStudy.leaveWrote = props.data.leaveWrote; + formDataStudy.leaveStartDate = props.data.leaveStartDate; + formDataStudy.leaveEndDate = props.data.leaveEndDate; + formDataStudy.leaveTotal = props.data.leaveTotal; + formDataStudy.leavebirthDate = props.data.leavebirthDate; + formDataStudy.leavegovernmentDate = props.data.leavegovernmentDate; + formDataStudy.leaveSalary = props.data.leaveSalary; + formDataStudy.leaveSalaryText = props.data.leaveSalaryText; + formDataStudy.leaveNumber = props.data.leaveNumber; + formDataStudy.leaveAddress = props.data.leaveAddress; + formDataStudy.studyDayScholarship = props.data.studyDayScholarship; + formDataStudy.studyDayCountry = props.data.studyDayCountry; + formDataStudy.studyDayUniversityName = props.data.studyDayUniversityName; + formDataStudy.studyDayDegreeLevel = props.data.studyDayDegreeLevel; + formDataStudy.studyDaySubject = props.data.studyDaySubject; + // formDataStudy.leaveDocument = props.data.leaveDocument; + formDataStudy.leaveDetail = props.data.leaveDetail; + formDataStudy.leaveDocument = []; + leaveDocumentList.value = props.data.leaveDocument; + const leaveTotal = await calculateDurationYmd( + props.data.leaveStartDate, + props.data.leaveEndDate + ); + formDataStudy.leaveTotal = leaveTotal; + statusCheck.value = props.data.status; + } }); /**Hook */ onMounted(async () => { - if (props.data) { - formDataStudy.leaveWrote = props.data.leaveWrote; - formDataStudy.leaveStartDate = props.data.leaveStartDate; - formDataStudy.leaveEndDate = props.data.leaveEndDate; - formDataStudy.leaveTotal = props.data.leaveTotal; - formDataStudy.leavebirthDate = props.data.leavebirthDate; - formDataStudy.leavegovernmentDate = props.data.leavegovernmentDate; - formDataStudy.leaveSalary = props.data.leaveSalary; - formDataStudy.leaveSalaryText = props.data.leaveSalaryText; - formDataStudy.leaveNumber = props.data.leaveNumber; - formDataStudy.leaveAddress = props.data.leaveAddress; - formDataStudy.studyDayScholarship = props.data.studyDayScholarship; - formDataStudy.studyDayCountry = props.data.studyDayCountry; - formDataStudy.studyDayUniversityName = props.data.studyDayUniversityName; - formDataStudy.studyDayDegreeLevel = props.data.studyDayDegreeLevel; - formDataStudy.studyDaySubject = props.data.studyDaySubject; - // formDataStudy.leaveDocument = props.data.leaveDocument; - formDataStudy.leaveDetail = props.data.leaveDetail; - leaveDocumentList.value = props.data.leaveDocument; - const leaveTotal = await calculateDurationYmd( - props.data.leaveStartDate, - props.data.leaveEndDate - ); - formDataStudy.leaveTotal = leaveTotal; - statusCheck.value = props.data.status; - leaveId.value = props.data.id; - } + if (props.data) { + formDataStudy.leaveWrote = props.data.leaveWrote; + formDataStudy.leaveStartDate = props.data.leaveStartDate; + formDataStudy.leaveEndDate = props.data.leaveEndDate; + formDataStudy.leaveTotal = props.data.leaveTotal; + formDataStudy.leavebirthDate = props.data.leavebirthDate; + formDataStudy.leavegovernmentDate = props.data.leavegovernmentDate; + formDataStudy.leaveSalary = props.data.leaveSalary; + formDataStudy.leaveSalaryText = props.data.leaveSalaryText; + formDataStudy.leaveNumber = props.data.leaveNumber; + formDataStudy.leaveAddress = props.data.leaveAddress; + formDataStudy.studyDayScholarship = props.data.studyDayScholarship; + formDataStudy.studyDayCountry = props.data.studyDayCountry; + formDataStudy.studyDayUniversityName = props.data.studyDayUniversityName; + formDataStudy.studyDayDegreeLevel = props.data.studyDayDegreeLevel; + formDataStudy.studyDaySubject = props.data.studyDaySubject; + // formDataStudy.leaveDocument = props.data.leaveDocument; + formDataStudy.leaveDetail = props.data.leaveDetail; + leaveDocumentList.value = props.data.leaveDocument; + const leaveTotal = await calculateDurationYmd( + props.data.leaveStartDate, + props.data.leaveEndDate + ); + formDataStudy.leaveTotal = leaveTotal; + statusCheck.value = props.data.status; + leaveId.value = props.data.id; + } }); diff --git a/src/modules/05_leave/components/FormLeave/10_TrainForm.vue b/src/modules/05_leave/components/FormLeave/10_TrainForm.vue index 0ac5c1b..ef6a3b4 100644 --- a/src/modules/05_leave/components/FormLeave/10_TrainForm.vue +++ b/src/modules/05_leave/components/FormLeave/10_TrainForm.vue @@ -65,6 +65,8 @@ const formDataTrain = reactive({ studyDayTrainingName: "", leaveDocument: [], leaveDetail: "", + leaveTotal: "", //จำนวนวันลา + leaveTotalDay: "", //จำนวนวันลา }); /** ตัวแปร ref สำหรับแสดง validate */ @@ -152,7 +154,7 @@ function onValidate() { formData.append("leaveNumber", formDataTrain.leaveNumber); // formData.append("leaveSalaryText", formDataTrain.leaveSalaryText); // formData.append("leaveSalary", formDataTrain.leaveSalary); // - formData.append("leaveTotal", formDataTrain.leaveTotal); // + formData.append("leaveTotal", formDataTrain.leaveTotalDay); // props.onSubmit(formData, isLeave.value); } } @@ -173,7 +175,7 @@ async function fetchCheck() { .then((res: any) => { const data = res.data.result; isLeave.value = data.isLeave; - // formDataTrain.leaveTotal = data.totalDate; + formDataTrain.leaveTotalDay = data.totalDate; }) .catch((e: any) => { messageError($q, e); diff --git a/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue b/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue index e53edeb..22af512 100644 --- a/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue +++ b/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue @@ -125,7 +125,8 @@ async function onValidate() { dateToISO(formDataWorkInternational.leaveEndDate) ); // formData.append("leaveWrote", formDataWorkInternational.leaveWrote); // - formData.append("leaveDetail", formDataWorkInternational.leaveDetail); // + formData.append("leaveDetail", formDataWorkInternational.leaveDetail); + formData.append("leaveTotal", formDataWorkInternational.leaveTotal); // await props.onSubmit(formData, isLeave.value); } } diff --git a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue index d478536..227a859 100644 --- a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue +++ b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue @@ -56,6 +56,7 @@ const formDataFollowSpouse = reactive({ leaveStartDate: null, leaveEndDate: null, leaveTotal: "", //จำนวนวันลา + leaveTotalDay: "", //จำนวนวันลา leaveSalaryText: "", leaveSalary: 0, //เงินเดือนปัจจุบัน coupleDayName: "", //ชื่อคู่สมรส @@ -177,7 +178,7 @@ function onValidate() { formDataFollowSpouse.coupleDayPosition ); // formData.append("coupleDayName", formDataFollowSpouse.coupleDayName); // - formData.append("leaveTotal", formDataFollowSpouse.leaveTotal); // + formData.append("leaveTotal", formDataFollowSpouse.leaveTotalDay); // props.onSubmit(formData, isLeave.value); } } @@ -197,6 +198,7 @@ async function fetchCheck() { .then((res: any) => { const data = res.data.result; isLeave.value = data.isLeave; + formDataFollowSpouse.leaveTotalDay = data.totalDate; }) .catch((e: any) => { messageError($q, e); diff --git a/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue b/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue index 720d8c6..1c479e8 100644 --- a/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue +++ b/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue @@ -112,6 +112,7 @@ function onValidate() { ); formData.append("leaveWrote", formDataRehabilitation.leaveWrote); // formData.append("leaveDetail", formDataRehabilitation.leaveDetail); // + formData.append("leaveTotal", formDataRehabilitation.leaveTotal); // props.onSubmit(formData, isLeave.value); } } @@ -141,6 +142,7 @@ async function FetchCheck() { .then((res: any) => { const data = res.data.result; isLeave.value = data.isLeave; + formDataRehabilitation.leaveTotal = data.totalDate; }) .catch((e: any) => { messageError($q, e);