From 08c3127e93972a9ff989970dc19bc6a2822f60a2 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 10 Jan 2024 10:03:17 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=20filteStatus=20=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84=E0=B8=B3?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/10_order/views/Main.vue                  | 12 +++---------
 .../11_discipline/components/9_Order/MainPage.vue    | 12 +++---------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/modules/10_order/views/Main.vue b/src/modules/10_order/views/Main.vue
index d712763f9..1cca30c22 100644
--- a/src/modules/10_order/views/Main.vue
+++ b/src/modules/10_order/views/Main.vue
@@ -229,7 +229,9 @@ const OrderStatus = ref<string>("ทั้งหมด");
 const OrderStatusOption = ref<DataOption1[]>([
   { id: "ทั้งหมด", name: "ทั้งหมด" },
 ]);
-const OrderStatusFilter1 = ref<any>([]);
+const OrderStatusFilter1 = ref<DataOption1[]>([
+  { id: "ทั้งหมด", name: "ทั้งหมด" },
+]);
 const addedOrderStatusValues: string[] = [];
 const OrderStatusFilter = async () => {
   for (let data of OriginalData.value) {
@@ -243,15 +245,7 @@ const OrderStatusFilter = async () => {
     }
 
     if (!addedOrderStatusValues.includes(OrderStatusValue)) {
-      OrderStatusOption.value = [{ id: "ทั้งหมด", name: "ทั้งหมด" }];
-      OrderStatusOption.value.push({
-        // id: OrderStatusValue,
-        id: OrderStatusOption.value.length.toString(),
-        name: OrderStatusValue,
-      });
-      OrderStatusFilter1.value = [{ id: "ทั้งหมด", name: "ทั้งหมด" }];
       OrderStatusFilter1.value.push({
-        // id: OrderStatusValue,
         id: OrderStatusFilter1.value.length.toString(),
         name: OrderStatusValue,
       });
diff --git a/src/modules/11_discipline/components/9_Order/MainPage.vue b/src/modules/11_discipline/components/9_Order/MainPage.vue
index a75b6ffcb..6f0da331b 100644
--- a/src/modules/11_discipline/components/9_Order/MainPage.vue
+++ b/src/modules/11_discipline/components/9_Order/MainPage.vue
@@ -224,7 +224,9 @@ const OrderStatus = ref<string>("ทั้งหมด");
 const OrderStatusOption = ref<DataOption1[]>([
   { id: "ทั้งหมด", name: "ทั้งหมด" },
 ]);
-const OrderStatusFilter1 = ref<any>([]);
+const OrderStatusFilter1 = ref<DataOption1[]>([
+  { id: "ทั้งหมด", name: "ทั้งหมด" },
+]);
 const addedOrderStatusValues: string[] = [];
 const OrderStatusFilter = async () => {
   for (let data of stroe.mainData) {
@@ -238,15 +240,7 @@ const OrderStatusFilter = async () => {
     }
 
     if (!addedOrderStatusValues.includes(OrderStatusValue)) {
-      OrderStatusOption.value = [{ id: "ทั้งหมด", name: "ทั้งหมด" }];
-      OrderStatusOption.value.push({
-        // id: OrderStatusValue,
-        id: OrderStatusOption.value.length.toString(),
-        name: OrderStatusValue,
-      });
-      OrderStatusFilter1.value = [{ id: "ทั้งหมด", name: "ทั้งหมด" }];
       OrderStatusFilter1.value.push({
-        // id: OrderStatusValue,
         id: OrderStatusFilter1.value.length.toString(),
         name: OrderStatusValue,
       });