From 90b0d78184c5ea88497a6cf1ba49946d690551fc Mon Sep 17 00:00:00 2001
From: Jimmy Liow <lyj@hainatravel.com>
Date: Fri, 26 Apr 2024 10:52:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AA=E6=9C=89=E4=BB=8A=E6=97=A5=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=89=8D=E5=88=86=E7=BB=84=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orders/Follow.jsx | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index c12bcbf..d715e67 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -361,19 +361,7 @@ function OrderGroupTable({ formValues }) {
     const paymentList = deptOrderList.filter((o) => {
       return o.coli_ordertype === 8
     })
-    if (formValues.type === 'advance') {
-      deptItems.push(
-        {
-          key: index,
-          label: deptMap.get(deptNo),
-          children: <>
-            <Table key={'advanceOrderTable' + deptNo} loading={loading} dataSource={deptOrderList}
-              columns={orderColumns}
-              pagination={deptOrderList.length <= 10 ? false : paginationProps} />
-          </>
-        }
-      )
-    } else {
+    if (formValues.type === 'today') {
       deptItems.push(
         {
           key: index,
@@ -427,6 +415,18 @@ function OrderGroupTable({ formValues }) {
           </>
         }
       )
+    } else {
+      deptItems.push(
+        {
+          key: index,
+          label: deptMap.get(deptNo),
+          children: <>
+            <Table key={'advanceOrderTable' + deptNo} loading={loading} dataSource={deptOrderList}
+              columns={orderColumns}
+              pagination={deptOrderList.length <= 10 ? false : paginationProps} />
+          </>
+        }
+      )
     }
   })