From b142dfcc768d2f3fc1e492554c7b9cff78904a38 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 16 Dec 2025 16:22:30 +0700
Subject: [PATCH] fix(leave):dislpay field null

---
 .../components/05_Leave/DetailLeavePage.vue   | 22 ++++----
 .../05_Leave/formDetail/formSpouse.vue        | 53 +++++++++++++++----
 2 files changed, 56 insertions(+), 19 deletions(-)

diff --git a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
index f0ac7daf3..7d71309a2 100644
--- a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
+++ b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
@@ -365,20 +365,24 @@ async function fetchDetailLeave(paramsId: string) {
       formData.coupleDayLevelCountry = data.coupleDayLevelCountry
         ? data.coupleDayLevelCountry
         : "-";
-      formData.coupleDayCountryHistory = data.coupleDayCountryHistory
-        ? data.coupleDayCountryHistory
-        : "-";
-      formData.coupleDayTotalHistory = data.coupleDayTotalHistory
-        ? data.coupleDayTotalHistory
-        : "-";
+      formData.coupleDayCountryHistory =
+        data.coupleDayCountryHistory && data.coupleDayCountryHistory !== "null"
+          ? data.coupleDayCountryHistory
+          : "-";
+      formData.coupleDayTotalHistory =
+        data.coupleDayTotalHistory && data.coupleDayTotalHistory !== "null"
+          ? data.coupleDayTotalHistory
+          : "-";
       formData.coupleDayStartDateHistory =
         data.coupleDayStartDateHistory &&
         date2Thai(data.coupleDayStartDateHistory);
       formData.coupleDayEndDateHistory =
         data.coupleDayEndDateHistory && date2Thai(data.coupleDayEndDateHistory);
-      formData.coupleDaySumTotalHistory = data.coupleDaySumTotalHistory
-        ? data.coupleDaySumTotalHistory
-        : "";
+      formData.coupleDaySumTotalHistory =
+        data.coupleDaySumTotalHistory &&
+        data.coupleDaySumTotalHistory !== "null"
+          ? data.coupleDaySumTotalHistory
+          : "";
       formData.approveStep = data.approveStep ? data.approveStep : "-";
       formData.dear = data.dear ? data.dear : "-";
       formData.profileType = data.profileType;
diff --git a/src/modules/09_leave/components/05_Leave/formDetail/formSpouse.vue b/src/modules/09_leave/components/05_Leave/formDetail/formSpouse.vue
index bf7596e93..cfe967acc 100644
--- a/src/modules/09_leave/components/05_Leave/formDetail/formSpouse.vue
+++ b/src/modules/09_leave/components/05_Leave/formDetail/formSpouse.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
 /** importStore */
 import { useCounterMixin } from "@/stores/mixin";
-import { useLeavelistDataStore } from '@/modules/09_leave/stores/LeaveStore'; 
+import { useLeavelistDataStore } from "@/modules/09_leave/stores/LeaveStore";
 
-const store = useLeavelistDataStore()
-const { converstType } = store
+const store = useLeavelistDataStore();
+const { converstType } = store;
 const mixin = useCounterMixin();
 const { calculateDurationYmd } = mixin;
 
@@ -51,15 +51,40 @@ function convertDateToEng(dataThia: string) {
       </div>
       <div class="row">
         <div class="col text-grey-8">ลาตั้งแต่วันที่</div>
-        <div class="col">{{ props.data.leaveDateStart }} {{ `${props.data.leaveRange && props.data.leaveRange !== 'ALL' ? `(${converstType(props.data.leaveRange)})`:''}` }}</div>
+        <div class="col">
+          {{ props.data.leaveDateStart }}
+          {{
+            `${
+              props.data.leaveRange && props.data.leaveRange !== "ALL"
+                ? `(${converstType(props.data.leaveRange)})`
+                : ""
+            }`
+          }}
+        </div>
       </div>
       <div class="row">
         <div class="col text-grey-8">ลาถึงวันที่</div>
-        <div class="col">{{ props.data.leaveDateEnd }} {{ `${props.data.leaveDateStart !== props.data.leaveDateEnd ?  `${props.data.leaveRangeEnd && props.data.leaveRangeEnd !== 'ALL' ? `(${converstType(props.data.leaveRangeEnd)})`:''}` :''}` }}</div>
+        <div class="col">
+          {{ props.data.leaveDateEnd }}
+          {{
+            `${
+              props.data.leaveDateStart !== props.data.leaveDateEnd
+                ? `${
+                    props.data.leaveRangeEnd &&
+                    props.data.leaveRangeEnd !== "ALL"
+                      ? `(${converstType(props.data.leaveRangeEnd)})`
+                      : ""
+                  }`
+                : ""
+            }`
+          }}
+        </div>
       </div>
       <div class="row">
         <div class="col text-grey-8">จำนวนวันที่ลา</div>
-        <div class="col">{{ props.data.leaveTotal ? props.data.leaveTotal + " วัน" : "-" }}</div>
+        <div class="col">
+          {{ props.data.leaveTotal ? props.data.leaveTotal + " วัน" : "-" }}
+        </div>
       </div>
       <div class="row">
         <div class="col text-grey-8">วันเดือนปีเกิด</div>
@@ -80,7 +105,9 @@ function convertDateToEng(dataThia: string) {
       <div class="row">
         <div class="col text-grey-8">เงินเดือนปัจจุบัน</div>
         <div class="col">
-          {{ props.data.leaveSalary.toLocaleString() }} ({{ props.data.leaveSalaryText }})
+          {{ props.data.leaveSalary.toLocaleString() }} ({{
+            props.data.leaveSalaryText
+          }})
         </div>
       </div>
       <div class="row">
@@ -111,9 +138,15 @@ function convertDateToEng(dataThia: string) {
         <div class="col">
           <div>{{ props.data.coupleDayCountryHistory }}</div>
           <div>{{ props.data.coupleDayTotalHistory }}</div>
-          <div>{{ props.data.coupleDayStartDateHistory }}</div>
-          <div>{{ props.data.coupleDayEndDateHistory }}</div>
-          <div>{{ props.data.coupleDaySumTotalHistory ? props.data.coupleDaySumTotalHistory + ` วัน`:'-'}}</div>
+          <div>{{ props.data.coupleDayStartDateHistory || "-" }}</div>
+          <div>{{ props.data.coupleDayEndDateHistory || "-" }}</div>
+          <div>
+            {{
+              props.data.coupleDaySumTotalHistory
+                ? props.data.coupleDaySumTotalHistory + ` วัน`
+                : "-"
+            }}
+          </div>
         </div>
       </div>
       <div class="row">