From 36760149dfbd6f72a86019790b085d822822046a Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 9 Apr 2024 16:49:15 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20?=
 =?UTF-8?q?=E0=B8=9E=E0=B8=B1=E0=B8=92=E0=B8=99=E0=B8=B2=E0=B8=9A=E0=B8=B8?=
 =?UTF-8?q?=E0=B8=84=E0=B8=A5=E0=B8=B2=E0=B8=81=E0=B8=A3=20=3D>=20?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=B5=E0=B8=87=E0=B8=9A=E0=B8=9B=E0=B8=A3=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B0=E0=B8=A1=E0=B8=B2=E0=B8=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/scholarship/DetailView.vue          |  2 --
 .../15_development/interface/request/Main.ts       |  2 +-
 src/modules/15_development/views/MainPage.vue      | 13 ++++++++++++-
 src/modules/15_development/views/Scholarship.vue   | 14 +++++++++++++-
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/modules/15_development/components/scholarship/DetailView.vue b/src/modules/15_development/components/scholarship/DetailView.vue
index 6b353771b..da601c044 100644
--- a/src/modules/15_development/components/scholarship/DetailView.vue
+++ b/src/modules/15_development/components/scholarship/DetailView.vue
@@ -399,14 +399,12 @@ onMounted(() => {
     <div class="row" v-if="scholarshipId">
       <div class="q-gutter-sm" v-if="isStatus === 'PENDING'">
         <q-btn
-          dense
           unelevated
           color="green"
           label="สำเร็จการศึกษา"
           @click="onClickUpdateStatus('GRADUATE')"
         />
         <q-btn
-          dense
           unelevated
           color="red"
           label="ไม่จบการศึกษา"
diff --git a/src/modules/15_development/interface/request/Main.ts b/src/modules/15_development/interface/request/Main.ts
index 2882caa02..1cdc4ed23 100644
--- a/src/modules/15_development/interface/request/Main.ts
+++ b/src/modules/15_development/interface/request/Main.ts
@@ -1,5 +1,5 @@
 interface FormQueryListProject {
-  year: number;
+  year: number | null;
   page: number;
   pageSize: number;
   org: string;
diff --git a/src/modules/15_development/views/MainPage.vue b/src/modules/15_development/views/MainPage.vue
index 79aac489f..f3016ce39 100644
--- a/src/modules/15_development/views/MainPage.vue
+++ b/src/modules/15_development/views/MainPage.vue
@@ -173,9 +173,20 @@ onMounted(() => {
               dense
               lazy-rules
               outlined
-              :model-value="Number(formQuery.year) + 543"
+              :model-value="
+                formQuery.year === 0 ? 'ทั้งหมด' : Number(formQuery.year) + 543
+              "
               :label="`${'ปีงบประมาณ'}`"
             >
+              <template v-if="formQuery.year" v-slot:append>
+                <q-icon
+                  name="cancel"
+                  @click.stop.prevent="
+                    (formQuery.year = 0), fetchListProjectNew()
+                  "
+                  class="cursor-pointer"
+                />
+              </template>
               <template v-slot:prepend>
                 <q-icon
                   name="event"
diff --git a/src/modules/15_development/views/Scholarship.vue b/src/modules/15_development/views/Scholarship.vue
index aa4099865..349437fe9 100644
--- a/src/modules/15_development/views/Scholarship.vue
+++ b/src/modules/15_development/views/Scholarship.vue
@@ -213,9 +213,20 @@ onMounted(() => {
                 dense
                 lazy-rules
                 outlined
-                :model-value="Number(formQuery.year) + 543"
+                :model-value="
+                  formQuery.year === 0 ? 'ทั้งหมด' : Number(formQuery.year) + 543
+                "
                 :label="`${'ปีงบประมาณ'}`"
               >
+                <template v-if="formQuery.year" v-slot:append>
+                  <q-icon
+                    name="cancel"
+                    @click.stop.prevent="
+                      (formQuery.year = 0), fetchNewList()
+                    "
+                    class="cursor-pointer"
+                  />
+                </template>
                 <template v-slot:prepend>
                   <q-icon
                     name="event"
@@ -240,6 +251,7 @@ onMounted(() => {
             option-label="name"
             label="เลือกประเภททุน"
             @update:model-value="fetchNewList"
+            style="width: 400px;"
           />
         </div>
       </div>