From 8c9afd9b66163879ea1172c877399e04d93ac79e Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 27 Jun 2024 14:07:38 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9A=E0=B8=A3=E0=B8=A3=E0=B8=88=E0=B8=B8?=
 =?UTF-8?q?=20=3D>=20fux=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CardProfile.vue                             | 6 +++---
 src/modules/05_placement/components/Other/Main.vue         | 7 ++++++-
 .../06_retirement/components/DismissOrder/DismissOrder.vue | 2 +-
 src/modules/06_retirement/components/resign/Resign.vue     | 2 +-
 src/modules/06_retirement/views/Main.vue                   | 2 +-
 src/modules/09_leave/views/LeaveListMain.vue               | 2 +-
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/components/CardProfile.vue b/src/components/CardProfile.vue
index b275af850..2576a9247 100644
--- a/src/components/CardProfile.vue
+++ b/src/components/CardProfile.vue
@@ -134,7 +134,7 @@ watch(
           <q-img :src="profile.avatar" v-if="profile.avatar !== ''" />
           <q-img src="@/assets/avatar_user.jpg" v-else />
         </div>
-        <div class="col-xs-6 col-sm-3 row items-center">
+        <div class="col-xs-6 col-sm-3 row">
           <div class="col-12 q-pl-md">
             <div class="col-12 text-top">
               {{ props.type == "employee" ? "ตำแหน่ง" : "ตำแหน่งในสายงาน" }}
@@ -144,7 +144,7 @@ watch(
             </div>
           </div>
         </div>
-        <div class="col-xs-6 col-sm-3 row items-center">
+        <div class="col-xs-6 col-sm-3 row">
           <div class="col-12">
             <div class="col-12 text-top">
               {{ props.type == "employee" ? "กลุ่มงาน" : "ประเภทตำแหน่ง" }}
@@ -154,7 +154,7 @@ watch(
             </div>
           </div>
         </div>
-        <div class="col-xs-6 col-sm-3 row items-center">
+        <div class="col-xs-6 col-sm-3 row">
           <div class="col-12">
             <div class="col-12 text-top">สังกัด</div>
             <div class="col-12 text-detail">
diff --git a/src/modules/05_placement/components/Other/Main.vue b/src/modules/05_placement/components/Other/Main.vue
index 3402dd0f4..9af971be0 100644
--- a/src/modules/05_placement/components/Other/Main.vue
+++ b/src/modules/05_placement/components/Other/Main.vue
@@ -316,7 +316,12 @@ onMounted(() => {
 
                   <div
                     v-else
-                    :class="col.name === 'affiliation' ? 'table_ellipsis' : ''"
+                    :class="
+                      col.name === 'organizationPositionOld' ||
+                      col.name === 'organization'
+                        ? 'table_ellipsis'
+                        : ''
+                    "
                   >
                     {{ col.value ? col.value : "-" }}
                   </div>
diff --git a/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue b/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue
index 698dce91b..cea4b5420 100644
--- a/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue
+++ b/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue
@@ -287,7 +287,7 @@ const pagination = ref({
 
                   <div
                     v-else
-                    :class="col.name === 'org' ? 'table_ellipsis' : ''"
+                    :class="col.name === 'organizationPositionOld' ? 'table_ellipsis' : ''"
                   >
                     {{ col.value ? col.value : "-" }}
                   </div>
diff --git a/src/modules/06_retirement/components/resign/Resign.vue b/src/modules/06_retirement/components/resign/Resign.vue
index 459aa2327..382f585af 100644
--- a/src/modules/06_retirement/components/resign/Resign.vue
+++ b/src/modules/06_retirement/components/resign/Resign.vue
@@ -341,7 +341,7 @@ const pagination = ref({
                         : ''
                     "
                   >
-                    {{ col.value == null ? "" : col.value }}
+                    {{ col.value == null ? "-" : col.value }}
                   </div>
                 </q-td>
               </q-tr>
diff --git a/src/modules/06_retirement/views/Main.vue b/src/modules/06_retirement/views/Main.vue
index e1ebe3054..530b021b3 100644
--- a/src/modules/06_retirement/views/Main.vue
+++ b/src/modules/06_retirement/views/Main.vue
@@ -364,7 +364,7 @@ const typeReportChangeName = (val: string) => {
                       {{ props.rowIndex + 1 }}
                     </q-td>
                     <q-td key="signDate" :props="props">
-                      {{ props.row.signDate }}
+                      {{ props.row.signDate ? props.row.signDate : "-" }}
                     </q-td>
                     <q-td key="Date" :props="props">
                       {{ props.row.Date }}
diff --git a/src/modules/09_leave/views/LeaveListMain.vue b/src/modules/09_leave/views/LeaveListMain.vue
index 859a37831..afba501f3 100644
--- a/src/modules/09_leave/views/LeaveListMain.vue
+++ b/src/modules/09_leave/views/LeaveListMain.vue
@@ -26,7 +26,7 @@ const leaveStore = useLeavelistDataStore();
         <q-tab name="2" label="รายการยกเลิกใบลา" />
       </q-tabs>
       <q-separator />
-      <div class="q-pa-sm">
+      <div>
         <q-tab-panels v-model="leaveStore.tabMenu" animated>
           <q-tab-panel name="1"> <Tab1 /> </q-tab-panel>