refactor(leave): display dateSendLeave when status is not DRAFT
Co-authored-by: Copilot <copilot@github.com>
This commit is contained in:
parent
a5ba0290d9
commit
e3df43421b
13 changed files with 199 additions and 61 deletions
|
|
@ -206,7 +206,7 @@ async function fetchDataDetail(id: string) {
|
|||
formData.leaveDateEnd = data.leaveEndDate && date2Thai(data.leaveEndDate);
|
||||
formData.leaveCount = calculateDurationYmd(
|
||||
data.leaveStartDate,
|
||||
data.leaveEndDate
|
||||
data.leaveEndDate,
|
||||
);
|
||||
formData.leaveWrote = data.leaveWrote ?? "-";
|
||||
formData.leaveAddress = data.leaveAddress ?? "-";
|
||||
|
|
@ -255,8 +255,7 @@ async function fetchDataDetail(id: string) {
|
|||
formData.studyDaySubject = data.studyDaySubject ?? "-";
|
||||
formData.studyDayDegreeLevel = data.studyDayDegreeLevel ?? "-";
|
||||
formData.studyDayUniversityName = data.studyDayUniversityName ?? "-";
|
||||
formData.studyDayTrainingSubject =
|
||||
data.studyDayTrainingSubject ?? "-" ?? "-";
|
||||
formData.studyDayTrainingSubject = data.studyDayTrainingSubject ?? "-";
|
||||
formData.studyDayTrainingName = data.studyDayTrainingName ?? "-";
|
||||
formData.studyDayCountry = data.studyDayCountry ?? "-";
|
||||
formData.studyDayScholarship = data.studyDayScholarship ?? "-";
|
||||
|
|
@ -383,7 +382,7 @@ async function onClickSave() {
|
|||
onSubmit();
|
||||
},
|
||||
"ยืนยันการบันทึกข้อมูล",
|
||||
"ต้องการยินยันการบันทึกข้อมูลนี้หรือไม่ ?"
|
||||
"ต้องการยินยันการบันทึกข้อมูลนี้หรือไม่ ?",
|
||||
);
|
||||
} else {
|
||||
}
|
||||
|
|
@ -425,7 +424,7 @@ watch(
|
|||
? props.leaveId && fetchDataCancelDetail(props.leaveId)
|
||||
: props.leaveId && fetchDataDetail(props.leaveId);
|
||||
}
|
||||
}
|
||||
},
|
||||
);
|
||||
</script>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue