Merge branch 'nice_dev' into develop

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="ไม่จบการศึกษา"

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;

src/modules/15_development/views/MainPage.vue

@@ -194,9 +194,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"

src/modules/15_development/views/Scholarship.vue

@@ -234,9 +234,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"
@@ -261,6 +272,7 @@ onMounted(() => {
             option-label="name"
             label="เลือกประเภททุน"
             @update:model-value="fetchNewList"
+            style="width: 400px;"
           />
         </div>
       </div>