From d25d862e673c7edbbbf0faea8f994f41263167f9 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Wed, 3 Jan 2024 14:44:55 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87?=
 =?UTF-8?q?=E0=B8=9C=E0=B8=A5=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=A5=E0=B8=B0?=
 =?UTF-8?q?=E0=B9=80=E0=B8=AD=E0=B8=B5=E0=B8=A2=E0=B8=94=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=A5=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/2_Leave/DetailLeave.vue        | 27 +++++++++----------
 .../components/2_Leave/DetailLeaveReject.vue  | 27 +++++++++----------
 .../12_evaluatePersonal/views/MainPage.vue    |  2 +-
 3 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/src/modules/09_leave/components/2_Leave/DetailLeave.vue b/src/modules/09_leave/components/2_Leave/DetailLeave.vue
index 965f02cca..2eb4b9cf6 100644
--- a/src/modules/09_leave/components/2_Leave/DetailLeave.vue
+++ b/src/modules/09_leave/components/2_Leave/DetailLeave.vue
@@ -600,11 +600,11 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) {
               </div>
               <div class="col-xs-12 col-sm-7 row">
                 <div class="row col-12 q-gutter-md">
-                  <div class="col row">
-                    <q-card
-                      bordered
-                      class="col-12 items-center row q-px-md q-py-sm"
-                    >
+                  <div
+                    v-if="formData.leaveTypeName == 'ลาพักผ่อน'"
+                    class="col-3"
+                  >
+                    <q-card bordered class="items-center row col-12 q-pa-md">
                       <div class="text-h6 text-weight-bold text-blue-10">
                         {{ formData.leaveLimit }}
                       </div>
@@ -613,11 +613,8 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) {
                       </div>
                     </q-card>
                   </div>
-                  <div class="col">
-                    <q-card
-                      bordered
-                      class="col-12 items-center row q-px-md q-py-sm"
-                    >
+                  <div class="col-3">
+                    <q-card bordered class="items-center row col-12 q-pa-md">
                       <div class="text-h6 text-weight-bold text-light-blue-6">
                         {{ formData.leaveSummary }}
                       </div>
@@ -626,11 +623,11 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) {
                       </div>
                     </q-card>
                   </div>
-                  <div class="col">
-                    <q-card
-                      bordered
-                      class="col-12 items-center row q-px-md q-py-sm"
-                    >
+                  <div
+                    v-if="formData.leaveTypeName == 'ลาพักผ่อน'"
+                    class="col-3"
+                  >
+                    <q-card bordered class="items-center row col-12 q-pa-md">
                       <div class="text-h6 text-weight-bold text-indigo-7">
                         {{ formData.leaveRemain }}
                       </div>
diff --git a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue b/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
index 642e62e69..ac9bd17e2 100644
--- a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
+++ b/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
@@ -593,11 +593,11 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) {
               </div>
               <div class="col-xs-12 col-sm-7 row">
                 <div class="row col-12 q-gutter-md">
-                  <div class="col row">
-                    <q-card
-                      bordered
-                      class="col-12 items-center row q-px-md q-py-sm"
-                    >
+                  <div
+                    v-if="formData.leaveTypeName == 'ลาพักผ่อน'"
+                    class="col-3"
+                  >
+                    <q-card bordered class="items-center row col-12 q-pa-md">
                       <div class="text-h6 text-weight-bold text-blue-10">
                         {{ formData.leaveLimit }}
                       </div>
@@ -606,11 +606,8 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) {
                       </div>
                     </q-card>
                   </div>
-                  <div class="col">
-                    <q-card
-                      bordered
-                      class="col-12 items-center row q-px-md q-py-sm"
-                    >
+                  <div class="col-3">
+                    <q-card bordered class="items-center row col-12 q-pa-md">
                       <div class="text-h6 text-weight-bold text-light-blue-6">
                         {{ formData.leaveSummary }}
                       </div>
@@ -619,11 +616,11 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) {
                       </div>
                     </q-card>
                   </div>
-                  <div class="col">
-                    <q-card
-                      bordered
-                      class="col-12 items-center row q-px-md q-py-sm"
-                    >
+                  <div
+                    v-if="formData.leaveTypeName == 'ลาพักผ่อน'"
+                    class="col-3"
+                  >
+                    <q-card bordered class="items-center row col-12 q-pa-md">
                       <div class="text-h6 text-weight-bold text-indigo-7">
                         {{ formData.leaveRemain }}
                       </div>
diff --git a/src/modules/12_evaluatePersonal/views/MainPage.vue b/src/modules/12_evaluatePersonal/views/MainPage.vue
index d28f942b3..e34a9b22e 100644
--- a/src/modules/12_evaluatePersonal/views/MainPage.vue
+++ b/src/modules/12_evaluatePersonal/views/MainPage.vue
@@ -182,7 +182,7 @@ onMounted(async () => {
         class="custom-header-table"
         :visible-columns="store.visibleColumns"
         v-model:pagination="initialPagination"
-        :rows-per-page-options="[2, 25, 50, 100]"
+        :rows-per-page-options="[10, 25, 50, 100]"
         @update:pagination="updatePagination"
       >
         <template v-slot:pagination="scope">