diff --git a/src/modules/05_leave/components/DialogDetail.vue b/src/modules/05_leave/components/DialogDetail.vue index 8139d16..3d26510 100644 --- a/src/modules/05_leave/components/DialogDetail.vue +++ b/src/modules/05_leave/components/DialogDetail.vue @@ -353,6 +353,9 @@ async function fetchDataCancelDetail(id: string) { formDataCancle.leaveDetail = data.leaveDetail ?? "-"; formDataCancle.leaveSubTypeName = data.leaveSubTypeName ?? null; formDataCancle.leaveDocDelete = data.leaveDocDelete ?? null; + formDataCancle.leaveRange = data.leaveRange; + formDataCancle.leaveRangeEnd = data.leaveRangeEnd; + formDataCancle.leaveDirectorComment = data.leaveDirectorComment; }) .catch((err) => { messageError($q, err); diff --git a/src/modules/05_leave/components/formDetail/formCancel.vue b/src/modules/05_leave/components/formDetail/formCancel.vue index c43564e..4444b9e 100644 --- a/src/modules/05_leave/components/formDetail/formCancel.vue +++ b/src/modules/05_leave/components/formDetail/formCancel.vue @@ -102,14 +102,14 @@ const props = defineProps({
สถานะการขอยกเลิก
- {{ props.data.status ? props.data.status : "-" }} + {{ props.data.status != "ใหม่" ? props.data.status : "-" }}
ความคิดเห็นของผู้มีอำนาจ
{{ - props.data.leaveDirectorComment + props.data.leaveDirectorComment && props.data.status != "ใหม่" ? props.data.leaveDirectorComment : "-" }}