From 9e633b83b797d756944fbd65905781587cb5bdfc Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 10 Jul 2024 13:21:59 +0700
Subject: [PATCH] fix bug

---
 .../salaryEmployeeChart/TabCriteria.vue       | 12 +++++-
 src/modules/13_salary/views/commandSalary.vue | 39 +++++++++++++++++--
 .../13_salary/views/salaryEmployeeLists.vue   |  4 +-
 src/modules/13_salary/views/salaryLists.vue   |  5 ++-
 src/modules/13_salary/views/salaryRound.vue   |  2 +-
 .../components/results/tableResults.vue       |  2 +-
 6 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/src/modules/13_salary/components/salaryEmployeeChart/TabCriteria.vue b/src/modules/13_salary/components/salaryEmployeeChart/TabCriteria.vue
index 957d38ae8..3899ff9c0 100644
--- a/src/modules/13_salary/components/salaryEmployeeChart/TabCriteria.vue
+++ b/src/modules/13_salary/components/salaryEmployeeChart/TabCriteria.vue
@@ -155,11 +155,19 @@ function getPosType() {
     .get(config.API.salaryEmployeePosType())
     .then((res) => {
       const data = res.data.result;
-
-      posTypeOp.value = data.map((item: PosType) => ({
+      const option = [
+        {
+          id: "",
+          name: "ทั้งหมด",
+        },
+      ];
+      const test = data.map((item: PosType) => ({
         id: item.id,
         name: item.posTypeName,
       }));
+
+      option.push(...test);
+      posTypeOp.value = option;
     })
     .catch((e) => {
       messageError($q, e);
diff --git a/src/modules/13_salary/views/commandSalary.vue b/src/modules/13_salary/views/commandSalary.vue
index 1d61e8662..06531e9f7 100644
--- a/src/modules/13_salary/views/commandSalary.vue
+++ b/src/modules/13_salary/views/commandSalary.vue
@@ -194,7 +194,7 @@ const fiscalYearFilter = async () => {
 };
 
 // รายการข้อมูลประเภทคำสั่ง
-const OrderType = ref<string>("");
+const OrderType = ref<string | null>("");
 const OrderTypeFilter1 = ref<DataOption1[]>([]);
 const OrderTypeOption = ref<DataOption1[]>([{ id: "", name: "ทั้งหมด" }]);
 
@@ -238,7 +238,9 @@ async function OrderTypeFilter() {
 
 /** ฟังชั่นฟิลเตอร์ตามค่า ประเภท สถานะ ปี */
 async function searchFilterTable() {
-  stroe.filterListOrder(OrderType.value, OrderStatus.value, fiscalyear.value);
+  if (OrderType.value) {
+    stroe.filterListOrder(OrderType.value, OrderStatus.value, fiscalyear.value);
+  }
 }
 
 /** fucnction หาสถานะทั่งหมด*/
@@ -273,6 +275,7 @@ function filterSelector(val: string, update: Function, refData: string) {
   switch (refData) {
     case "fiscalyearOP":
       update(() => {
+        fiscalyear.value = null;
         fiscalyearOP.value = fiscalyearFilter1.value.filter(
           (v: DataOption) => v.name.indexOf(val) > -1
         );
@@ -280,6 +283,7 @@ function filterSelector(val: string, update: Function, refData: string) {
       break;
     case "OrderTypeOption":
       update(() => {
+        OrderType.value = null;
         OrderTypeOption.value = OrderTypeFilter1.value.filter(
           (v: DataOption1) => v.name.indexOf(val) > -1
         );
@@ -287,6 +291,7 @@ function filterSelector(val: string, update: Function, refData: string) {
       break;
     case "OrderStatusOption":
       update(() => {
+        OrderStatus.value = "";
         OrderStatusOption.value = OrderStatusFilter1.value.filter(
           (v: DataOption1) => v.name.indexOf(val) > -1
         );
@@ -364,8 +369,17 @@ onMounted(async () => {
                 <q-item-section class="text-grey"> ไม่มีข้อมูล </q-item-section>
               </q-item>
             </template>
+            <template v-if="fiscalyear !== 0" v-slot:append>
+              <q-icon
+                name="cancel"
+                @click.stop.prevent="
+                  (fiscalyearOP = fiscalyearFilter1), (fiscalyear = 0)
+                "
+                class="cursor-pointer"
+              />
+            </template>
           </q-select>
-          <!-- use-input -->
+
           <div>
             <q-btn
               size="12px"
@@ -449,6 +463,15 @@ onMounted(async () => {
                       </q-item-section>
                     </q-item>
                   </template>
+                  <template v-if="OrderType !== ''" v-slot:append>
+                    <q-icon
+                      name="cancel"
+                      @click.stop.prevent="
+                        (OrderTypeOption = OrderTypeFilter1), (OrderType = '')
+                      "
+                      class="cursor-pointer"
+                    />
+                  </template>
                 </q-select>
               </div>
               <div class="col-xs-12 col-sm-3 col-md-3">
@@ -480,6 +503,16 @@ onMounted(async () => {
                       </q-item-section>
                     </q-item>
                   </template>
+                  <template v-if="OrderStatus !== 'ทั้งหมด'" v-slot:append>
+                    <q-icon
+                      name="cancel"
+                      @click.stop.prevent="
+                        (OrderStatusOption = OrderStatusFilter1),
+                          (OrderStatus = 'ทั้งหมด')
+                      "
+                      class="cursor-pointer"
+                    />
+                  </template>
                 </q-select>
               </div>
               <q-space />
diff --git a/src/modules/13_salary/views/salaryEmployeeLists.vue b/src/modules/13_salary/views/salaryEmployeeLists.vue
index 71ec8c671..267a94fb8 100644
--- a/src/modules/13_salary/views/salaryEmployeeLists.vue
+++ b/src/modules/13_salary/views/salaryEmployeeLists.vue
@@ -447,7 +447,9 @@ onMounted(() => {
       <template v-if="agencyFilter !== 'ALL'" v-slot:append>
         <q-icon
           name="cancel"
-          @click.stop.prevent="agencyFilter = 'ALL'"
+          @click.stop.prevent="
+            (agencyOptions = agencyOptionsMain), (agencyFilter = 'ALL')
+          "
           class="cursor-pointer"
         /> </template
     ></q-select>
diff --git a/src/modules/13_salary/views/salaryLists.vue b/src/modules/13_salary/views/salaryLists.vue
index 28ed41a94..1da848cc3 100644
--- a/src/modules/13_salary/views/salaryLists.vue
+++ b/src/modules/13_salary/views/salaryLists.vue
@@ -427,6 +427,7 @@ onMounted(() => {
       class="q-ml-xs"
       v-model="agencyFilter"
       label="หน่วยงาน"
+      lazy-rules
       dense
       outlined
       emit-value
@@ -451,7 +452,9 @@ onMounted(() => {
       <template v-if="agencyFilter !== 'ALL'" v-slot:append>
         <q-icon
           name="cancel"
-          @click.stop.prevent="agencyFilter = 'ALL'"
+          @click.stop.prevent="
+            (agencyOptions = agencyOptionsMain), (agencyFilter = 'ALL')
+          "
           class="cursor-pointer"
         />
       </template>
diff --git a/src/modules/13_salary/views/salaryRound.vue b/src/modules/13_salary/views/salaryRound.vue
index d0994beff..14d44aa23 100644
--- a/src/modules/13_salary/views/salaryRound.vue
+++ b/src/modules/13_salary/views/salaryRound.vue
@@ -272,7 +272,7 @@ onMounted(async () => {
             <q-input
               dense
               outlined
-              :model-value="year === 0 ? null : Number(year) + 543"
+              :model-value="year === 0 ? 'ทั้งหมด' : Number(year) + 543"
               :label="`${'ปีงบประมาณ'}`"
             >
               <template v-if="year" v-slot:append>
diff --git a/src/modules/14_KPI/components/results/tableResults.vue b/src/modules/14_KPI/components/results/tableResults.vue
index 26856dc89..2f3935f14 100644
--- a/src/modules/14_KPI/components/results/tableResults.vue
+++ b/src/modules/14_KPI/components/results/tableResults.vue
@@ -137,7 +137,7 @@ function onAnnounce() {
             await porps.fetchData();
             await success($q, "ประกาศผลสำเร็จ");
             selected.value = [];
-          }, 1000);
+          }, 1500);
         })
         .catch((err) => {
           messageError($q, err);