From 13bc2b2003b10820fb879f284d70ac0ce8272ba8 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Tue, 29 Apr 2025 22:09:30 +0700
Subject: [PATCH] =?UTF-8?q?fixing=20=E0=B8=A2=E0=B8=81=E0=B9=80=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=81=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A5=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/05_leave/components/DialogDetail.vue          | 3 +++
 src/modules/05_leave/components/formDetail/formCancel.vue | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

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({
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">สถานะการขอยกเลิก</div>
       <div class="col-xs-12 col-md-6">
-        {{ props.data.status ? props.data.status : "-" }}
+        {{ props.data.status != "ใหม่" ? props.data.status : "-" }}
       </div>
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">ความคิดเห็นของผู้มีอำนาจ</div>
       <div class="col-xs-12 col-md-6">
         {{
-          props.data.leaveDirectorComment
+          props.data.leaveDirectorComment && props.data.status != "ใหม่"
             ? props.data.leaveDirectorComment
             : "-"
         }}