Commit 36fe1830 authored by XieZhiXiong's avatar XieZhiXiong

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

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