Commit 704d12ae authored by 前端-许佳敏's avatar 前端-许佳敏

fix:路由调整

parent a04bb9ca
// 采购订单
export default [
{
path: '/memberCenter/tranactionAbility/purchaseOrder',
name: 'purchaseOrder',
routes: [
// 订单查询
{
path: '/memberCenter/tranactionAbility/purchaseOrder/orderList',
name: 'purchaseOrderSearch',
component: '@/pages/transaction/purchaseOrder'
},
// 订单查询-查看
{
path: '/memberCenter/tranactionAbility/purchaseOrder/orderList/preview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
component: '@/pages/transaction/purchaseOrder/orderPreview'
},
// 待新增订单
{
path: '/memberCenter/tranactionAbility/purchaseOrder/readyAddOrder',
name: 'readyAddOrder',
component: '@/pages/transaction/purchaseOrder/readyAddOrder'
},
// 待新增订单-查看
{
path: '/memberCenter/tranactionAbility/purchaseOrder/readyAddOrder/preview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
component: '@/pages/transaction/purchaseOrder/orderPreview'
},
// 待新增订单-新增订单
{
path: '/memberCenter/tranactionAbility/purchaseOrder/readyAddOrder/add',
name: 'addReadyAddOrder',
component: '@/pages/transaction/purchaseOrder/readyAddOrderForm',
hideInMenu: true,
},
// 待新增订单-编辑订单
{
path: '/memberCenter/tranactionAbility/purchaseOrder/readyAddOrder/edit',
name: 'editReadyAddOrder',
component: '@/pages/transaction/purchaseOrder/readyAddOrderForm',
hideInMenu: true,
},
// 一级审核
{
path: '/memberCenter/tranactionAbility/purchaseOrder/firstApprovedOrder',
name: 'firstApprovedOrder',
component: '@/pages/transaction/purchaseOrder/firstApprovedOrder'
},
// 一级审核-查看
{
path: '/memberCenter/tranactionAbility/purchaseOrder/firstApprovedOrder/preview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
component: '@/pages/transaction/purchaseOrder/orderPreview'
},
// 一级审核-详情
{
path: '/memberCenter/tranactionAbility/purchaseOrder/firstApprovedOrder/detail',
name: 'firstApprovedOrderDetail',
component: '@/pages/transaction/purchaseOrder/firstApprovedOrder/detail',
hideInMenu: true,
noMargin: true,
},
// 二级审核
{
path: '/memberCenter/tranactionAbility/purchaseOrder/secondApprovedOrder',
name: 'secondApprovedOrder',
component: '@/pages/transaction/purchaseOrder/secondApprovedOrder'
},
// 二级审核-查看
{
path: '/memberCenter/tranactionAbility/purchaseOrder/secondApprovedOrder/preview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
component: '@/pages/transaction/purchaseOrder/orderPreview'
},
// 二级审核-详情
{
path: '/memberCenter/tranactionAbility/purchaseOrder/secondApprovedOrder/detail',
name: 'secondApprovedOrderDetail',
component: '@/pages/transaction/purchaseOrder/secondApprovedOrder/detail',
hideInMenu: true,
noMargin: true,
},
// 待提交订单
{
path: '/memberCenter/tranactionAbility/purchaseOrder/readySubmitOrder',
name: 'readySubmitOrder',
component: '@/pages/transaction/purchaseOrder/readySubmitOrder'
},
// 待提交订单-查看
{
path: '/memberCenter/tranactionAbility/purchaseOrder/readySubmitOrder/preview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
component: '@/pages/transaction/purchaseOrder/orderPreview'
},
// 待提交订单-详情
{
path: '/memberCenter/tranactionAbility/purchaseOrder/readySubmitOrder/detail',
name: 'readySubmitOrderDetail',
component: '@/pages/transaction/purchaseOrder/readySubmitOrder/detail',
hideInMenu: true,
noMargin: true,
},
// 待确认电子合同
{
path: '/memberCenter/tranactionAbility/purchaseOrder/readyConfirmContract',
name: 'readyConfirmContract',
component: '@/pages/transaction/purchaseOrder/readyConfirmContract'
},
// 待确认电子合同-查看
{
path: '/memberCenter/tranactionAbility/purchaseOrder/readyConfirmContract/preview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
component: '@/pages/transaction/purchaseOrder/orderPreview'
},
// 待确认电子合同-详情
{
path: '/memberCenter/tranactionAbility/purchaseOrder/readyConfirmContract/detail',
name: 'readyConfirmContractDetail',
component: '@/pages/transaction/purchaseOrder/readyConfirmContract/detail',
hideInMenu: true,
noMargin: true,
},
// 待支付订单
{
path: '/memberCenter/tranactionAbility/purchaseOrder/readyPayOrder',
name: 'readyPayOrder',
component: '@/pages/transaction/purchaseOrder/readyPayOrder'
},
// 待支付订单-查看
{
path: '/memberCenter/tranactionAbility/purchaseOrder/readyPayOrder/preview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
component: '@/pages/transaction/purchaseOrder/orderPreview'
},
// 待支付订单-详情
{
path: '/memberCenter/tranactionAbility/purchaseOrder/readyPayOrder/detail',
name: 'readyPayOrderDetail',
component: '@/pages/transaction/purchaseOrder/readyPayOrder/detail',
hideInMenu: true,
noMargin: true,
},
// 待新增入库单订单
{
path: '/memberCenter/tranactionAbility/purchaseOrder/addPurchaseWarehouseOrder',
name: 'addPurchaseWarehouseOrder',
component: '@/pages/transaction/purchaseOrder/addPurchaseWarehouseOrder'
},
// 待新增入库单订单-查看
{
path: '/memberCenter/tranactionAbility/purchaseOrder/addPurchaseWarehouseOrder/preview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
component: '@/pages/transaction/purchaseOrder/orderPreview'
},
// 待收货订单
{
path: '/memberCenter/tranactionAbility/purchaseOrder/readyReceiveOrder',
name: 'readyReceiveOrder',
component: '@/pages/transaction/purchaseOrder/readyReceiveOrder'
},
// 待收货订单-查看
{
path: '/memberCenter/tranactionAbility/purchaseOrder/readyReceiveOrder/preview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
component: '@/pages/transaction/purchaseOrder/orderPreview'
},
// 待收货订单-详情
{
path: '/memberCenter/tranactionAbility/purchaseOrder/readyReceiveOrder/detail',
name: 'readyReceiveOrderDetail',
component: '@/pages/transaction/purchaseOrder/readyReceiveOrder/detail',
hideInMenu: true,
noMargin: true,
},
// 待归档订单
{
path: '/memberCenter/tranactionAbility/purchaseOrder/readyFileOrder',
name: 'readyFileOrder',
component: '@/pages/transaction/purchaseOrder/readyFileOrder'
},
// 待归档订单-查看
{
path: '/memberCenter/tranactionAbility/purchaseOrder/readyFileOrder/preview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
component: '@/pages/transaction/purchaseOrder/orderPreview'
},
// 待归档订单-详情
{
path: '/memberCenter/tranactionAbility/purchaseOrder/readyFileOrder/detail',
name: 'readyFileOrderDetail',
component: '@/pages/transaction/purchaseOrder/readyFileOrder/detail',
hideInMenu: true,
noMargin: true,
},
]
}
]
\ No newline at end of file
// 销售订单
export default [
{
path: '/memberCenter/tranactionAbility/saleOrder',
name: 'saleOrder',
routes: [
// 订单查询
{
path: '/memberCenter/tranactionAbility/saleOrder/orderList',
name: 'saleOrderSearch',
component: '@/pages/transaction/saleOrder'
},
// 订单详情
{
path: '/memberCenter/tranactionAbility/saleOrder/orderList/preview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
component: '@/pages/transaction/saleOrder/orderPreview'
},
// 待审核订单
{
path: '/memberCenter/tranactionAbility/saleOrder/readyApprovedOrder',
name: 'readyApprovedOrder',
component: '@/pages/transaction/saleOrder/readyApprovedOrder'
},
// 待审核订单-查看
{
path: '/memberCenter/tranactionAbility/saleOrder/readyApprovedOrder/preview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
component: '@/pages/transaction/saleOrder/orderPreview'
},
// 待审核订单-详情
{
path: '/memberCenter/tranactionAbility/saleOrder/readyApprovedOrder/detail',
name: 'readyApprovedOrderDetail',
component: '@/pages/transaction/saleOrder/readyApprovedOrder/detail',
hideInMenu: true,
noMargin: true,
},
// 一级审核
{
path: '/memberCenter/tranactionAbility/saleOrder/firstApprovedOrder',
name: 'firstApprovedOrder',
component: '@/pages/transaction/saleOrder/firstApprovedOrder'
},
// 一级审核-查看
{
path: '/memberCenter/tranactionAbility/saleOrder/firstApprovedOrder/preview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
component: '@/pages/transaction/saleOrder/orderPreview'
},
// 一级审核-详情
{
path: '/memberCenter/tranactionAbility/saleOrder/firstApprovedOrder/detail',
name: 'firstApprovedOrderDetail',
component: '@/pages/transaction/saleOrder/firstApprovedOrder/detail',
hideInMenu: true,
noMargin: true,
},
// 二级审核
{
path: '/memberCenter/tranactionAbility/saleOrder/secondApprovedOrder',
name: 'secondApprovedOrder',
component: '@/pages/transaction/saleOrder/secondApprovedOrder'
},
// 二级审核-查看
{
path: '/memberCenter/tranactionAbility/saleOrder/secondApprovedOrder/preview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
component: '@/pages/transaction/saleOrder/orderPreview'
},
// 二级审核-详情
{
path: '/memberCenter/tranactionAbility/saleOrder/secondApprovedOrder/detail',
name: 'secondApprovedOrderDetail',
component: '@/pages/transaction/saleOrder/secondApprovedOrder/detail',
hideInMenu: true,
noMargin: true,
},
// 待确认订单
{
path: '/memberCenter/tranactionAbility/saleOrder/readyConfirmOrder',
name: 'readyConfirmOrder',
component: '@/pages/transaction/saleOrder/readyConfirmOrder'
},
// 待确认订单-查看
{
path: '/memberCenter/tranactionAbility/saleOrder/readyConfirmOrder/preview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
component: '@/pages/transaction/saleOrder/orderPreview'
},
// 待确认订单-详情
{
path: '/memberCenter/tranactionAbility/saleOrder/readyConfirmOrder/detail',
name: 'readyConfirmOrderDetail',
component: '@/pages/transaction/saleOrder/readyConfirmOrder/detail',
hideInMenu: true,
noMargin: true,
},
// 待确认支付结果
{
path: '/memberCenter/tranactionAbility/saleOrder/readyPayResult',
name: 'readyPayResult',
component: '@/pages/transaction/saleOrder/readyPayResult'
},
// 待确认支付结果-查看
{
path: '/memberCenter/tranactionAbility/saleOrder/readyPayResult/preview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
component: '@/pages/transaction/saleOrder/orderPreview'
},
// 待确认支付结果-详情
{
path: '/memberCenter/tranactionAbility/saleOrder/readyPayResult/detail',
name: 'readyPayResultDetail',
component: '@/pages/transaction/saleOrder/readyPayResult/detail',
hideInMenu: true,
noMargin: true,
},
// 新增销售发货单列表
{
path: '/memberCenter/tranactionAbility/saleOrder/addSaleDelevedOrder',
name: 'addSaleDelevedOrder',
component: '@/pages/transaction/saleOrder/addSaleDelevedOrder'
},
// 销售发货单详情-查看
{
path: '/memberCenter/tranactionAbility/saleOrder/addSaleDelevedOrder/preview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
component: '@/pages/transaction/saleOrder/orderPreview'
},
// 待新增物流单
{
path: '/memberCenter/tranactionAbility/saleOrder/readyAddLogisticsOrder',
name: 'readyAddLogisticsOrder',
component: '@/pages/transaction/saleOrder/readyAddLogisticsOrder'
},
// 待新增物流单-查看
{
path: '/memberCenter/tranactionAbility/saleOrder/readyAddLogisticsOrder/preview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
component: '@/pages/transaction/saleOrder/orderPreview'
},
// 待确认发货单
{
path: '/memberCenter/tranactionAbility/saleOrder/readyConfirmDelevedOrder',
name: 'readyConfirmDelevedOrder',
component: '@/pages/transaction/saleOrder/readyConfirmDelevedOrder'
},
// 待确认发货单-查看
{
path: '/memberCenter/tranactionAbility/saleOrder/readyConfirmDelevedOrder/preview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
component: '@/pages/transaction/saleOrder/orderPreview'
},
// 待确认发货单-详情
{
path: '/memberCenter/tranactionAbility/saleOrder/readyConfirmDelevedOrder/detail',
name: 'readyConfirmDelevedOrderDetail',
component: '@/pages/transaction/saleOrder/readyConfirmDelevedOrder/detail',
hideInMenu: true,
noMargin: true,
},
// 待确认回单
{
path: '/memberCenter/tranactionAbility/saleOrder/readyConfirmReturnOrder',
name: 'readyConfirmReturnOrder',
component: '@/pages/transaction/saleOrder/readyConfirmReturnOrder',
},
// 待确认回单-查看
{
path: '/memberCenter/tranactionAbility/saleOrder/readyConfirmReturnOrder/preview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
component: '@/pages/transaction/saleOrder/orderPreview'
},
// 待确认回单-详情
{
path: '/memberCenter/tranactionAbility/saleOrder/readyConfirmReturnOrder/detail',
name: 'readyConfirmReturnOrderDetail',
component: '@/pages/transaction/saleOrder/readyConfirmReturnOrder/detail',
hideInMenu: true,
noMargin: true,
},
// 待归档订单
{
path: '/memberCenter/tranactionAbility/saleOrder/readyReturnDocument',
name: 'readyReturnDocument',
component: '@/pages/transaction/saleOrder/readyReturnDocument'
},
// 待归档订单-查看
{
path: '/memberCenter/tranactionAbility/saleOrder/readyReturnDocument/preview',
name: 'orderPreview',
hideInMenu: true,
noMargin: true,
component: '@/pages/transaction/saleOrder/orderPreview'
},
// 待归档订单-详情
{
path: '/memberCenter/tranactionAbility/saleOrder/readyReturnDocument/detail',
name: 'readyReturnDocumentDetail',
component: '@/pages/transaction/saleOrder/readyReturnDocument/detail',
hideInMenu: true,
noMargin: true,
},
]
}
]
\ No newline at end of file
......@@ -3,6 +3,7 @@ import { formatTimeString } from '@/utils'
import { ORDER_TYPE } from '@/constants'
import StatusColors from '@/pages/transaction/components/StatusColors'
import EyePreview from '@/components/EyePreview'
import { history } from 'umi'
export const baseOrderListColumns: any[] = [
......@@ -14,10 +15,7 @@ export const baseOrderListColumns: any[] = [
render: (text, record) => {
// 查看订单, 需根据状态显示不同schema
return (
// <EyePreview url={`/memberCenter/tranactionAbility/saleOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`}>
// {text}
// </EyePreview>
<EyePreview url={`/memberCenter/tranactionAbility/saleOrder/orderPreview?id=${record.id}`}>
<EyePreview url={`${history.location.pathname}/preview?id=${record.id}`}>
{text}
</EyePreview>
)
......
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