diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js index 42cdcf4..b51d33d 100644 --- a/src/actions/EmailActions.js +++ b/src/actions/EmailActions.js @@ -384,7 +384,7 @@ export const searchEmailListAction = async ({opi_sn = '', mailboxtype = 'ALL', s // formData.append('content', content) const { errcode, result } = await postForm(`${API_HOST_V3}/mail_search`, formData) const ret = errcode === 0 ? result : [] - notifyMailboxUpdate({ type: 'maillist-search-result', query: [sender, receiver, subject].filter(s => s).join(' '), data: ret.map(ele => ({...ele, key: ele.MAI_SN})) }) + notifyMailboxUpdate({ type: 'maillist-search-result', query: [sender, receiver, subject].filter(s => s).join(' '), data: ret.map(ele => ({...ele, key: ele.MAI_SN, showFolder: true })) }) return ret; } diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx index cdd62c2..0b4d8e2 100644 --- a/src/views/orders/components/MailBox.jsx +++ b/src/views/orders/components/MailBox.jsx @@ -1,5 +1,5 @@ import { useEffect, useState } from 'react' -import { ReloadOutlined, ReadOutlined, RightOutlined, LeftOutlined, SearchOutlined, MailOutlined, DeleteOutlined } from '@ant-design/icons' +import { ReloadOutlined, ReadOutlined, RightOutlined, LeftOutlined, SearchOutlined, MailOutlined, DeleteOutlined, CloseOutlined, CloseCircleTwoTone, CloseCircleOutlined } from '@ant-design/icons' import { Flex, Button, Tooltip, List, Form, Row, Col, Input, Checkbox, DatePicker, Switch, Breadcrumb, Skeleton, Popconfirm } from 'antd' import { useEmailList } from '@/hooks/useEmail' import { isEmpty } from '@/utils/commons' @@ -70,8 +70,8 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => { const mailItemRender = (item) => { const isOrderNode = mailboxDir.COLI_SN > 0 const orderNumber = isEmpty(item.MAI_COLI_ID) || isOrderNode ? '' : item.MAI_COLI_ID + ' - ' - const folderName = isOrderNode ? `[${item.FDir}]` : '' - const orderMailType = {item.MAT_Name} + const folderName = (item.showFolder) ? `[${item.FDir}] ` : '' + const orderMailType = item.MAT_Name ? {item.MAT_Name} : '' const countryName = isEmpty(item.CountryCN) ? '' : '[' + item.CountryCN + '] ' const mailStateClass = item.MOI_ReadState === 0 ? 'font-bold' : '' const hasAtta = item.MAI_Attachment !== 0 ? : null @@ -94,11 +94,15 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => { }}>
- {orderNumber} + {folderName}{orderNumber} {item.MAI_Subject || '[无主题]'} {hasAtta}
- {countryName + item.SenderReceiver + ' ' + item.SRDate} + + {countryName + item.SenderReceiver} + {orderMailType} + {item.SRDate} +
@@ -170,6 +174,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => { } })} /> + {tempBreadcrumb && (