Commit 88cef3d4 authored by XieZhiXiong's avatar XieZhiXiong

chore: 流转记录替换成全局的组件

parent 0dc60cc4
......@@ -24,7 +24,8 @@ import {
import AvatarWrap from '@/components/AvatarWrap';
import StatusTag from '@/components/StatusTag';
import AuditProcess from '@/components/AuditProcess';
import { FlowRecordsProps } from '../FlowRecords';
import FlowRecords, { IProps as FlowRecordsProps } from '@/components/FlowRecords';
import { EditableColumns } from '@/components/PolymericTable/interface';
import { DetailType } from './interface';
const ReturnAnalysis = React.lazy(() => import('../ReturnAnalysis'));
......@@ -32,7 +33,6 @@ const ReturnDetailInfo = React.lazy(() => import('../ReturnDetailInfo'));
const FileList = React.lazy(() => import('../FileList'));
const ReturnAddressInfo = React.lazy(() => import('../ReturnAddressInfo'));
const Score = React.lazy(() => import('../Score'));
const FlowRecords = React.lazy(() => import('../FlowRecords'));
const ReturnProductList = React.lazy(() => import('../ReturnProductList'));
interface ReturnProfileProps {
......@@ -47,7 +47,7 @@ interface ReturnProfileProps {
/**
* 获取外部流转记录方法
*/
fetchOuterHistory?: FlowRecordsProps['fetchOuterHistory'],
fetchOuterHistory?: FlowRecordsProps['fetchOuterList'],
/**
* 是否是采购商
*/
......@@ -66,6 +66,46 @@ const ReturnProfile: React.FC<ReturnProfileProps> = (props: ReturnProfileProps)
isPurchaser,
extra,
} = props;
const outerColumns: EditableColumns[] = [
{
title: '序号',
dataIndex: 'index',
align: 'center',
render: (_, record, index) => index + 1,
},
{
title: '操作角色',
dataIndex: 'roleName',
align: 'center',
},
{
title: '状态',
dataIndex: 'status',
align: 'center',
render: (text, record) => (
<StatusTag type={RETURN_OUTER_STATUS_TAG_MAP[record.status] || 'default'} title={text} />
),
},
{
title: '操作',
dataIndex: 'operate',
align: 'center',
},
{
title: '操作时间',
dataIndex: 'operateTime',
align: 'center',
ellipsis: true,
},
{
title: '审核意见',
dataIndex: 'opinion',
align: 'center',
ellipsis: true,
},
];
return (
<Spin spinning={loading}>
<PageHeaderWrapper
......@@ -222,8 +262,9 @@ const ReturnProfile: React.FC<ReturnProfileProps> = (props: ReturnProfileProps)
{/* 内、外部流转记录 */}
<Suspense fallback={null}>
<FlowRecords
fetchOuterHistory={fetchOuterHistory}
outerStatusMap={RETURN_OUTER_STATUS_TAG_MAP}
outerRowkey='step'
outerColumns={outerColumns}
fetchOuterList={fetchOuterHistory}
/>
</Suspense>
</Col>
......
import React from 'react';
import { usePageStatus } from '@/hooks/usePageStatus';
import { getAsReturnGoodsGetDetailPlatform, getAsReturnGoodsPageOuterWorkflowRecord } from '@/services/AfterServiceV2Api';
import { IProps as FlowRecordsProps } from '@/components/FlowRecords';
import fetchDetailHoc from '../common/hoc/fetchDetailHoc';
import ReturnProfile from '../components/ReturnProfile';
import { OuterHistoryData } from '../components/FlowRecords';
const ReturnPrVerifyDetailInfo: React.FC = () => {
const { id } = usePageStatus();
......@@ -14,10 +14,11 @@ const ReturnPrVerifyDetailInfo: React.FC = () => {
}),
}, ReturnProfile);
const fetchOuterHistory = (params): Promise<OuterHistoryData> => {
const fetchOuterHistory: FlowRecordsProps['fetchOuterList'] = (params) => {
return new Promise((resolve, reject) => {
getAsReturnGoodsPageOuterWorkflowRecord({
...params,
current: `${params.current}`,
pageSize: `${params.pageSize}`,
dataId: id,
})
.then(res => {
......
......@@ -6,9 +6,9 @@ import {
import { history } from 'umi';
import { usePageStatus } from '@/hooks/usePageStatus';
import { getAsReturnGoodsGetDetailPlatform, getAsReturnGoodsPageOuterWorkflowRecord, postAsPlatformReturnGoodsVerify } from '@/services/AfterServiceV2Api';
import { IProps as FlowRecordsProps } from '@/components/FlowRecords';
import fetchDetailHoc from '../common/hoc/fetchDetailHoc';
import ReturnProfile from '../components/ReturnProfile';
import { OuterHistoryData } from '../components/FlowRecords';
import VerifyModal, { ValueType as VerifyData } from '../components/VerifyModal';
const ReturnVerify: React.FC = () => {
......@@ -23,10 +23,11 @@ const ReturnVerify: React.FC = () => {
}),
}, ReturnProfile);
const fetchOuterHistory = (params): Promise<OuterHistoryData> => {
const fetchOuterHistory: FlowRecordsProps['fetchOuterList'] = (params) => {
return new Promise((resolve, reject) => {
getAsReturnGoodsPageOuterWorkflowRecord({
...params,
current: `${params.current}`,
pageSize: `${params.pageSize}`,
dataId: id,
})
.then(res => {
......
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