Commit 0c87d574 authored by XieZhiXiong's avatar XieZhiXiong

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

parent 663b1874
......@@ -17,7 +17,7 @@ export default {
name: 'exchangeQuery',
component: '@/pages/afterService/exchangeApplication/exchangeQuery/index',
},
// 换货申请单详情
// 换货申请单-详情
{
path: '/memberCenter/afterService/exchangeApplication/exchangeQuery/detail',
name: 'exchangeQueryDetail',
......@@ -25,6 +25,14 @@ export default {
hideInMenu: true,
noMargin: true,
},
// 换货申请单-订单详情
{
path: '/memberCenter/afterService/exchangeApplication/exchangeQuery/orderDetail',
name: 'orderPreview',
component: '@/pages/transaction/purchaseOrder/orderPreview',
hideInMenu: true,
noMargin: true,
},
// 待提交换货申请单
{
path: '/memberCenter/afterService/exchangeApplication/exchangePrSubmit',
......@@ -55,6 +63,14 @@ export default {
hideInMenu: true,
noMargin: true,
},
// 待提交换货申请单-订单详情
{
path: '/memberCenter/afterService/exchangeApplication/exchangePrSubmit/orderDetail',
name: 'orderPreview',
component: '@/pages/transaction/purchaseOrder/orderPreview',
hideInMenu: true,
noMargin: true,
},
// 待新增退货发货单
{
path: '/memberCenter/afterService/exchangeApplication/exchangePrAddDeliver',
......@@ -69,6 +85,14 @@ export default {
hideInMenu: true,
noMargin: true,
},
// 待新增退货发货单-订单详情
{
path: '/memberCenter/afterService/exchangeApplication/exchangePrAddDeliver/orderDetail',
name: 'orderPreview',
component: '@/pages/transaction/purchaseOrder/orderPreview',
hideInMenu: true,
noMargin: true,
},
// 待新增物流单
{
path: '/memberCenter/afterService/exchangeApplication/exchangePrAddLogistics',
......@@ -83,6 +107,14 @@ export default {
hideInMenu: true,
noMargin: true,
},
// 待新增物流单-订单详情
{
path: '/memberCenter/afterService/exchangeApplication/exchangePrAddLogistics/orderDetail',
name: 'orderPreview',
component: '@/pages/transaction/purchaseOrder/orderPreview',
hideInMenu: true,
noMargin: true,
},
// 待退货发货
{
path: '/memberCenter/afterService/exchangeApplication/exchangePrDeliver',
......@@ -105,6 +137,14 @@ export default {
hideInMenu: true,
noMargin: true,
},
// 待退货发货-订单详情
{
path: '/memberCenter/afterService/exchangeApplication/exchangePrDeliver/orderDetail',
name: 'orderPreview',
component: '@/pages/transaction/purchaseOrder/orderPreview',
hideInMenu: true,
noMargin: true,
},
// 待确认退货回单
{
path: '/memberCenter/afterService/exchangeApplication/exchangePrConfirmBack',
......@@ -127,6 +167,14 @@ export default {
hideInMenu: true,
noMargin: true,
},
// 待确认退货回单-订单详情
{
path: '/memberCenter/afterService/exchangeApplication/exchangePrConfirmBack/orderDetail',
name: 'orderPreview',
component: '@/pages/transaction/purchaseOrder/orderPreview',
hideInMenu: true,
noMargin: true,
},
// 待新增换货入库单
{
path: '/memberCenter/afterService/exchangeApplication/exchangePrAddWarehousing',
......@@ -141,6 +189,14 @@ export default {
hideInMenu: true,
noMargin: true,
},
// 待新增换货入库单-订单详情
{
path: '/memberCenter/afterService/exchangeApplication/exchangePrAddWarehousing/orderDetail',
name: 'orderPreview',
component: '@/pages/transaction/purchaseOrder/orderPreview',
hideInMenu: true,
noMargin: true,
},
// 待换货收货
{
path: '/memberCenter/afterService/exchangeApplication/exchangePrReceived',
......@@ -163,6 +219,14 @@ export default {
hideInMenu: true,
noMargin: true,
},
// 待换货收货-订单详情
{
path: '/memberCenter/afterService/exchangeApplication/exchangePrReceived/orderDetail',
name: 'orderPreview',
component: '@/pages/transaction/purchaseOrder/orderPreview',
hideInMenu: true,
noMargin: true,
},
// 待确认售后完成
{
path: '/memberCenter/afterService/exchangeApplication/exchangePrFinished',
......@@ -185,5 +249,13 @@ export default {
hideInMenu: true,
noMargin: true,
},
// 待确认售后完成-订单详情
{
path: '/memberCenter/afterService/exchangeApplication/exchangePrFinished/orderDetail',
name: 'orderPreview',
component: '@/pages/transaction/purchaseOrder/orderPreview',
hideInMenu: true,
noMargin: true,
},
]
}
\ No newline at end of file
......@@ -493,6 +493,7 @@ export default {
'menu.handling.confirm.pendingReceiptDetail': '待确认回单生产通知单详情',
'menu.handling.assign.assignProductionEdit': '修改生产通知单',
'menu.handling.confirm.pendingAddLogisticsDetail': '待新增物流单详情',
// 售后能力
'menu.afterService': '售后',
'menu.afterService.exchangeApplication': '换货申请',
......@@ -512,6 +513,7 @@ export default {
'menu.afterService.exchangeApplication.verifyExchangePrReceived': '换货收货',
'menu.afterService.exchangeApplication.exchangePrFinished': '待确认售后完成',
'menu.afterService.exchangeApplication.verifyExchangePrFinished': '确认售后完成',
'menu.afterService.exchangeApplication.orderPreview': '查看订单',
'menu.afterService.exchangeManage': '换货处理',
'menu.afterService.exchangeManage.exchangeQuery': '换货申请单查询',
......@@ -533,6 +535,7 @@ export default {
'menu.afterService.exchangeManage.verifyExchangePrDeliver': '换货发货',
'menu.afterService.exchangeManage.exchangePrConfirmBack': '待确认换货回单',
'menu.afterService.exchangeManage.verifyExchangePrConfirmBack': '确认换货回单',
'menu.afterService.exchangeManage.orderPreview': '查看订单',
'menu.afterService.returnApplication': '退货申请',
'menu.afterService.returnApplication.returnQuery': '退货申请单查询',
......@@ -551,6 +554,7 @@ export default {
'menu.afterService.returnApplication.verifyReturnPrConfirmResult': '确认退款结果',
'menu.afterService.returnApplication.returnPrConfirmFinish': '待确认售后完成',
'menu.afterService.returnApplication.verifyReturnPrConfirmFinish': '确认售后完成',
'menu.afterService.returnApplication.orderPreview': '查看订单',
'menu.afterService.returnManage': '退货处理',
'menu.afterService.returnManage.returnQuery': '退货申请单查询',
......@@ -568,6 +572,7 @@ export default {
'menu.afterService.returnManage.verifyReturnPrReceived': '确认退货收货',
'menu.afterService.returnManage.returnPrReturn': '待退款',
'menu.afterService.returnManage.verifyReturnPrReturn': '确认退款',
'menu.afterService.returnManage.orderPreview': '查看订单',
'menu.afterService.repairApplication': '维修申请',
'menu.afterService.repairApplication.repairQuery': '维修申请单查询',
......@@ -579,6 +584,7 @@ export default {
'menu.afterService.repairApplication.repairPrFinished': '待确认售后完成',
'menu.afterService.repairApplication.repairPrFinishedDetail': '查看维修申请单',
'menu.afterService.repairApplication.verifyRepairPrFinished': '确认售后完成',
'menu.afterService.repairApplication.orderPreview': '查看订单',
'menu.afterService.repairManage': '维修处理',
'menu.afterService.repairManage.repairQuery': '维修申请单查询',
......@@ -595,6 +601,7 @@ export default {
'menu.afterService.repairManage.repairPrConfirm': '待确认维修申请单',
'menu.afterService.repairManage.repairPrConfirmDetail': '查看维修申请单',
'menu.afterService.repairManage.verifyRepairPrConfirm': '审核维修申请单',
'menu.afterService.repairManage.orderPreview': '查看订单',
// 结算能力
'menu.balance': '结算',
......
......@@ -45,13 +45,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) => React.ReactNode;
};
......@@ -76,7 +84,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>
......
......@@ -3,7 +3,7 @@ import { Button, Card, Spin, Badge, message } from 'antd';
import { ColumnType } from 'antd/lib/table/interface';
import { DeleteOutlined } from '@ant-design/icons';
import { Radio, ArrayTable } from '@formily/antd-components';
import { history, Prompt } from 'umi';
import { history, Link, Prompt } from 'umi';
import moment from 'moment';
import { findLastIndex } from 'lodash';
import { PageHeaderWrapper } from '@ant-design/pro-layout';
......@@ -35,12 +35,18 @@ const {
interface BillsFormProps {
id?: string;
// 是否是编辑的
/**
* 是否是编辑的
*/
isEdit?: boolean;
/**
* 订单id,从订单列表跳转过来的
*/
orderId?: number,
/**
* 历史记录目标路径
*/
target: string;
};
interface DetailInfo {
......@@ -62,10 +68,23 @@ interface DetailInfo {
orderNo?: string,
}
interface OrderNoProps {
value: any,
}
const OrderNo = (props: OrderNoProps) => {
const { value } = props;
return (
<Link to={`/memberCenter/afterService/exchangeApplication/exchangePrSubmit/orderDetail?id=${value}`}>{value}</Link>
)
};
OrderNo.isFieldComponent = true;
const ExchangeForm: React.FC<BillsFormProps> = ({
id,
isEdit = false,
orderId,
target,
}) => {
const [detailInfo, setDetailInfo] = useState<DetailInfo>({
applyTime: moment().format('YYYY-MM-DD HH:mm:ss'),
......@@ -569,6 +588,7 @@ const ExchangeForm: React.FC<BillsFormProps> = ({
components={{
ArrayTable,
AddressFormItem,
OrderNo,
}}
editable={isEdit || !id}
effects={($, actions) => {
......
......@@ -235,7 +235,7 @@ export const addBillSchema: ISchema = {
orderNo: {
type: 'string',
title: '订单号',
'x-component': 'Text',
'x-component': 'OrderNo',
},
productId: {
type: 'string',
......
......@@ -8,6 +8,7 @@ const ExchangeQueryDetail: React.FC = () => {
return (
<DetailInfo
id={id}
target="/memberCenter/afterService/exchangeApplication/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