From 6ba4c4a2dc811106e20e6f5d8e4878526e84ef8c Mon Sep 17 00:00:00 2001
From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com>
Date: Mon, 3 Jul 2023 10:36:56 +0700
Subject: [PATCH] filterYear

---
 .../OrderPlacement/MainOrderPlacement.vue     |  8 +++--
 src/modules/05_placement/store.ts             | 34 ++++++++++++++++---
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue b/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue
index 83047e607..05efb0570 100644
--- a/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue
+++ b/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue
@@ -20,7 +20,7 @@
             :borderless="false"
             :outlined="true"
             :hide-dropdown-icon="false"
-            @update:model-value="searchfiscalyear"
+            @update:model-value="searchFilterTable"
           />
           <div>
             <q-btn size="12px" flat round color="add" icon="mdi-plus">
@@ -698,7 +698,11 @@ const visibleColumns = ref<string[]>([
 
 const searchFilterTable = async () => {
   // console.log('Input value changed:', examTime.value, examType.value, expiredAccount.value);
-  await DataStore.DataUpdateOrder(OrderType.value, OrderStatus.value);
+  await DataStore.DataUpdateOrder(
+    OrderType.value,
+    OrderStatus.value,
+    fiscalyear.value
+  );
   UpdataData.value = DataStore.DataMainUpdateOrder;
 };
 //   UpdataData.value = DataStore.DataMainUpdate;
diff --git a/src/modules/05_placement/store.ts b/src/modules/05_placement/store.ts
index 296a38b78..e143902f5 100644
--- a/src/modules/05_placement/store.ts
+++ b/src/modules/05_placement/store.ts
@@ -222,23 +222,47 @@ export const useOrderPlacementDataStore = defineStore("placementOrder", () => {
   const DataMainOrder = (val: FormOrderPlacementMainData[]) =>
     (DataMainOrigOrder.value = val);
 
-  const DataUpdateOrder = (filter_1: string, filter_2: string) => {
+  const DataUpdateOrder = (
+    filter_1: string,
+    filter_2: string,
+    filterYear: number | null
+  ) => {
     DataMainUpdateOrder.value = [];
 
-    if (filter_1 === "" && filter_2 === "") {
+    if (filter_1 === "" && filter_2 === "" && filterYear === 0) {
       DataMainUpdateOrder.value = DataMainOrigOrder.value;
-    } else if (filter_1 !== "" && filter_2 === "") {
+    } else if (filter_1 !== "" && filter_2 === "" && filterYear === null) {
       DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
         (item) => item.OrderType === filter_1
       );
-    } else if (filter_1 !== "" && filter_2 !== "") {
+    } else if (filter_1 !== "" && filter_2 !== "" && filterYear === null) {
       DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
         (item) => item.OrderType === filter_1 && item.OrderStatus === filter_2
       );
-    } else if (filter_1 === "" && filter_2 !== "") {
+    } else if (filter_1 !== "" && filter_2 === "" && filterYear !== null) {
+      DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
+        (item) => item.OrderType === filter_1 && item.fiscalYear === filterYear
+      );
+    } else if (filter_1 === "" && filter_2 !== "" && filterYear === null) {
       DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
         (item) => item.OrderStatus === filter_2
       );
+    } else if (filter_1 === "" && filter_2 === "" && filterYear !== null) {
+      DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
+        (item) => item.fiscalYear === filterYear
+      );
+    } else if (filter_1 === "" && filter_2 !== "" && filterYear !== null) {
+      DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
+        (item) =>
+          item.OrderStatus === filter_2 && item.fiscalYear === filterYear
+      );
+    } else if (filter_1 !== "" && filter_2 !== "" && filterYear !== null) {
+      DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
+        (item) =>
+          item.OrderType === filter_1 &&
+          item.OrderStatus === filter_2 &&
+          item.fiscalYear === filterYear
+      );
     }
   };