Merge branch 'nice_dev' into develop

2024-04-09 16:49:30 +07:00 · 2024-04-09 16:49:30 +07:00 · c93bba5e06
commit c93bba5e06
parent ec567c48d1 36760149df
4 changed files with 26 additions and 5 deletions
--- a/src/modules/15_development/views/MainPage.vue
+++ b/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"