Commit 36fe1830 authored by XieZhiXiong's avatar XieZhiXiong

feat: 添加跳转订单详情的逻辑

parent d1170c56
......@@ -26,6 +26,14 @@ const route: RouterChild = {
hideInMenu: true,
noMargin: true,
},
// 换货申请单查询-订单详情
{
path: '/memberCenter/afterService/exchangeManage/exchangeQuery/orderDetail',
component: '@/pages/transaction/saleOrder/orderPreview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
},
// 待提交审核换货申请单
{
path: '/memberCenter/afterService/exchangeManage/exchangePrSubmit',
......@@ -48,6 +56,14 @@ const route: RouterChild = {
hideInMenu: true,
noMargin: true,
},
// 待提交审核换货申请单-订单详情
{
path: '/memberCenter/afterService/exchangeManage/exchangePrSubmit/orderDetail',
component: '@/pages/transaction/saleOrder/orderPreview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
},
// 待审核换货申请单(一级)
{
path: '/memberCenter/afterService/exchangeManage/exchangePr1',
......@@ -70,6 +86,14 @@ const route: RouterChild = {
hideInMenu: true,
noMargin: true,
},
// 待审核换货申请单(一级)-订单详情
{
path: '/memberCenter/afterService/exchangeManage/exchangePr1/orderDetail',
component: '@/pages/transaction/saleOrder/orderPreview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
},
// 待审核换货申请单(二级)
{
path: '/memberCenter/afterService/exchangeManage/exchangePr2',
......@@ -92,6 +116,14 @@ const route: RouterChild = {
hideInMenu: true,
noMargin: true,
},
// 待审核换货申请单(二级)-订单详情
{
path: '/memberCenter/afterService/exchangeManage/exchangePr2/orderDetail',
component: '@/pages/transaction/saleOrder/orderPreview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
},
// 待确认换货申请单
{
path: '/memberCenter/afterService/exchangeManage/exchangePrConfirm',
......@@ -114,6 +146,14 @@ const route: RouterChild = {
hideInMenu: true,
noMargin: true,
},
// 待确认换货申请单-订单详情
{
path: '/memberCenter/afterService/exchangeManage/exchangePrConfirm/orderDetail',
component: '@/pages/transaction/saleOrder/orderPreview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
},
// 待新增退货入库单
{
path: '/memberCenter/afterService/exchangeManage/exchangePrAddWarehousing',
......@@ -128,6 +168,14 @@ const route: RouterChild = {
hideInMenu: true,
noMargin: true,
},
// 待新增退货入库单-订单详情
{
path: '/memberCenter/afterService/exchangeManage/exchangePrAddWarehousing/orderDetail',
component: '@/pages/transaction/saleOrder/orderPreview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
},
// 待退货收货
{
path: '/memberCenter/afterService/exchangeManage/exchangePrReceived',
......@@ -150,6 +198,14 @@ const route: RouterChild = {
hideInMenu: true,
noMargin: true,
},
// 待退货收货-订单详情
{
path: '/memberCenter/afterService/exchangeManage/exchangePrReceived/orderDetail',
component: '@/pages/transaction/saleOrder/orderPreview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
},
// 待新增换货发货单
{
path: '/memberCenter/afterService/exchangeManage/exchangePrAddDeliver',
......@@ -164,6 +220,14 @@ const route: RouterChild = {
hideInMenu: true,
noMargin: true,
},
// 待新增换货发货单-订单详情
{
path: '/memberCenter/afterService/exchangeManage/exchangePrAddDeliver/orderDetail',
component: '@/pages/transaction/saleOrder/orderPreview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
},
// 待新增物流单
{
path: '/memberCenter/afterService/exchangeManage/exchangePrAddLogistics',
......@@ -178,6 +242,14 @@ const route: RouterChild = {
hideInMenu: true,
noMargin: true,
},
// 待新增物流单-订单详情
{
path: '/memberCenter/afterService/exchangeManage/exchangePrAddLogistics/orderDetail',
component: '@/pages/transaction/saleOrder/orderPreview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
},
// 待换货发货
{
path: '/memberCenter/afterService/exchangeManage/exchangePrDeliver',
......@@ -200,6 +272,14 @@ const route: RouterChild = {
hideInMenu: true,
noMargin: true,
},
// 待换货发货-订单详情
{
path: '/memberCenter/afterService/exchangeManage/exchangePrDeliver/orderDetail',
component: '@/pages/transaction/saleOrder/orderPreview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
},
// 待确认换货回单
{
path: '/memberCenter/afterService/exchangeManage/exchangePrConfirmBack',
......@@ -222,6 +302,14 @@ const route: RouterChild = {
hideInMenu: true,
noMargin: true,
},
// 待确认换货回单-订单详情
{
path: '/memberCenter/afterService/exchangeManage/exchangePrConfirmBack/orderDetail',
component: '@/pages/transaction/saleOrder/orderPreview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
},
]
};
......
......@@ -46,13 +46,21 @@ const Score = React.lazy(() => import('../../../components/Score'));
const FlowRecords = React.lazy(() => import('../../../components/FlowRecords'));
interface DetailInfoProps {
// 记录id
/**
* 记录id
*/
id: string;
// 是否是编辑的
/**
* 是否是编辑的
*/
isEdit?: boolean;
// 历史记录目标路径
target?: string;
// 头部右侧拓展
/**
* 历史记录目标路径
*/
target: string;
/**
* 头部右侧拓展
*/
headExtra?: (info: DetailInfo, returnAddress: ReturnAddressValues, exchangeAddress: ExchangeAddressValues) => React.ReactNode;
};
......@@ -145,7 +153,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
dataIndex: 'orderNo',
render: (text, record) => (
<EyePreview
url={`${target ? target : '/memberCenter/payandSettle/creditApplication/quotaPrSubmit/detail'}?id=${record.id}`}
url={`${target}/orderDetail?id=${record.orderId}`}
>
{text}
</EyePreview>
......
......@@ -8,6 +8,7 @@ const ExchangePr1Detail: React.FC = () => {
return (
<DetailInfo
id={id}
target="/memberCenter/afterService/exchangeManage/exchangePr1"
/>
);
};
......
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-04 17:22:07
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-20 15:46:31
* @LastEditTime: 2021-01-08 11:28:38
* @Description:
*/
import React, { useState } from 'react';
......@@ -40,7 +40,7 @@ const ExchangePr1Verify: React.FC = () => {
<>
<DetailInfo
id={id}
target="/memberCenter/payandSettle/creditApplication/quotaFormQuery/detail"
target="/memberCenter/afterService/exchangeManage/exchangePr1"
headExtra={() => (
<Button
type="primary"
......
......@@ -8,6 +8,7 @@ const ExchangePr2Detail: React.FC = () => {
return (
<DetailInfo
id={id}
target="/memberCenter/afterService/exchangeManage/exchangePr2"
/>
);
};
......
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-04 17:22:07
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-17 18:13:55
* @LastEditTime: 2021-01-08 11:28:56
* @Description:
*/
import React, { useState } from 'react';
......@@ -40,7 +40,7 @@ const ExchangePr2Verify: React.FC = () => {
<>
<DetailInfo
id={id}
target="/memberCenter/payandSettle/creditApplication/quotaFormQuery/detail"
target="/memberCenter/afterService/exchangeManage/exchangePr2"
headExtra={() => (
<Button
type="primary"
......
......@@ -8,6 +8,7 @@ const ExchangePrAddDeliverDetail: React.FC = () => {
return (
<DetailInfo
id={id}
target="/memberCenter/afterService/exchangeManage/exchangePrAddDeliver"
/>
);
};
......
......@@ -8,6 +8,7 @@ const ExchangePrAddLogisticsDetail: React.FC = () => {
return (
<DetailInfo
id={id}
target="/memberCenter/afterService/exchangeManage/exchangePrAddLogistics"
/>
);
};
......
......@@ -8,6 +8,7 @@ const ExchangePrAddWarehousingDetail: React.FC = () => {
return (
<DetailInfo
id={id}
target="/memberCenter/afterService/exchangeManage/exchangePrAddWarehousing"
/>
);
};
......
......@@ -8,6 +8,7 @@ const ExchangePrConfirmDetail: React.FC = () => {
return (
<DetailInfo
id={id}
target="/memberCenter/afterService/exchangeManage/exchangePrConfirm"
/>
);
};
......
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-04 17:22:07
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-01-07 18:31:43
* @LastEditTime: 2021-01-08 11:29:21
* @Description:
*/
import React, { useState } from 'react';
......@@ -49,7 +49,7 @@ const ExchangePrConfirmVerify: React.FC = () => {
<>
<DetailInfo
id={id}
target="/memberCenter/payandSettle/creditApplication/quotaFormQuery/detail"
target="/memberCenter/afterService/exchangeManage/exchangePrConfirm"
headExtra={(info) => (
<Button
type="primary"
......
......@@ -8,6 +8,7 @@ const ExchangePrConfirmBackDetail: React.FC = () => {
return (
<DetailInfo
id={id}
target="/memberCenter/afterService/exchangeManage/exchangePrConfirmBack"
/>
);
};
......
......@@ -93,6 +93,7 @@ const ExchangePrConfirmBackVerify: React.FC = () => {
</Button>
</Space>
)}
target="/memberCenter/afterService/exchangeManage/exchangePrConfirmBack"
/>
</>
);
......
......@@ -8,6 +8,7 @@ const ExchangePrDeliverDetail: React.FC = () => {
return (
<DetailInfo
id={id}
target="/memberCenter/afterService/exchangeManage/exchangePrDeliver"
/>
);
};
......
......@@ -51,6 +51,7 @@ const ExchangePrDeliverVerify: React.FC = () => {
)}
</>
)}
target="/memberCenter/afterService/exchangeManage/exchangePrDeliver"
/>
<ManualDeliveryModal
......
......@@ -8,6 +8,7 @@ const ExchangePrReceivedDetail: React.FC = () => {
return (
<DetailInfo
id={id}
target="/memberCenter/afterService/exchangeManage/exchangePrReceived"
/>
);
};
......
......@@ -73,6 +73,7 @@ const ExchangePrReceivedVerify: React.FC = () => {
</>
)
}}
target="/memberCenter/afterService/exchangeManage/exchangePrReceived"
/>
</>
);
......
......@@ -8,6 +8,7 @@ const ExchangePrSubmitDetail: React.FC = () => {
return (
<DetailInfo
id={id}
target="/memberCenter/afterService/exchangeManage/exchangePrSubmit"
/>
);
};
......
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-04 17:22:07
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-12-28 09:50:08
* @LastEditTime: 2021-01-08 11:27:55
* @Description:
*/
import React, { useState } from 'react';
......@@ -142,7 +142,7 @@ const ExchangePrSubmitVerify: React.FC = () => {
<>
<DetailInfo
id={id}
target="/memberCenter/payandSettle/creditApplication/quotaFormQuery/detail"
target="/memberCenter/afterService/exchangeManage/exchangePrSubmit"
headExtra={(info, returnAddress, exchangeAddress) => (
<Button
type="primary"
......
......@@ -8,6 +8,7 @@ const ExchangeQueryDetail: React.FC = () => {
return (
<DetailInfo
id={id}
target="/memberCenter/afterService/exchangeManage/exchangeQuery"
/>
);
};
......
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