From f039dc5e8dfd874360f8f5fb977abafa3203c829 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 31 Oct 2024 15:14:08 +0700
Subject: [PATCH] fix form leave

---
 .../FormLeave/13_RehabilitationForm.vue       | 15 +++++++
 .../formDetail/12_FollowSpouseForm.vue        | 40 ++++++++++++++++---
 .../formDetail/13_RehabilitationForm.vue      |  6 +++
 3 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue b/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue
index 8ca8aa9..fb8d955 100644
--- a/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue
+++ b/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue
@@ -161,6 +161,8 @@ const leaveDocumentList = ref<any>();
 const leaveDraftDocument = ref<string>();
 const statusCheck = ref<string>("");
 watch(props.data, () => {
+  console.log(props.data);
+
   if (props.data) {
     formDataRehabilitation.leaveWrote = props.data.leaveWrote;
     formDataRehabilitation.leaveStartDate = new Date(props.data.leaveStartDate);
@@ -321,6 +323,19 @@ onMounted(() => {
           </template>
         </datepicker>
 
+        <q-input
+          class="col-12 col-md-4 col-sm-12"
+          dense
+          outlined
+          readonly
+          hide-bottom-space
+          bg-color="white"
+          ref="coupleDayTotalHistoryRef"
+          for="coupleDayTotalHistoryRef"
+          v-model="formDataRehabilitation.leaveTotal"
+          label="เป็นเวลา"
+        />
+
         <q-input
           v-model="formDataRehabilitation.leaveDetail"
           :readonly="!edit || statusCheck === 'NEW'"
diff --git a/src/modules/05_leave/components/formDetail/12_FollowSpouseForm.vue b/src/modules/05_leave/components/formDetail/12_FollowSpouseForm.vue
index 30d0056..4b1aedc 100644
--- a/src/modules/05_leave/components/formDetail/12_FollowSpouseForm.vue
+++ b/src/modules/05_leave/components/formDetail/12_FollowSpouseForm.vue
@@ -81,11 +81,41 @@ const props = defineProps({
         </div>
       </div>
       <div class="col-xs-12 col-md-6">
-        <div>{{ props.data.coupleDayCountryHistory }}</div>
-        <div>{{ props.data.coupleDayTotalHistory }}</div>
-        <div>{{ props.data.coupleDayStartDateHistory }}</div>
-        <div>{{ props.data.coupleDayEndDateHistory }}</div>
-        <div>{{ props.data.coupleDaySumTotalHistory }}</div>
+        <div>
+          {{
+            props.data.coupleDayCountryHistory
+              ? props.data.coupleDayCountryHistory
+              : "-"
+          }}
+        </div>
+        <div>
+          {{
+            props.data.coupleDayTotalHistory
+              ? props.data.coupleDayTotalHistory
+              : "-"
+          }}
+        </div>
+        <div>
+          {{
+            props.data.coupleDayStartDateHistory
+              ? props.data.coupleDayStartDateHistory
+              : "-"
+          }}
+        </div>
+        <div>
+          {{
+            props.data.coupleDayEndDateHistory
+              ? props.data.coupleDayEndDateHistory
+              : "-"
+          }}
+        </div>
+        <div>
+          {{
+            props.data.coupleDaySumTotalHistory
+              ? props.data.coupleDaySumTotalHistory
+              : ""
+          }}
+        </div>
       </div>
     </div>
     <div class="row">
diff --git a/src/modules/05_leave/components/formDetail/13_RehabilitationForm.vue b/src/modules/05_leave/components/formDetail/13_RehabilitationForm.vue
index c5413cf..8cd324c 100644
--- a/src/modules/05_leave/components/formDetail/13_RehabilitationForm.vue
+++ b/src/modules/05_leave/components/formDetail/13_RehabilitationForm.vue
@@ -31,6 +31,12 @@ const props = defineProps({
       <div class="col-xs-12 col-md-6 text-grey-8">ลาถึงวันที่</div>
       <div class="col-xs-12 col-md-6">{{ props.data.leaveDateEnd }}</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.leaveCount ? props.data.leaveCount : "-" }}
+      </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">