From db37ae8a1db2271143ae4f7cc09e9ee795d74a40 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <lyj@hainatravel.com>
Date: Mon, 22 Jan 2024 15:29:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=90=9C=E7=B4=A2=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E4=B8=8D=E9=87=8D=E5=A4=8D=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/OrderFollow.jsx | 190 +++++++++++++++++++-------------------
 1 file changed, 95 insertions(+), 95 deletions(-)

diff --git a/src/views/OrderFollow.jsx b/src/views/OrderFollow.jsx
index df935d5..6d87816 100644
--- a/src/views/OrderFollow.jsx
+++ b/src/views/OrderFollow.jsx
@@ -1,5 +1,5 @@
 import { useNavigate } from 'react-router-dom'
-import { useMemo, useCallback, useEffect, useState } from 'react'
+import { memo, useMemo, useCallback, useEffect, useState } from 'react'
 import {
   Row, Col, Divider, Table, Card, Button, Input,
   Space, Segmented, Radio, Select, AutoComplete, Spin, Form, Switch, DatePicker, List, Avatar
@@ -8,7 +8,6 @@ import {
   StarFilled, ZoomInOutlined, StarOutlined, BarsOutlined, AppstoreOutlined, SearchOutlined
 } from '@ant-design/icons'
 import { Conditional } from '@/components/Conditional'
-import { useFormInput } from '@/hooks/useFormInput'
 import { useGetJson } from '@/hooks/userFetch'
 
 const { RangePicker } = DatePicker;
@@ -180,7 +179,90 @@ const columns = [
     dataIndex: 'comment',
     key: 'comment',
   },
-];
+]
+
+const AdvanceSearchForm = memo(function AdvanceSearch({ onSubmit }) {
+  const [form] = Form.useForm()
+  console.info('AdvanceSearch: ')
+  function handleSubmit(values) {
+    onSubmit(values);
+  }
+  return (
+    <Form
+      layout={'inline'}
+      form={form}
+      initialValues={{orderLabel: '全部'}}
+      onFinish={handleSubmit}
+      style={{
+        maxWidth: 'none',
+      }}
+    >
+      <Form.Item label='标签' name='orderLabel'>
+        <Select
+          style={{
+            width: 100,
+          }}
+          options={[
+            {
+              value: '潜力',
+              label: '潜力',
+            },
+            {
+              value: '重点',
+              label: '重点',
+            },
+            {
+              value: '休眠',
+              label: '休眠',
+            }
+          ]}
+        />
+      </Form.Item>
+      <Form.Item label='状态' name='orderStatus'>
+        <Select
+          style={{
+            width: 100,
+          }}
+          options={[
+            {
+              value: '新订单',
+              label: '新订单',
+            },
+            {
+              value: '报价中',
+              label: '报价中',
+            },
+            {
+              value: '丢失',
+              label: '丢失',
+            },
+            {
+              value: '一催',
+              label: '一催',
+            },
+            {
+              value: '二催',
+              label: '二催',
+            },
+            {
+              value: '三催',
+              label: '三催',
+            },
+          ]}
+        />
+      </Form.Item>
+      <Form.Item label='订单号' name='orderNumber'>
+        <Input placeholder='订单号' allowClear />
+      </Form.Item>
+      <Form.Item label='出发日期' name='startDate'>
+        <RangePicker />
+      </Form.Item>
+      <Form.Item >
+        <Button type='primary' htmlType='submit'>搜索</Button>
+      </Form.Item>
+    </Form>
+  )
+})
 
 function OrderFollow() {
 
@@ -195,6 +277,15 @@ function OrderFollow() {
 
   const orderListMemo = useMemo(() => <OrderList searchCriteria={searchCriteria} />, [searchCriteria])
 
+  const handleSubmit = useCallback((criteria) => {
+    console.info('onSubmit.searchCriteria: ')
+    console.info(criteria)
+    setSearchCriteria({
+      ...criteria,
+      type: 'advance'
+    })
+  }, [])
+
   useEffect(() => {
   }, [])
 
@@ -230,14 +321,7 @@ function OrderFollow() {
               onChange={() => { toggleAdvance(!advanceChecked) }} />
           </Col>
         </Row>
-        <Conditional condition={advanceChecked} whenTrue={<AdvanceSearch onSubmit={(criteria) => {
-          console.info('onSubmit.searchCriteria: ')
-          console.info(criteria)
-          setSearchCriteria({
-            ...criteria,
-            type: 'advance'
-          })
-        }} />}
+        <Conditional condition={advanceChecked} whenTrue={<AdvanceSearchForm onSubmit={handleSubmit} />}
         />
       </Space>
       <Divider plain orientation='left'></Divider>
@@ -265,90 +349,6 @@ function OrderFollow() {
       </>
     )
   }
-
-  function AdvanceSearch({ onSubmit }) {
-    const [form] = Form.useForm()
-    console.info('AdvanceSearch: ')
-    function handleSubmit(values) {
-      onSubmit(values);
-    }
-    return (
-      <Form
-        layout={'inline'}
-        form={form}
-        onFinish={handleSubmit}
-        style={{
-          maxWidth: 'none',
-        }}
-      >
-        <Form.Item label='标签' name='orderLabel'>
-          <Select
-            defaultValue='全部'
-            style={{
-              width: 100,
-            }}
-            options={[
-              {
-                value: '潜力',
-                label: '潜力',
-              },
-              {
-                value: '重点',
-                label: '重点',
-              },
-              {
-                value: '休眠',
-                label: '休眠',
-              }
-            ]}
-          />
-        </Form.Item>
-        <Form.Item label='状态' name='orderStatus'>
-          <Select
-            defaultValue='全部'
-            style={{
-              width: 100,
-            }}
-            options={[
-              {
-                value: '新订单',
-                label: '新订单',
-              },
-              {
-                value: '报价中',
-                label: '报价中',
-              },
-              {
-                value: '丢失',
-                label: '丢失',
-              },
-              {
-                value: '一催',
-                label: '一催',
-              },
-              {
-                value: '二催',
-                label: '二催',
-              },
-              {
-                value: '三催',
-                label: '三催',
-              },
-            ]}
-          />
-        </Form.Item>
-        <Form.Item label='订单号' name='orderNumber'>
-          <Input placeholder='订单号' allowClear />
-        </Form.Item>
-        <Form.Item label='出发日期' name='startDate'>
-          <RangePicker />
-        </Form.Item>
-        <Form.Item >
-          <Button type='primary' htmlType='submit'>搜索</Button>
-        </Form.Item>
-      </Form>
-    )
-  }
 }
 
 export default OrderFollow