From 9a377c8aa4da0aa244d58ee6cb9a5abdd4aae152 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <lyj@hainatravel.com>
Date: Fri, 26 Jan 2024 15:28:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B7=B3=E8=BD=AC=E5=88=B0?=
 =?UTF-8?q?=E8=81=8A=E5=A4=A9=E7=9A=84=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/AuthApp.jsx         | 22 +++++++-------
 src/views/OrderFollow.jsx     | 54 ++++++++++++++++++-----------------
 src/views/SalesManagement.jsx | 13 ++-------
 3 files changed, 41 insertions(+), 48 deletions(-)

diff --git a/src/views/AuthApp.jsx b/src/views/AuthApp.jsx
index 245821a..7cddf5d 100644
--- a/src/views/AuthApp.jsx
+++ b/src/views/AuthApp.jsx
@@ -1,16 +1,16 @@
-import { Outlet, Link, useHref, NavLink } from 'react-router-dom';
-import { Layout, Menu, ConfigProvider, theme, Empty, Row, Col, Avatar, Dropdown, Space, Typography, App as AntApp } from 'antd';
-import { DownOutlined } from '@ant-design/icons';
-import ErrorBoundary from '@/components/ErrorBoundary';
-import zhLocale from 'antd/locale/zh_CN';
-import { useThemeContext } from '@/stores/ThemeContext';
+import { Outlet, Link, useHref, NavLink } from 'react-router-dom'
+import { Layout, Menu, ConfigProvider, theme, Empty, Row, Col, Avatar, Dropdown, Space, Typography, App as AntApp } from 'antd'
+import { DownOutlined } from '@ant-design/icons'
+import ErrorBoundary from '@/components/ErrorBoundary'
+import zhLocale from 'antd/locale/zh_CN'
+import { useThemeContext } from '@/stores/ThemeContext'
 import { useAuthContext } from '@/stores/AuthContext'
-import 'dayjs/locale/zh-cn';
+import 'dayjs/locale/zh-cn'
 
 import 'react-chat-elements/dist/main.css'
-import '@/assets/App.css';
-import AppLogo from '@/assets/logo-gh.png';
-import { isEmpty } from '@/utils/commons';
+import '@/assets/App.css'
+import AppLogo from '@/assets/logo-gh.png'
+import { isEmpty } from '@/utils/commons'
 
 const { Header, Footer, Content } = Layout
 const { Title } = Typography
@@ -90,7 +90,7 @@ function AuthApp() {
                     trigger={['click']}
                   >
                     <a onClick={(e) => e.preventDefault()} style={{ color: colorPrimary }}>
-                      <Space size='middle'><Avatar src={loginUser.avatarUrl} />廖一军<DownOutlined />​</Space>
+                      <Space><Avatar src={loginUser.avatarUrl} />廖一军<DownOutlined />​</Space>
                     </a>
                   </Dropdown>
 
diff --git a/src/views/OrderFollow.jsx b/src/views/OrderFollow.jsx
index f18ad8c..cc3b7c4 100644
--- a/src/views/OrderFollow.jsx
+++ b/src/views/OrderFollow.jsx
@@ -1,10 +1,21 @@
-import { memo, useCallback, useEffect, useState } from 'react'
-import {
-  Badge, Divider, Table, Button, Input,
-  Space, Tag, Radio, Select, Flex, Form, Switch, DatePicker, App
-} from 'antd'
 import { Conditional } from '@/components/Conditional'
 import { useAuthContext } from '@/stores/AuthContext'
+import {
+  App,
+  Badge,
+  Button,
+  DatePicker,
+  Divider,
+  Flex, Form,
+  Input,
+  Radio, Select,
+  Space,
+  Switch,
+  Table,
+  Tag
+} from 'antd'
+import { memo, useCallback, useEffect, useState } from 'react'
+import { NavLink } from 'react-router-dom'
 
 const { RangePicker } = DatePicker
 
@@ -17,7 +28,7 @@ const AdvanceSearchForm = memo(function ({ onSubmit }) {
     <Form
       layout={'inline'}
       form={form}
-      initialValues={{ orderLabel: '全部' }}
+      initialValues={{ orderLabel: '全部', orderStatus: '全部' }}
       onFinish={handleSubmit}
       style={{
         maxWidth: 'none',
@@ -29,18 +40,9 @@ const AdvanceSearchForm = memo(function ({ onSubmit }) {
             width: 100,
           }}
           options={[
-            {
-              value: '潜力',
-              label: '潜力',
-            },
-            {
-              value: '重点',
-              label: '重点',
-            },
-            {
-              value: '休眠',
-              label: '休眠',
-            }
+            { value: '240003', label: '重点' },
+            { value: '240002', label: '潜力' },
+            { value: '240001', label: '休眠' }
           ]}
         />
       </Form.Item>
@@ -80,7 +82,7 @@ const AdvanceSearchForm = memo(function ({ onSubmit }) {
       <Form.Item label='订单号' name='orderNumber'>
         <Input placeholder='订单号' allowClear />
       </Form.Item>
-      <Form.Item label='出发日期' name='startDate'>
+      <Form.Item label='出发日期' name='startDateRange'>
         <RangePicker />
       </Form.Item>
       <Form.Item >
@@ -97,11 +99,11 @@ function OrderList({ formValues }) {
       title: '订单号',
       dataIndex: 'COLI_ID',
       width: 222,
-      render: (text, record, index) => {
-        if (record.COLI_LineGrade === 240003) return <Space key={record.COLI_ID + index} size='middle'>{text}<Tag color='red'>重点</Tag></Space>
-        else if (record.COLI_LineGrade === 240002) return <Space key={record.COLI_ID + index} size='middle'>{text}<Tag color='green'>潜力</Tag></Space>
-        else if (record.COLI_LineGrade === 240001) return <Space key={record.COLI_ID + index} size='middle'>{text}<Tag color='blue'>休眠</Tag></Space>
-        else return <Space key={record.COLI_ID + index} size='middle'>{text}</Space>
+      render: (text, record) => {
+        if (record.COLI_LineGrade === 240003) return <Space>{text}<Tag color='red'>重点</Tag></Space>
+        else if (record.COLI_LineGrade === 240002) return <Space>{text}<Tag color='green'>潜力</Tag></Space>
+        else if (record.COLI_LineGrade === 240001) return <Space>{text}<Tag color='blue'>休眠</Tag></Space>
+        else return <Space>{text}</Space>
       }
     },
     {
@@ -111,8 +113,8 @@ function OrderList({ formValues }) {
         let regularText = ''
         if (record.buytime > 0) regularText = '(R' + record.buytime + ')'
         return (
-          <Space size='middle'>
-            <a>{text + regularText}</a>
+          <Space>
+            <NavLink to={`/order/chat/${record.COLI_ID}`}>{text + regularText}</NavLink>
             <Badge
               count={record.unread_msg}
               style={{
diff --git a/src/views/SalesManagement.jsx b/src/views/SalesManagement.jsx
index 5f77f93..d299555 100644
--- a/src/views/SalesManagement.jsx
+++ b/src/views/SalesManagement.jsx
@@ -1,14 +1,5 @@
-import { useNavigate } from 'react-router-dom'
-import { memo, useRef, useCallback, useEffect, useState } from 'react'
-import {
-  Row, Col, Divider, Table, Card, Button, Input,
-  Space, Segmented, Radio, Select, Flex, Spin, Form, Switch, DatePicker, List, Avatar
-} from 'antd'
-import {
-  StarFilled, ZoomInOutlined, StarOutlined, SearchOutlined, ImportOutlined
-} from '@ant-design/icons'
-
-import {useGetJson} from '@/hooks/userFetch'
+import { Button, DatePicker, Divider, Form, Input, Select, Table } from 'antd';
+import { memo, useCallback, useEffect, useRef, useState } from 'react';
 
 const { RangePicker } = DatePicker