增加跳转到聊天的路由

dev/mobile
Jimmy Liow 2 years ago
parent f1abb8cebd
commit 9a377c8aa4

@ -1,16 +1,16 @@
import { Outlet, Link, useHref, NavLink } from 'react-router-dom'; 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 { Layout, Menu, ConfigProvider, theme, Empty, Row, Col, Avatar, Dropdown, Space, Typography, App as AntApp } from 'antd'
import { DownOutlined } from '@ant-design/icons'; import { DownOutlined } from '@ant-design/icons'
import ErrorBoundary from '@/components/ErrorBoundary'; import ErrorBoundary from '@/components/ErrorBoundary'
import zhLocale from 'antd/locale/zh_CN'; import zhLocale from 'antd/locale/zh_CN'
import { useThemeContext } from '@/stores/ThemeContext'; import { useThemeContext } from '@/stores/ThemeContext'
import { useAuthContext } from '@/stores/AuthContext' import { useAuthContext } from '@/stores/AuthContext'
import 'dayjs/locale/zh-cn'; import 'dayjs/locale/zh-cn'
import 'react-chat-elements/dist/main.css' import 'react-chat-elements/dist/main.css'
import '@/assets/App.css'; import '@/assets/App.css'
import AppLogo from '@/assets/logo-gh.png'; import AppLogo from '@/assets/logo-gh.png'
import { isEmpty } from '@/utils/commons'; import { isEmpty } from '@/utils/commons'
const { Header, Footer, Content } = Layout const { Header, Footer, Content } = Layout
const { Title } = Typography const { Title } = Typography
@ -90,7 +90,7 @@ function AuthApp() {
trigger={['click']} trigger={['click']}
> >
<a onClick={(e) => e.preventDefault()} style={{ color: colorPrimary }}> <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> </a>
</Dropdown> </Dropdown>

@ -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 { Conditional } from '@/components/Conditional'
import { useAuthContext } from '@/stores/AuthContext' 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 const { RangePicker } = DatePicker
@ -17,7 +28,7 @@ const AdvanceSearchForm = memo(function ({ onSubmit }) {
<Form <Form
layout={'inline'} layout={'inline'}
form={form} form={form}
initialValues={{ orderLabel: '全部' }} initialValues={{ orderLabel: '全部', orderStatus: '全部' }}
onFinish={handleSubmit} onFinish={handleSubmit}
style={{ style={{
maxWidth: 'none', maxWidth: 'none',
@ -29,18 +40,9 @@ const AdvanceSearchForm = memo(function ({ onSubmit }) {
width: 100, width: 100,
}} }}
options={[ options={[
{ { value: '240003', label: '重点' },
value: '潜力', { value: '240002', label: '潜力' },
label: '潜力', { value: '240001', label: '休眠' }
},
{
value: '重点',
label: '重点',
},
{
value: '休眠',
label: '休眠',
}
]} ]}
/> />
</Form.Item> </Form.Item>
@ -80,7 +82,7 @@ const AdvanceSearchForm = memo(function ({ onSubmit }) {
<Form.Item label='订单号' name='orderNumber'> <Form.Item label='订单号' name='orderNumber'>
<Input placeholder='订单号' allowClear /> <Input placeholder='订单号' allowClear />
</Form.Item> </Form.Item>
<Form.Item label='出发日期' name='startDate'> <Form.Item label='出发日期' name='startDateRange'>
<RangePicker /> <RangePicker />
</Form.Item> </Form.Item>
<Form.Item > <Form.Item >
@ -97,11 +99,11 @@ function OrderList({ formValues }) {
title: '订单号', title: '订单号',
dataIndex: 'COLI_ID', dataIndex: 'COLI_ID',
width: 222, width: 222,
render: (text, record, index) => { render: (text, record) => {
if (record.COLI_LineGrade === 240003) return <Space key={record.COLI_ID + index} size='middle'>{text}<Tag color='red'>重点</Tag></Space> if (record.COLI_LineGrade === 240003) return <Space>{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 === 240002) return <Space>{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 if (record.COLI_LineGrade === 240001) return <Space>{text}<Tag color='blue'>休眠</Tag></Space>
else return <Space key={record.COLI_ID + index} size='middle'>{text}</Space> else return <Space>{text}</Space>
} }
}, },
{ {
@ -111,8 +113,8 @@ function OrderList({ formValues }) {
let regularText = '' let regularText = ''
if (record.buytime > 0) regularText = '(R' + record.buytime + ')' if (record.buytime > 0) regularText = '(R' + record.buytime + ')'
return ( return (
<Space size='middle'> <Space>
<a>{text + regularText}</a> <NavLink to={`/order/chat/${record.COLI_ID}`}>{text + regularText}</NavLink>
<Badge <Badge
count={record.unread_msg} count={record.unread_msg}
style={{ style={{

@ -1,14 +1,5 @@
import { useNavigate } from 'react-router-dom' import { Button, DatePicker, Divider, Form, Input, Select, Table } from 'antd';
import { memo, useRef, useCallback, useEffect, useState } from 'react' import { memo, useCallback, useEffect, useRef, 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'
const { RangePicker } = DatePicker const { RangePicker } = DatePicker

Loading…
Cancel
Save