From 9823214e4b355223d55ffcaaeeeb13f76f7d93b6 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Wed, 4 Jun 2025 17:00:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?perf=EF=BC=9A=E5=A2=9E=E5=8A=A0=E9=9D=A2?=
 =?UTF-8?q?=E5=8C=85=E5=B1=91=EF=BC=9B=E8=B0=83=E6=95=B4=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E5=8D=95=E9=80=89=E6=A1=86=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OrderProfile.jsx         |   4 +-
 src/views/orders/components/MailBox.jsx | 245 +++++++++---------------
 2 files changed, 91 insertions(+), 158 deletions(-)

diff --git a/src/components/OrderProfile.jsx b/src/components/OrderProfile.jsx
index 343ab23..60b6303 100644
--- a/src/components/OrderProfile.jsx
+++ b/src/components/OrderProfile.jsx
@@ -7,7 +7,7 @@ import {
   HeartTwoTone,
   MoneyCollectTwoTone,
   FolderOutlined,
-  DeleteOutlined, ClockCircleOutlined,
+  DeleteOutlined, EditOutlined,
   FormOutlined
 } from '@ant-design/icons'
 
@@ -124,7 +124,7 @@ const OrderProfile = (props) => {
       <Divider orientation='left'>
         <Typography.Text strong>附加信息</Typography.Text>
         <Tooltip title='修改'>
-        <FileAddOutlined className='pl-1' />
+        <EditOutlined className='pl-1' />
         </Tooltip>
       </Divider>
       <Typography.Text>
diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 7f3147a..424ee87 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -1,9 +1,39 @@
 import { useCallback, useEffect, useState } from 'react'
-import { ReloadOutlined, ReadOutlined, CheckSquareOutlined } from '@ant-design/icons'
-import { Flex, Button, Tooltip, List, Radio, Typography, Divider, Drawer, Dropdown, Input, Checkbox } from 'antd'
+import { ReloadOutlined, ReadOutlined, CheckSquareOutlined, StarOutlined, HomeOutlined } from '@ant-design/icons'
+import { Flex, Button, Tooltip, List, Form, Row, Col, Drawer, Dropdown, Input, Checkbox, DatePicker, Select, Breadcrumb } from 'antd'
+import dayjs from 'dayjs';
 
+const { RangePicker } = DatePicker;
 const MailBox = (props) => {
+  const DATE_RANGE_PRESETS = [
+      {
+        label: '本周',
+        value: [dayjs().startOf('w'), dayjs().endOf('w')],
+      },
+      {
+        label: '上周',
+        value: [dayjs().startOf('w').subtract(7, 'days'), dayjs().endOf('w').subtract(7, 'days')],
+      },
+      {
+        label: '本月',
+        value: [dayjs().startOf('M'), dayjs().endOf('M')],
+      },
+      {
+        label: '上月',
+        value: [dayjs().subtract(1, 'M').startOf('M'), dayjs().subtract(1, 'M').endOf('M')],
+      },
+      {
+        label: '前三月',
+        value: [dayjs().subtract(2, 'M').startOf('M'), dayjs().endOf('M')],
+      },
+      {
+        label: '本年',
+        value: [dayjs().startOf('y'), dayjs().endOf('y')],
+      },
+    ];
   const [openOrder, setOpenOrder] = useState(false)
+  const [form] = Form.useForm()
+
   return (
     <>
       <div className='bg-white h-auto px-1 flex gap-1 items-center'>
@@ -83,176 +113,79 @@ const MailBox = (props) => {
 
       <div className='bg-white overflow-y-auto' style={{ height: 'calc(100vh - 198px)' }}>
         <List
-          // header={null}
-          header={<div>{props.title}</div>}
+          header={<Breadcrumb
+    items={[
+      {
+        title: (
+          <>
+            <StarOutlined />
+            <span>今日任务</span>
+          </>
+        ),
+      },
+      {
+        title: (
+          <>
+            <span>lyj20210810144702</span>
+          </>
+        ),
+      },
+    ]}
+  />}
           itemLayout='vertical'
           size='large'
           pagination={false}
           dataSource={props.dataSource}
-          dataSource1={[...props.dataSource,
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              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 <frangrundman@rogers.com>',
-              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 <frangrundman@rogers.com>',
-              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 <frangrundman@rogers.com>',
-              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 <frangrundman@rogers.com>',
-              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 <frangrundman@rogers.com>',
-              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 <frangrundman@rogers.com>',
-              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 <frangrundman@rogers.com>',
-              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 <frangrundman@rogers.com>',
-              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 <frangrundman@rogers.com>',
-              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 <frangrundman@rogers.com>',
-              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 <frangrundman@rogers.com>',
-              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 <frangrundman@rogers.com>',
-              title: 'Re: Asia Travel Tips /LSS250429038',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-          ]}
           renderItem={(item) => (
-            <li className='flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-gray-100 p-2'>
-              <div className='flex-1'>
+            <li className='flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-neutral-50 p-2'>
+              <div className=''>
+                <Checkbox></Checkbox>
+              </div>
+              <div className='flex-1 pl-2'>
                 <Flex gap='small' vertical={true} justify='space-between' className='cursor-pointer'>
                   <span className="font-bold">{item.title}</span>
                   <span className="text-neutral-500 text-wrap break-words break-all ">{item.description + ' ' + item.mailDate}</span>
-                  {item.orderNo + ' ' + item.country}
+                  {item.orderNo + ' ' + (item.country===null?'' : item.country)}
                 </Flex>
               </div>
-              <div className=''>
-                <Checkbox></Checkbox>
-              </div>
             </li>
           )}
         />
       </div>
 
       <Drawer title={'高级搜索'} placement='top' getContainer={false} size={'large'} mask={true} maskClosable={true} open={openOrder} onClose={() => setOpenOrder(false)}>
-        <Divider orientation='left'>
-          <Typography.Text strong>是否重要</Typography.Text>
-        </Divider>
-        <Radio.Group
-          options={[
-            { label: '重点', value: '1' },
-            { label: '次重点', value: '2' },
-            { label: '一般', value: '3' },
-          ]}
-        />
-
-        <Divider orientation='left'>
-          <Typography.Text strong>状态</Typography.Text>
-        </Divider>
-        <Radio.Group
-          options={[
-            { label: '新订单', value: '4' },
-            { label: '报价中', value: '5' },
-            { label: '以后联系', value: '6' },
-            { label: '等待付订金', value: '7' },
-            { label: '成行', value: '8' },
-            { label: '丢失', value: '9' },
-            { label: '取消', value: '10' },
-            { label: '未报价', value: '11' },
-          ]}
-        />
-
-        <Divider orientation='left'>
-          <Typography.Text strong> 催信</Typography.Text>
-        </Divider>
-        <Checkbox.Group
-          options={[
-            { label: '一催', value: 'Apple', className: 'label-1' },
-            { label: '二催', value: 'Pear', className: 'label-2' },
-            { label: '三催', value: 'Orange', className: 'label-3' },
-            { label: '重点团', value: '2233342', className: 'label-3' },
-            { label: '已发 travel advisor survey', value: '43535', className: 'label-3' },
-          ]}
-          defaultValue={['Apple']}
-        />
+        <Form
+      layout={'vertical'}
+      form={form}
+      initialValues={{
+      }}
+      // onFinish={handleSubmit}
+      >
+      <Row justify='start' gutter={16}>
+        <Col span={4}>
+          <Form.Item label='订单号' name='orderNumber'>
+            <Input placeholder='订单号' allowClear />
+          </Form.Item>
+        </Col>
+        <Col span={4}>
+          <Form.Item label='出发日期' name='startDateRange'>
+            <RangePicker allowClear={true} inputReadOnly={true} presets={DATE_RANGE_PRESETS} />
+          </Form.Item>
+        </Col>
+        <Col span={4}>
+          <Form.Item label='确认日期' name='confirmDateRange'>
+            <RangePicker allowClear={true} inputReadOnly={true} presets={DATE_RANGE_PRESETS} />
+          </Form.Item>
+        </Col>
+      </Row>
+      <Row justify='start' align='middle' gutter={16}>
+        <Col span={1} offset={1}>
+          <Button type='primary' htmlType='submit'>
+            搜索
+          </Button>
+        </Col>
+      </Row>
+    </Form>
       </Drawer>
     </>
   )

From c8ca19954f6bacb9d7dfb0621fd06f7f4848b1ea Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Thu, 5 Jun 2025 16:31:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=8C=89=E9=92=AE=E5=8F=8A=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orders/components/MailBox.jsx | 171 +++++++++++++-----------
 1 file changed, 90 insertions(+), 81 deletions(-)

diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 424ee87..51b6d2a 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -1,36 +1,36 @@
 import { useCallback, useEffect, useState } from 'react'
-import { ReloadOutlined, ReadOutlined, CheckSquareOutlined, StarOutlined, HomeOutlined } from '@ant-design/icons'
+import { ReloadOutlined, ReadOutlined, CheckSquareOutlined, StarOutlined, RightOutlined, LeftOutlined } from '@ant-design/icons'
 import { Flex, Button, Tooltip, List, Form, Row, Col, Drawer, Dropdown, Input, Checkbox, DatePicker, Select, Breadcrumb } from 'antd'
-import dayjs from 'dayjs';
+import dayjs from 'dayjs'
 
-const { RangePicker } = DatePicker;
+const { RangePicker } = DatePicker
 const MailBox = (props) => {
   const DATE_RANGE_PRESETS = [
-      {
-        label: '本周',
-        value: [dayjs().startOf('w'), dayjs().endOf('w')],
-      },
-      {
-        label: '上周',
-        value: [dayjs().startOf('w').subtract(7, 'days'), dayjs().endOf('w').subtract(7, 'days')],
-      },
-      {
-        label: '本月',
-        value: [dayjs().startOf('M'), dayjs().endOf('M')],
-      },
-      {
-        label: '上月',
-        value: [dayjs().subtract(1, 'M').startOf('M'), dayjs().subtract(1, 'M').endOf('M')],
-      },
-      {
-        label: '前三月',
-        value: [dayjs().subtract(2, 'M').startOf('M'), dayjs().endOf('M')],
-      },
-      {
-        label: '本年',
-        value: [dayjs().startOf('y'), dayjs().endOf('y')],
-      },
-    ];
+    {
+      label: '本周',
+      value: [dayjs().startOf('w'), dayjs().endOf('w')],
+    },
+    {
+      label: '上周',
+      value: [dayjs().startOf('w').subtract(7, 'days'), dayjs().endOf('w').subtract(7, 'days')],
+    },
+    {
+      label: '本月',
+      value: [dayjs().startOf('M'), dayjs().endOf('M')],
+    },
+    {
+      label: '上月',
+      value: [dayjs().subtract(1, 'M').startOf('M'), dayjs().subtract(1, 'M').endOf('M')],
+    },
+    {
+      label: '前三月',
+      value: [dayjs().subtract(2, 'M').startOf('M'), dayjs().endOf('M')],
+    },
+    {
+      label: '本年',
+      value: [dayjs().startOf('y'), dayjs().endOf('y')],
+    },
+  ]
   const [openOrder, setOpenOrder] = useState(false)
   const [form] = Form.useForm()
 
@@ -113,25 +113,35 @@ const MailBox = (props) => {
 
       <div className='bg-white overflow-y-auto' style={{ height: 'calc(100vh - 198px)' }}>
         <List
-          header={<Breadcrumb
-    items={[
-      {
-        title: (
-          <>
-            <StarOutlined />
-            <span>今日任务</span>
-          </>
-        ),
-      },
-      {
-        title: (
-          <>
-            <span>lyj20210810144702</span>
-          </>
-        ),
-      },
-    ]}
-  />}
+          header={
+            <Flex align='center' justify="space-between">
+            <Breadcrumb
+              items={[
+                {
+                  title: (
+                    <>
+                      <StarOutlined />
+                      <span>今日任务</span>
+                    </>
+                  ),
+                },
+                {
+                  title: (
+                    <>
+                      <span>lyj20210810144702</span>
+                    </>
+                  ),
+                },
+              ]}
+            />
+            <Flex align="center" justify="space-between">
+              <span>51-100 of 562</span>
+            <Button icon={<LeftOutlined />} type="text" iconPosition={'end'}></Button>
+            <Button icon={<RightOutlined />} type="text" iconPosition={'end'}></Button>
+            </Flex>
+
+          </Flex>
+          }
           itemLayout='vertical'
           size='large'
           pagination={false}
@@ -143,9 +153,9 @@ const MailBox = (props) => {
               </div>
               <div className='flex-1 pl-2'>
                 <Flex gap='small' vertical={true} justify='space-between' className='cursor-pointer'>
-                  <span className="font-bold">{item.title}</span>
-                  <span className="text-neutral-500 text-wrap break-words break-all ">{item.description + ' ' + item.mailDate}</span>
-                  {item.orderNo + ' ' + (item.country===null?'' : item.country)}
+                  <span className='font-bold'>{item.title}</span>
+                  <span className='text-neutral-500 text-wrap break-words break-all '>{item.description + ' ' + item.mailDate}</span>
+                  {item.orderNo + ' ' + (item.country === null ? '' : item.country)}
                 </Flex>
               </div>
             </li>
@@ -155,37 +165,36 @@ const MailBox = (props) => {
 
       <Drawer title={'高级搜索'} placement='top' getContainer={false} size={'large'} mask={true} maskClosable={true} open={openOrder} onClose={() => setOpenOrder(false)}>
         <Form
-      layout={'vertical'}
-      form={form}
-      initialValues={{
-      }}
-      // onFinish={handleSubmit}
-      >
-      <Row justify='start' gutter={16}>
-        <Col span={4}>
-          <Form.Item label='订单号' name='orderNumber'>
-            <Input placeholder='订单号' allowClear />
-          </Form.Item>
-        </Col>
-        <Col span={4}>
-          <Form.Item label='出发日期' name='startDateRange'>
-            <RangePicker allowClear={true} inputReadOnly={true} presets={DATE_RANGE_PRESETS} />
-          </Form.Item>
-        </Col>
-        <Col span={4}>
-          <Form.Item label='确认日期' name='confirmDateRange'>
-            <RangePicker allowClear={true} inputReadOnly={true} presets={DATE_RANGE_PRESETS} />
-          </Form.Item>
-        </Col>
-      </Row>
-      <Row justify='start' align='middle' gutter={16}>
-        <Col span={1} offset={1}>
-          <Button type='primary' htmlType='submit'>
-            搜索
-          </Button>
-        </Col>
-      </Row>
-    </Form>
+          layout={'vertical'}
+          form={form}
+          initialValues={{}}
+          // onFinish={handleSubmit}
+        >
+          <Row justify='start' gutter={16}>
+            <Col span={4}>
+              <Form.Item label='订单号' name='orderNumber'>
+                <Input placeholder='订单号' allowClear />
+              </Form.Item>
+            </Col>
+            <Col span={4}>
+              <Form.Item label='出发日期' name='startDateRange'>
+                <RangePicker allowClear={true} inputReadOnly={true} presets={DATE_RANGE_PRESETS} />
+              </Form.Item>
+            </Col>
+            <Col span={4}>
+              <Form.Item label='确认日期' name='confirmDateRange'>
+                <RangePicker allowClear={true} inputReadOnly={true} presets={DATE_RANGE_PRESETS} />
+              </Form.Item>
+            </Col>
+          </Row>
+          <Row justify='start' align='middle' gutter={16}>
+            <Col span={1} offset={1}>
+              <Button type='primary' htmlType='submit'>
+                搜索
+              </Button>
+            </Col>
+          </Row>
+        </Form>
       </Drawer>
     </>
   )