From e58aaf5bce501d00fa90381b78b98d48beddafe7 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 10 Jan 2024 17:33:31 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A5=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/interface/request/main/main.ts            |  2 +-
 .../components/1_Work/DialogReport.vue        | 35 ++++++++++---------
 src/modules/09_leave/stores/LeaveStore.ts     |  2 +-
 src/modules/09_leave/views/WorkingMain.vue    |  2 +-
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index 53631b4ff..9cf3e32e7 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -408,7 +408,7 @@ const menuList = readonly<any[]>([
       },
       {
         key: 9.6,
-        label: "รายงานสถิติ",
+        label: "รายงานสถิติการลา",
         path: "/leave-report",
         role: "leave",
       },
diff --git a/src/modules/09_leave/components/1_Work/DialogReport.vue b/src/modules/09_leave/components/1_Work/DialogReport.vue
index 9074faea0..4de991f1d 100644
--- a/src/modules/09_leave/components/1_Work/DialogReport.vue
+++ b/src/modules/09_leave/components/1_Work/DialogReport.vue
@@ -173,15 +173,15 @@ watch(
 </script>
 <template>
   <q-dialog v-model="props.modal">
-    <q-card style="width: 800px; max-width: 80vw">
+    <q-card style="width: 700px; max-width: 100vw">
       <Header :close="props.close" :tittle="'รายงานสถิติการลา'" />
 
       <q-separator />
 
-      <q-card-section class="q-pt-none">
+      <q-card-section class="q-pt-none" style="padding: 0px">
         <div class="q-pa-sm q-gutter-y-sm">
           <q-toolbar class="q-pa-sm bg-grey-2" style="border-radius: 5px">
-            <div class="q-pr-xs">
+            <div class="q-pr-xs col-4">
               <q-select
                 class="bg-white"
                 outlined
@@ -193,7 +193,6 @@ watch(
                 option-label="name"
                 option-value="id"
                 use-input
-                style="width: 230px"
                 @update:model-value="updateFilterType"
                 @filter="(inputValue: any,
         doneFn: Function) => filterFnOptions(inputValue, doneFn,)"
@@ -206,7 +205,7 @@ watch(
                 </template>
               </q-select>
             </div>
-            <div class="q-pr-xs" v-if="filterType === 'daily'">
+            <div class="q-pr-xs col-4" v-if="filterType === 'daily'">
               <datepicker
                 menu-class-name="modalfix"
                 v-model="date"
@@ -242,7 +241,7 @@ watch(
                 </template>
               </datepicker>
             </div>
-            <div class="q-pr-xs" v-if="filterType === 'monthly'">
+            <div class="q-pr-xs col-4" v-if="filterType === 'monthly'">
               <datepicker
                 v-model="dateMonth"
                 :locale="'th'"
@@ -276,17 +275,19 @@ watch(
                 </template>
               </datepicker>
             </div>
-            <q-space />
-            <q-btn
-              :loading="loadingBtn"
-              :disable="loadingBtn"
-              color="primary"
-              icon="download"
-              label="ดาวน์โหลดรายงาน"
-              @click="genReportXLSX(detailReport)"
-            >
-              <q-tooltip>ดาวน์โหลดรายงาน</q-tooltip>
-            </q-btn>
+            <div class="q-pr-xs col-4">
+              <q-btn
+                :loading="loadingBtn"
+                :disable="loadingBtn"
+                color="primary"
+                icon="download"
+                label="ดาวน์โหลดรายงาน"
+                @click="genReportXLSX(detailReport)"
+                style="width: 100%"
+              >
+                <q-tooltip>ดาวน์โหลดรายงาน</q-tooltip>
+              </q-btn>
+            </div>
           </q-toolbar>
         </div>
       </q-card-section>
diff --git a/src/modules/09_leave/stores/LeaveStore.ts b/src/modules/09_leave/stores/LeaveStore.ts
index 91bc9b6dd..2a770dbc1 100644
--- a/src/modules/09_leave/stores/LeaveStore.ts
+++ b/src/modules/09_leave/stores/LeaveStore.ts
@@ -24,7 +24,7 @@ export const useLeavelistDataStore = defineStore("leave", () => {
   const filter = reactive<DateFilter>({
     year: new Date().getFullYear(), //*ปีในการยื่นขอใบลา(ใช้เป็น คศ.)
     type: "00000000-0000-0000-0000-000000000000", //*Id ประเภทการลา
-    status: "ALL", //*สถานะการของลา
+    status: "NEW", //*สถานะการของลา
     keyword: "", //keyword ค้นหา
   });
 
diff --git a/src/modules/09_leave/views/WorkingMain.vue b/src/modules/09_leave/views/WorkingMain.vue
index ae997c392..df42d1764 100644
--- a/src/modules/09_leave/views/WorkingMain.vue
+++ b/src/modules/09_leave/views/WorkingMain.vue
@@ -21,7 +21,7 @@ function onClickOpenDialog() {
     <q-btn
       dense
       flat
-      class="text-primary"
+      class="text-secondary"
       label="รายงานสถิติการลา"
       @click="onClickOpenDialog"
     >