From 929abb26fd651cd55510e673a2f8898747a58186 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Thu, 1 May 2025 13:51:57 +0700
Subject: [PATCH 1/2] =?UTF-8?q?=E0=B8=A5=E0=B8=9A=20-?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/09_leave/components/05_Leave/DetailLeavePage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
index 42db2ac34..6a8e35594 100644
--- a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
+++ b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
@@ -361,7 +361,7 @@ async function fetchDetailLeave(paramsId: string) {
         data.coupleDayEndDateHistory && date2Thai(data.coupleDayEndDateHistory);
       formData.coupleDaySumTotalHistory = data.coupleDaySumTotalHistory
         ? data.coupleDaySumTotalHistory
-        : "-";
+        : "";
       formData.approveStep = data.approveStep ? data.approveStep : "-";
       formData.dear = data.dear ? data.dear : "-";
       formData.profileType = data.profileType;

From d3d6feb379575d811dccefd42ada8c1dfe110cf7 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 1 May 2025 14:28:45 +0700
Subject: [PATCH 2/2] salary Columns discipline

---
 .../04_salaryLists/TableTypePending.vue       | 25 ++++++++++-------
 .../TableTypePending.vue                      | 27 ++++++++++++-------
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue b/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
index 62d0c10a1..81bb9db78 100644
--- a/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
+++ b/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
@@ -525,25 +525,30 @@ function onClickViewInfo(type: string, id: string) {
               {{ props.row.isSuspension == null ? "-" : "" }}
             </div>
           </div>
-          <div
-            v-else-if="
-              col.name == 'posSalary' ||
-              col.name == 'discipline' ||
-              col.name == 'leave'
-            "
-          >
+          <div v-else-if="col.name == 'posSalary' || col.name == 'leave'">
             <q-btn
               v-if="checkPermission($route)?.attrIsGet"
               flat
               dense
               icon="info"
-              :color="
-                col.name == 'discipline' && props.row.isPunish ? 'red' : 'info'
-              "
+              color="info"
               @click.pervent="onClickViewInfo(col.name, props.row.profileId)"
             >
             </q-btn>
           </div>
+          <div v-else-if="col.name == 'discipline'">
+            <q-btn
+              v-if="checkPermission($route)?.attrIsGet && props.row.isPunish"
+              flat
+              dense
+              icon="info"
+              color="red"
+              @click.pervent="onClickViewInfo(col.name, props.row.profileId)"
+            >
+            </q-btn>
+
+            <div v-else>-</div>
+          </div>
 
           <div v-else>
             {{ col.value ? col.value : "-" }}
diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue
index 56e46f822..1a826ad89 100644
--- a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue
+++ b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue
@@ -539,28 +539,35 @@ watch(
             {{ Number(props.row.amount).toLocaleString() }}
           </div>
 
-          <div
-            v-else-if="
-              col.name == 'posSalary' ||
-              col.name == 'discipline' ||
-              col.name == 'leave'
-            "
-          >
+          <div v-else-if="col.name == 'posSalary' || col.name == 'leave'">
             <q-btn
               v-if="checkPermission($route)?.attrIsGet"
               flat
               dense
               icon="info"
               class="q-pa-none q-ml-xs"
-              :color="
-                col.name == 'discipline' && props.row.isPunish ? 'red' : 'info'
-              "
+              color="info"
               size="12px"
               @click.pervent="onClickViewInfo(col.name, props.row.profileId)"
             >
             </q-btn>
           </div>
 
+          <div v-else-if="col.name == 'discipline'">
+            <q-btn
+              v-if="checkPermission($route)?.attrIsGet && props.row.isPunish"
+              flat
+              dense
+              icon="info"
+              class="q-pa-none q-ml-xs"
+              color="red"
+              size="12px"
+              @click.pervent="onClickViewInfo(col.name, props.row.profileId)"
+            >
+            </q-btn>
+            <div v-else>-</div>
+          </div>
+
           <div v-else>
             {{ col.value ? col.value : "-" }}
           </div>