From bd7db2ad8eca57206b3429938d2000a2b1e42d79 Mon Sep 17 00:00:00 2001
From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com>
Date: Fri, 30 Jun 2023 16:29:33 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9B=E0=B8=A5=E0=B8=B5=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=95?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=A7=E0=B9=81=E0=B8=9B=E0=B8=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OrderPlacement/MainOrderPlacement.vue          | 14 +++++++-------
 src/modules/05_placement/store.ts                  |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue b/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue
index db0d953df..b5482e3ba 100644
--- a/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue
+++ b/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue
@@ -646,12 +646,12 @@ const OrderStatusFilter = async () => {
     const OrderStatusValue = data.OrderStatus;
     console.log(OrderStatusValue);
 
-    // if (
-    //   OrderStatusValue === null ||
-    //   parseInt(OrderStatusValue) > parseInt(OrderStatusValue)
-    // ) {
-    //   OrderStatusText.value = OrderStatusValue;
-    // }
+    if (
+      OrderStatusValue === null ||
+      parseInt(OrderStatusValue) > parseInt(OrderStatusValue)
+    ) {
+      OrderStatus.value = OrderStatusValue;
+    }
 
     if (!addedOrderStatusValues.includes(OrderStatusValue)) {
       OrderStatusOption.push({
@@ -698,7 +698,7 @@ const visibleColumns = ref<string[]>([
 
 const searchFilterTable = async () => {
   // console.log('Input value changed:', examTime.value, examType.value, expiredAccount.value);
-  await DataStore.DataUpdateMainOrder(OrderType.value, OrderStatus.value);
+  await DataStore.DataUpdateOrder(OrderType.value, OrderStatus.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 ec5548899..4ff47f8e8 100644
--- a/src/modules/05_placement/store.ts
+++ b/src/modules/05_placement/store.ts
@@ -217,7 +217,7 @@ export const useOrderPlacementDataStore = defineStore("placement", () => {
   const DataMainOrder = (val: FormOrderPlacementMainData[]) =>
     (DataMainOrigOrder.value = val);
 
-  const DataUpdateMainOrder = (
+  const DataUpdateOrder = (
     filter_1: string | null,
     filter_2: string | null
   ) => {
@@ -246,7 +246,7 @@ export const useOrderPlacementDataStore = defineStore("placement", () => {
     DataMainYearOrder,
     DataMainOrigOrder,
     DataMainUpdateOrder,
-    DataUpdateMainOrder,
+    DataUpdateOrder,
     DataMainYearSetOrder,
     DataMainOrder,
   };