diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx index 7da2c6e..2525def 100644 --- a/src/views/orders/Follow.jsx +++ b/src/views/orders/Follow.jsx @@ -17,7 +17,7 @@ import { SaveOutlined, PlusOutlined, MehOutlined, - SmileOutlined, + CompassOutlined, CheckSquareTwoTone, CarryOutTwoTone, MailTwoTone, @@ -27,7 +27,7 @@ import { CalendarOutlined, HeartTwoTone, MoneyCollectTwoTone } from '@ant-design/icons' -import { App, Badge, Empty, Flex, Button, Drawer , Space, Radio, Table, Tabs, Divider, Tag, Tooltip, Row, Col, Segmented, Tree, Typography, Input, Descriptions, Checkbox } from 'antd' +import { App, Badge, Empty, Flex, Button, Drawer , Space, Radio, Table, Tabs, Divider, Tag, Tooltip, List, Dropdown , Segmented, Tree, Typography, Input, Descriptions, Checkbox, Layout, Row, Col } from 'antd' import dayjs from 'dayjs' import { useCallback, useEffect, useState } from 'react' import { Link } from 'react-router-dom' @@ -340,7 +340,7 @@ function Follow() { const [mailSubject, setSubject] = useState(''); const [openOrder, setOpenOrder] = useState(false); - +const [collapsed, setCollapsed] = useState(false) const [formValues, setFormValues] = useFormStore(useShallow((state) => [state.orderFollowForm, state.setOrderFollowForm])) const [advanceChecked, toggleAdvance] = useFormStore(useShallow((state) => [state.orderFollowAdvanceChecked, state.setOrderFollowAdvanceChecked])) @@ -358,9 +358,11 @@ function Follow() { return ( <> - - - + + + , + children: [ + { + title: 'Albee240422193452', + key: 'Albee240422193452', + }, + { + title: 'Albee240422193285', + key: 'Albee240422193285', + }, + { + title: 'Albee240422193752', + key: 'Albee240422193752', + }, + { + title: 'Albee2404221934583', + key: 'Albee2404221934583', + }, + { + title: 'Albee2404221937836', + key: 'Albee2404221937836', + }, + ], }, ], }, @@ -459,11 +483,37 @@ function Follow() { }, ]} /> - - - -
- + + + + + + -
- {}} >高级搜索 + + + + + + +', + title: '250520-LSS250429038 团的 变更 �确认:Japan Fleet', + mailDate: '2025-05-01 19:21:00', + orderNo: 'LSS250501006', + country: 'Thailand', + }, + { + key: Math.random().toString(36).substring(2, 9), + description: 'Fran Grundman ', + title: 'Your Thailand Private tour by Asia Highlights 超长主题怎么办????????????到框框到得奖看到', + mailDate: '2025-05-01 19:21:00', + orderNo: 'LSS250501006', + country: 'Thailand', + }, + { + key: Math.random().toString(36).substring(2, 9), + description: 'Fran Grundman ', + title: 'Re: Personal information', + mailDate: '2025-05-01 19:21:00', + orderNo: 'LSS250501006', + country: 'Thailand', + }, + { + key: Math.random().toString(36).substring(2, 9), + description: 'Fran Grundman ', + title: 'Re: Your Future Trip with Asia Highlights', + mailDate: '2025-05-01 19:21:00', + orderNo: 'LSS250501006', + country: 'Thailand', + }, + { + key: Math.random().toString(36).substring(2, 9), + description: 'Fran Grundman ', + title: '回复: 回复:中华游251110-LSS250413051(AH)团计划', + mailDate: '2025-05-01 19:21:00', + orderNo: 'LSS250501006', + country: 'Thailand', + }, + { + key: Math.random().toString(36).substring(2, 9), + description: 'Fran Grundman ', + title: 'Re: Greeting from Asia Highlights Alisa', + mailDate: '2025-05-01 19:21:00', + orderNo: 'LSS250501006', + country: 'Thailand', + }, + { + key: Math.random().toString(36).substring(2, 9), + description: 'Fran Grundman ', + title: 'Re: Have you made any decisions about your Japan trip', + mailDate: '2025-05-01 19:21:00', + orderNo: 'LSS250501006', + country: 'Thailand', + }, + { + key: Math.random().toString(36).substring(2, 9), + description: 'Fran Grundman ', + title: 'Re: Sri Lanka tour', + mailDate: '2025-05-01 19:21:00', + orderNo: 'LSS250501006', + country: 'Thailand', + }, + { + key: Math.random().toString(36).substring(2, 9), + description: 'Fran Grundman ', + title: 'Re: How do you like the itinerary 3', + mailDate: '2025-05-01 19:21:00', + orderNo: 'LSS250501006', + country: 'Thailand', + }, + { + key: Math.random().toString(36).substring(2, 9), + description: 'Fran Grundman ', + title: 'Re: Re: Re: Final cost', + mailDate: '2025-05-01 19:21:00', + orderNo: 'LSS250501006', + country: 'Thailand', + }, + { + key: Math.random().toString(36).substring(2, 9), + description: 'Fran Grundman ', + title: 'Reference Number: LSS240628079', + mailDate: '2025-05-01 19:21:00', + orderNo: 'LSS250501006', + country: 'Thailand', + }, + { + key: Math.random().toString(36).substring(2, 9), + description: 'Fran Grundman ', + title: 'Re: Personal information and Hiroshima tour for 2 people', + mailDate: '2025-05-01 19:21:00', + orderNo: 'LSS250501006', + country: 'Thailand', + }, + { + key: Math.random().toString(36).substring(2, 9), + description: 'Fran Grundman ', + title: 'Re: Asia Travel Tips /LSS250429038', + mailDate: '2025-05-01 19:21:00', + orderNo: 'LSS250501006', + country: 'Thailand', + }, + ]} + renderItem={item => ( + 回复, + // 转发, + // ]} + > + setSubject(item.title)}>{item.title}} + description={item.description + ' ' + item.mailDate} + /> + {item.content}LSS250501006, Thailand + + )} + /> + + +
+ + + + + + + + + + ', + }, + { + key: '2', + label: '收件人', + children: '', + }, + { + key: '3', + label: '发送日期', + children: '2025-05-16 14:11', + }, +]} /> +

{Math.random().toString(36).substring(2, 9)}Some contents...

+

Some {Math.random().toString(36).substring(2, 9)}contents...

+

Some contents...{Math.random().toString(36).substring(2, 9)}

+
+ + {/*
{ return { onClick: (event) => {console.info(event)}, // 点击行 @@ -485,40 +717,48 @@ function Follow() { }; }} pagination={false} + sticky={{ offsetHeader: 64 }} columns={[ - { - title: '收/发件人', - dataIndex: 'name', - key: 'name', - render: (text) => {text}, - }, { title: '主题', dataIndex: 'subject', key: 'subject', + width: 500, render: (text) => { setSubject(text) setOpenMail(true) }}>{text}, }, + { + title: '收/发件人', + dataIndex: 'name', + key: 'name', + width: 380, + minWidth: 180, + render: (text) => {text}, + }, { title: '收/发日期', dataIndex: 'mailDate', key: '收/发日期', + width: 180, }, { title: '订单号', key: 'orderNo', dataIndex: 'orderNo', + width: 140, }, { title: '国籍', key: 'country', dataIndex: 'country', + width: 120, }, { title: '操作', key: 'action', + width: 120, render: (_, record) => ( 回复 @@ -539,7 +779,7 @@ function Follow() { { key: Math.random().toString(36).substring(2, 9), name: 'Fran Grundman ', - subject: '【阿里云邮】弱密改密提醒 ' + Math.random().toString(36).substring(2, 9), + subject: 'Your Thailand Private tour by Asia Highlights 超长主题怎么办????????????到框框到得奖看到' + Math.random().toString(36).substring(2, 9), mailDate: '2025-05-01 19:21:00', orderNo: 'LSS250501006', country: 'Thailand', @@ -633,10 +873,10 @@ function Follow() { country: 'Thailand', }, ]} - /> -{/* - - + /> */} + + + {/* -
换行了。。。看看 ' }}>
-
*/} - -
- + */} + + + setCollapsed(value)} collapsedWidth={0} reverseArrow={true}> + LSS250501006 @@ -690,6 +932,10 @@ function Follow() { Jorgina(R1) + + + Thailand + - - - - - - - + +

{Math.random().toString(36).substring(2, 9)}Some contents...

-

Some contents...

-

Some contents...

+

Some {Math.random().toString(36).substring(2, 9)}contents...

+

Some contents...{Math.random().toString(36).substring(2, 9)}