From 014d4ec73c992bfee15a0cf3e796e03bb82fc07c Mon Sep 17 00:00:00 2001
From: Jimmy Liow <lyj@hainatravel.com>
Date: Wed, 7 Feb 2024 14:05:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=88=97=E5=AE=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/OrderFollow.jsx | 63 ++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/src/views/OrderFollow.jsx b/src/views/OrderFollow.jsx
index 507efa6..b56b710 100644
--- a/src/views/OrderFollow.jsx
+++ b/src/views/OrderFollow.jsx
@@ -178,7 +178,7 @@ function OrderList({ formValues }) {
     {
       title: '订单状态',
       dataIndex: 'COLI_State',
-      width: 120,
+      width: 150,
       render: (text, record) => {
         let extra = ''
         if (record.RemindState === 1) extra = '(一催)'
@@ -260,16 +260,37 @@ function OrderList({ formValues }) {
       })
   }, [formValues])
 
-  return (
-    <Table key='Order Table' loading={loading} dataSource={orderData}
-      columns={orderColumns}
-      pagination={{
-        showQuickJumper: true,
-        showLessItems: true,
-        showSizeChanger: true,
-        showTotal: (total) => { return `总数：${total}` }
-      }} />
-  )
+  const paginationProps = {
+    showQuickJumper: true,
+    showLessItems: true,
+    showSizeChanger: true,
+    showTotal: (total) => { return `总数：${total}` }
+  }
+
+  return (    
+    <Collapse defaultActiveKey={['1', '2', '3']} items={[
+      {
+        key: '1',
+        label: 'AH 订单：25',
+        children: <Table key='AH Order Table' loading={loading} dataSource={orderData}
+        columns={orderColumns}
+        pagination={paginationProps} />
+      },
+      {
+        key: '2',
+        label: 'CH 订单：25',
+        children: <Table key='CH Order Table' loading={loading} dataSource={orderData}
+        columns={orderColumns}
+        pagination={paginationProps} />
+      },
+      {
+        key: '3',
+        label: 'GH 订单：25',
+        children: <Table key='GH Order Table' loading={loading} dataSource={orderData}
+        columns={orderColumns}
+        pagination={paginationProps} />
+      }]}
+    />)
 }
 function OrderFollow() {
 
@@ -316,26 +337,8 @@ function OrderFollow() {
         </Flex>
         <Conditional condition={advanceChecked} whenTrue={<AdvanceSearchForm onSubmit={handleSubmit} />}
         />
+        <OrderList formValues={formValues} />
       </Space>
-      <Divider plain orientation='left'></Divider>
-      <Collapse defaultActiveKey={['1', '2', '3']} items={[
-          {
-            key: '1',
-            label: 'AH 订单：25',
-            children: <OrderList formValues={formValues} />
-          },
-          {
-            key: '2',
-            label: 'CH 订单：25',
-            children: <OrderList formValues={formValues} />
-          },
-          {
-            key: '3',
-            label: 'GH 订单：25',
-            children: <OrderList formValues={formValues} />
-          },
-        ]}
-      />
     </>
   )
 }