Commit 36c8ed50 authored by XieZhiXiong's avatar XieZhiXiong

chore: 替换全局组件

parent d18260db
......@@ -31,13 +31,13 @@ import { normalizeFiledata, FileData, findLastIndexFlowState } from '@/utils';
import AnchorPage from '@/layouts/AnchorPage';
import StatusTag from '@/components/StatusTag';
import { EditableColumns } from '@/components/PolymericTable/interface';
import AuditProcess from '@/components/AuditProcess';
import { OuterHistoryData, InnerHistoryData } from '../../../components/FlowRecords';
import {
EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP,
} from '../../../constants';
const OuterCirculation = React.lazy(() => import('../../../components/OuterCirculation'));
const ProductList = React.lazy(() => import('../../../components/ProductList'));
const ExchangeReceivedInfo = React.lazy(() => import('../../../components/ExchangeReceivedInfo'));
const ExchangeDeliverInfo = React.lazy(() => import('../../../components/ExchangeDeliverInfo'));
......@@ -433,22 +433,20 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<Row gutter={[16, 16]}>
{/* 外部流转 */}
<Col span={24}>
<Suspense fallback={null}>
<OuterCirculation
steps={
detailInfo && detailInfo.outerTaskList ?
detailInfo.outerTaskList.map(item => ({
step: item.step,
title: item.taskName,
description: item.roleName,
status: item.isExecute ? 'finish' : 'wait',
})) :
[]
}
current={findLastIndexFlowState(detailInfo?.outerTaskList)}
id="taskList"
/>
</Suspense>
<AuditProcess
outerVerifyCurrent={findLastIndexFlowState(detailInfo?.outerTaskList)}
outerVerifySteps={(
detailInfo && detailInfo.outerTaskList ?
detailInfo.outerTaskList.map(item => ({
...item,
status: item.isExecute ? 'finish' : 'wait',
})) :
[]
)}
customTitleKey="taskName"
id="taskList"
ellipsis
/>
</Col>
{/* 基本信息 */}
......@@ -557,6 +555,8 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
innerStatus={detailInfo?.innerStatus}
target={target}
isEdit={isEditRefundDeliver}
afterType={2}
deliveryType={detailInfo?.returnGoodsAddress?.deliveryType}
id="returnDeliveryGoodsList"
/>
</Suspense>
......
......@@ -488,33 +488,20 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<Row gutter={[16, 16]}>
{/* 流转进度 */}
<Col span={24}>
<Suspense fallback={null}>
<AuditProcess
outerVerifySteps={
detailInfo && detailInfo.outerTaskList ?
detailInfo.outerTaskList.map(item => ({
step: item.step,
stepName: item.taskName,
roleName: item.roleName,
status: item.isExecute ? 'finish' : 'wait',
})) :
[]
}
outerVerifyCurrent={findLastIndexFlowState(detailInfo?.outerTaskList)}
innerVerifySteps={
detailInfo && detailInfo.innerTaskList ?
detailInfo.innerTaskList.map(item => ({
step: item.step,
stepName: item.taskName,
roleName: item.roleName,
status: item.isExecute ? 'finish' : 'wait',
})) :
[]
}
innerVerifyCurrent={findLastIndexFlowState(detailInfo?.innerTaskList)}
id="taskList"
/>
</Suspense>
<AuditProcess
outerVerifyCurrent={findLastIndexFlowState(detailInfo?.outerTaskList)}
outerVerifySteps={(
detailInfo && detailInfo.outerTaskList ?
detailInfo.outerTaskList.map(item => ({
...item,
status: item.isExecute ? 'finish' : 'wait',
})) :
[]
)}
customTitleKey="taskName"
id="taskList"
ellipsis
/>
</Col>
{/* 基本信息 */}
......@@ -621,6 +608,8 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
innerStatus={detailInfo?.innerStatus}
target={target}
isEdit={isEditRefundDeliver}
afterType={2}
deliveryType={detailInfo?.returnGoodsAddress?.deliveryType}
id="returnDeliveryGoodsList"
/>
</Suspense>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment