From 41749fbcfdd23c890e0592448c2d30fd76340d52 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Thu, 14 Dec 2023 11:34:30 +0700 Subject: [PATCH] no message --- .../components/2_Leave/DetailLeave.vue | 138 ++++++++++++------ 1 file changed, 93 insertions(+), 45 deletions(-) diff --git a/src/modules/09_leave/components/2_Leave/DetailLeave.vue b/src/modules/09_leave/components/2_Leave/DetailLeave.vue index dbae7f7fd..55625d3f8 100644 --- a/src/modules/09_leave/components/2_Leave/DetailLeave.vue +++ b/src/modules/09_leave/components/2_Leave/DetailLeave.vue @@ -158,82 +158,130 @@ async function fetchDetailLeave(paramsId: string) { ? data.reasonCommander : "-"; formData.reasonOligarch = data.reasonOligarch ? data.reasonOligarch : "-"; - formData.positionName = data.positionName; - formData.positionLevelName = data.positionLevelName; - formData.organizationName = data.organizationName; - formData.leaveTypeName = data.leaveTypeName; - formData.leaveTypeId = data.leaveTypeId; - formData.fullName = data.fullName; + formData.positionName = data.positionName ? data.positionName : "-"; + formData.positionLevelName = data.positionLevelName + ? data.positionLevelName + : "-"; + formData.organizationName = data.organizationName + ? data.organizationName + : "-"; + formData.leaveTypeName = data.leaveTypeName ? data.leaveTypeName : "-"; + formData.leaveTypeId = data.leaveTypeId ? data.leaveTypeId : "-"; + formData.fullName = data.fullName ? data.fullName : "-"; formData.dateSendLeave = data.dateSendLeave && date2Thai(data.dateSendLeave); formData.leaveDateStart = data.leaveStartDate && date2Thai(data.leaveStartDate); formData.leaveDateEnd = data.leaveEndDate && date2Thai(data.leaveEndDate); - formData.leaveCount = data.leaveCount; + formData.leaveCount = data.leaveCount ? data.leaveCount : "0"; formData.status = data.status && stores.convertSatatus(data.status); - formData.leaveLimit = data.leaveLimit; - formData.leaveSummary = data.leaveSummary; - formData.leaveRemain = data.leaveRemain; - formData.leaveWrote = data.leaveWrote; - formData.leaveAddress = data.leaveAddress; - formData.leaveNumber = data.leaveNumber; - formData.leaveDetail = data.leaveDetail; + formData.leaveLimit = data.leaveLimit ? data.leaveLimit : "0"; + formData.leaveSummary = data.leaveSummary ? data.leaveSummary : "0"; + formData.leaveRemain = data.leaveRemain ? data.leaveRemain : "0"; + formData.leaveWrote = data.leaveWrote ? data.leaveWrote : "-"; + formData.leaveAddress = data.leaveAddress ? data.leaveAddress : "-"; + formData.leaveNumber = data.leaveNumber ? data.leaveNumber : "-"; + formData.leaveDetail = data.leaveDetail ? data.leaveDetail : "-"; formData.leaveDocument = data.leaveDocument; formData.leaveDraftDocument = data.leaveDraftDocument; formData.leaveLastStart = data.leaveLastStart && date2Thai(data.leaveLastStart); formData.leaveLastEnd = data.leaveLastStart && date2Thai(data.leaveLastEnd); - formData.leaveTotal = data.leaveTotal; + formData.leaveTotal = data.leaveTotal ? data.leaveTotal : "0"; formData.leavebirthDate = - data.leavebirthDate && date2Thai(data.leavebirthDate); + data.leaveBirthDate && date2Thai(data.leaveBirthDate); formData.leavegovernmentDate = - data.leavegovernmentDate && date2Thai(data.leavegovernmentDate); - formData.leaveSalary = data.leaveSalary; - formData.leaveSalaryText = data.leaveSalaryText; + data.leaveGovernmentDate && date2Thai(data.leaveGovernmentDate); + formData.leaveSalary = data.leaveSalary ? data.leaveSalary : "-"; + formData.leaveSalaryText = data.leaveSalaryText ? data.leaveSalaryText : "-"; formData.leaveTypeDay = data.leaveTypeDay && stores.convertLeaveDaytype(data.leaveTypeDay); - formData.wifeDayName = data.wifeDayName; + formData.wifeDayName = data.wifeDayName ? data.wifeDayName : "-"; formData.wifeDayDateBorn = data.wifeDayDateBorn && date2Thai(data.wifeDayDateBorn); - formData.restDayOldTotal = data.restDayOldTotal; - formData.restDayCurrentTotal = data.restDayCurrentTotal; + formData.restDayOldTotal = data.restDayOldTotal + ? data.restDayOldTotal + : "0"; + formData.restDayCurrentTotal = data.restDayCurrentTotal + ? data.restDayCurrentTotal + : "0"; formData.ordainDayStatus = data.ordainDayStatus; - formData.ordainDayLocationName = data.ordainDayLocationName; - formData.ordainDayLocationAddress = data.ordainDayLocationAddress; - formData.ordainDayLocationNumber = data.ordainDayLocationNumber; + formData.ordainDayLocationName = data.ordainDayLocationName + ? data.ordainDayLocationName + : "-"; + formData.ordainDayLocationAddress = data.ordainDayLocationAddress + ? data.ordainDayLocationAddress + : "-"; + formData.ordainDayLocationNumber = data.ordainDayLocationNumber + ? data.ordainDayLocationNumber + : "-"; formData.ordainDayOrdination = data.ordainDayOrdination && date2Thai(data.ordainDayOrdination); - formData.ordainDayBuddhistLentName = data.ordainDayBuddhistLentName; - formData.ordainDayBuddhistLentAddress = data.ordainDayBuddhistLentAddress; + formData.ordainDayBuddhistLentName = data.ordainDayBuddhistLentName + ? data.ordainDayBuddhistLentName + : "-"; + formData.ordainDayBuddhistLentAddress = data.ordainDayBuddhistLentAddress + ? data.ordainDayBuddhistLentAddress + : "-"; formData.hajjDayStatus = data.hajjDayStatus; - formData.absentDaySummon = data.absentDaySummon; - formData.absentDayLocation = data.absentDayLocation; + formData.absentDaySummon = data.absentDaySummon + ? data.absentDaySummon + : "-"; + formData.absentDayLocation = data.absentDayLocation + ? data.absentDayLocation + : "-"; formData.absentDayRegistorDate = data.absentDayRegistorDate && date2Thai(data.absentDayRegistorDate); - formData.absentDayGetIn = data.absentDayGetIn; - formData.absentDayAt = data.absentDayAt; - formData.studyDaySubject = data.studyDaySubject; - formData.studyDayDegreeLevel = data.studyDayDegreeLevel; - formData.studyDayUniversityName = data.studyDayUniversityName; - formData.studyDayTrainingSubject = data.studyDayTrainingSubject; - formData.studyDayTrainingName = data.studyDayTrainingName; - formData.studyDayCountry = data.studyDayCountry; - formData.studyDayScholarship = data.studyDayScholarship; - formData.coupleDayName = data.coupleDayName; - formData.coupleDayPosition = data.coupleDayPosition; - formData.coupleDayLevel = data.coupleDayLevel; - formData.coupleDayLevelCountry = data.coupleDayLevelCountry; - formData.coupleDayCountryHistory = data.coupleDayCountryHistory; - formData.coupleDayTotalHistory = data.coupleDayTotalHistory; + formData.absentDayGetIn = data.absentDayGetIn ? data.absentDayGetIn : "-"; + formData.absentDayAt = data.absentDayAt ? data.absentDayAt : "-"; + formData.studyDaySubject = data.studyDaySubject + ? data.studyDaySubject + : "-"; + formData.studyDayDegreeLevel = data.studyDayDegreeLevel + ? data.studyDayDegreeLevel + : "-"; + formData.studyDayUniversityName = data.studyDayUniversityName + ? data.studyDayUniversityName + : "-"; + formData.studyDayTrainingSubject = data.studyDayTrainingSubject + ? data.studyDayTrainingSubject + : "-"; + formData.studyDayTrainingName = data.studyDayTrainingName + ? data.studyDayTrainingName + : "-"; + formData.studyDayCountry = data.studyDayCountry + ? data.studyDayCountry + : "-"; + formData.studyDayScholarship = data.studyDayScholarship + ? data.studyDayScholarship + : "-"; + formData.coupleDayName = data.coupleDayName ? data.coupleDayName : "-"; + formData.coupleDayPosition = data.coupleDayPosition + ? data.coupleDayPosition + : "-"; + formData.coupleDayLevel = data.coupleDayLevel ? data.coupleDayLevel : "-"; + formData.coupleDayLevelCountry = data.coupleDayLevelCountry + ? data.coupleDayLevelCountry + : "-"; + formData.coupleDayCountryHistory = data.coupleDayCountryHistory + ? data.coupleDayCountryHistory + : "-"; + formData.coupleDayTotalHistory = data.coupleDayTotalHistory + ? data.coupleDayTotalHistory + : "-"; formData.coupleDayStartDateHistory = data.coupleDayStartDateHistory && date2Thai(data.coupleDayStartDateHistory); formData.coupleDayEndDateHistory = data.coupleDayEndDateHistory && date2Thai(data.coupleDayEndDateHistory); - formData.coupleDaySumTotalHistory = data.coupleDaySumTotalHistory; + formData.coupleDaySumTotalHistory = data.coupleDaySumTotalHistory + ? data.coupleDaySumTotalHistory + : "-"; formData.approveStep = data.approveStep; formData.dear = data.dear ? data.dear : "-"; + console.log(formData); + await fectOptionType(); /** ส่งประเภทของการลาไป Function เช็คประเภทการลา*/