Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
陈智峰
jinfa-platform
Commits
dfb74a3d
Commit
dfb74a3d
authored
Oct 12, 2020
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整路由
parent
33ff84b0
Hide whitespace changes
Inline
Side-by-side
Showing
32 changed files
with
281 additions
and
42 deletions
+281
-42
tranactionRoute.ts
config/routes/tranactionRoute.ts
+87
-9
menu.ts
src/locales/zh-CN/menu.ts
+12
-3
index.less
...saction/purchaseOrder/readyReceiveOrder/detail/index.less
+0
-0
index.tsx
...nsaction/purchaseOrder/readyReceiveOrder/detail/index.tsx
+12
-0
useSelfTable.tsx
...on/purchaseOrder/readyReceiveOrder/model/useSelfTable.tsx
+10
-4
useSelfTable.tsx
...tion/saleOrder/addSaleDelevedOrder/model/useSelfTable.tsx
+8
-3
index.tsx
src/pages/transaction/saleOrder/constant/index.tsx
+8
-3
index.less
...ransaction/saleOrder/firstApprovedOrder/detail/index.less
+0
-0
index.tsx
...transaction/saleOrder/firstApprovedOrder/detail/index.tsx
+12
-0
useSelfTable.tsx
...ction/saleOrder/firstApprovedOrder/model/useSelfTable.tsx
+2
-1
useSelfTable.tsx
...n/saleOrder/readyAddLogisticsOrder/model/useSelfTable.tsx
+8
-3
index.less
...ransaction/saleOrder/readyApprovedOrder/detail/index.less
+0
-0
index.tsx
...transaction/saleOrder/readyApprovedOrder/detail/index.tsx
+12
-0
useSelfTable.tsx
...ction/saleOrder/readyApprovedOrder/model/useSelfTable.tsx
+2
-1
index.less
...tion/saleOrder/readyConfirmDelevedOrder/detail/index.less
+0
-0
index.tsx
...ction/saleOrder/readyConfirmDelevedOrder/detail/index.tsx
+12
-0
useSelfTable.tsx
...saleOrder/readyConfirmDelevedOrder/model/useSelfTable.tsx
+10
-4
index.less
...transaction/saleOrder/readyConfirmOrder/detail/index.less
+0
-0
index.tsx
.../transaction/saleOrder/readyConfirmOrder/detail/index.tsx
+12
-0
useSelfTable.tsx
...action/saleOrder/readyConfirmOrder/model/useSelfTable.tsx
+2
-1
index.less
...ction/saleOrder/readyConfirmReturnOrder/detail/index.less
+0
-0
index.tsx
...action/saleOrder/readyConfirmReturnOrder/detail/index.tsx
+12
-0
useSelfTable.tsx
.../saleOrder/readyConfirmReturnOrder/model/useSelfTable.tsx
+10
-4
index.less
...es/transaction/saleOrder/readyPayResult/detail/index.less
+0
-0
index.tsx
...ges/transaction/saleOrder/readyPayResult/detail/index.tsx
+12
-0
useSelfTable.tsx
...ansaction/saleOrder/readyPayResult/model/useSelfTable.tsx
+10
-4
index.less
...ansaction/saleOrder/readyReturnDocument/detail/index.less
+0
-0
index.tsx
...ransaction/saleOrder/readyReturnDocument/detail/index.tsx
+12
-0
useSelfTable.tsx
...tion/saleOrder/readyReturnDocument/model/useSelfTable.tsx
+2
-1
index.less
...ansaction/saleOrder/secondApprovedOrder/detail/index.less
+0
-0
index.tsx
...ransaction/saleOrder/secondApprovedOrder/detail/index.tsx
+12
-0
useSelfTable.tsx
...tion/saleOrder/secondApprovedOrder/model/useSelfTable.tsx
+2
-1
No files found.
config/routes/tranactionRoute.ts
View file @
dfb74a3d
...
...
@@ -3,7 +3,7 @@
* @Date: 2020-07-31 19:56:22
* @LastEditors: XieZhiXiong
* @Copyright: 1549414730@qq.com
* @LastEditTime: 2020-10-12 1
6:56:47
* @LastEditTime: 2020-10-12 1
9:51:21
* @Description: 交易能力路由相关
*/
import
{
RouterChild
}
from
'../utils'
;
...
...
@@ -343,7 +343,7 @@ const TranactionRoute: RouterChild = {
component
:
'@/pages/transaction/purchaseOrder/editReadyAddOrder'
,
hideInMenu
:
true
,
},
//
新增或者修改订单
//
待新增订单-查看
{
path
:
'/memberCenter/tranactionAbility/purchaseOrder/orderDetail'
,
name
:
'orderDetail'
,
...
...
@@ -364,12 +364,13 @@ const TranactionRoute: RouterChild = {
name
:
'firstApprovedOrder'
,
component
:
'@/pages/transaction/purchaseOrder/firstApprovedOrder'
},
// 一级审核详情
// 一级审核
-
详情
{
path
:
'/memberCenter/tranactionAbility/purchaseOrder/firstApprovedOrder/detail'
,
name
:
'firstApprovedOrderDetail'
,
component
:
'@/pages/transaction/purchaseOrder/firstApprovedOrder/detail'
,
hideInMenu
:
true
,
noMargin
:
true
,
},
// 二级审核
{
...
...
@@ -377,12 +378,13 @@ const TranactionRoute: RouterChild = {
name
:
'secondApprovedOrder'
,
component
:
'@/pages/transaction/purchaseOrder/secondApprovedOrder'
},
// 二级审核详情
// 二级审核
-
详情
{
path
:
'/memberCenter/tranactionAbility/purchaseOrder/secondApprovedOrder/detail'
,
name
:
'secondApprovedOrderDetail'
,
component
:
'@/pages/transaction/purchaseOrder/secondApprovedOrder/detail'
,
hideInMenu
:
true
,
noMargin
:
true
,
},
// 待提交订单
{
...
...
@@ -390,12 +392,13 @@ const TranactionRoute: RouterChild = {
name
:
'readySubmitOrder'
,
component
:
'@/pages/transaction/purchaseOrder/readySubmitOrder'
},
// 待提交订单详情
// 待提交订单
-
详情
{
path
:
'/memberCenter/tranactionAbility/purchaseOrder/readySubmitOrder/detail'
,
name
:
'readySubmitOrderDetail'
,
component
:
'@/pages/transaction/purchaseOrder/readySubmitOrder/detail'
,
hideInMenu
:
true
,
noMargin
:
true
,
},
// 待确认电子合同
{
...
...
@@ -403,12 +406,13 @@ const TranactionRoute: RouterChild = {
name
:
'readyConfirmContract'
,
component
:
'@/pages/transaction/purchaseOrder/readyConfirmContract'
},
// 待确认电子合同详情
// 待确认电子合同
-
详情
{
path
:
'/memberCenter/tranactionAbility/purchaseOrder/readyConfirmContract/detail'
,
name
:
'readyConfirmContractDetail'
,
component
:
'@/pages/transaction/purchaseOrder/readyConfirmContract/detail'
,
hideInMenu
:
true
,
noMargin
:
true
,
},
// 待支付订单
{
...
...
@@ -416,12 +420,13 @@ const TranactionRoute: RouterChild = {
name
:
'readyPayOrder'
,
component
:
'@/pages/transaction/purchaseOrder/readyPayOrder'
},
// 待支付订单详情
// 待支付订单
-
详情
{
path
:
'/memberCenter/tranactionAbility/purchaseOrder/readyPayOrder/detail'
,
name
:
'readyPayOrderDetail'
,
component
:
'@/pages/transaction/purchaseOrder/readyPayOrder/detail'
,
hideInMenu
:
true
,
noMargin
:
true
,
},
// 待新增入库单订单
{
...
...
@@ -435,18 +440,27 @@ const TranactionRoute: RouterChild = {
name
:
'readyReceiveOrder'
,
component
:
'@/pages/transaction/purchaseOrder/readyReceiveOrder'
},
// 待收货订单-详情
{
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/detail'
,
name
:
'readyFileOrderDetail'
,
component
:
'@/pages/transaction/purchaseOrder/readyFileOrder/detail'
,
hideInMenu
:
true
,
noMargin
:
true
,
},
]
},
...
...
@@ -468,6 +482,14 @@ const TranactionRoute: RouterChild = {
name
:
'readyApprovedOrder'
,
component
:
'@/pages/transaction/saleOrder/readyApprovedOrder'
},
// 待审核订单-详情
{
path
:
'/memberCenter/tranactionAbility/saleOrder/readyApprovedOrder/detail'
,
name
:
'readyApprovedOrderDetail'
,
component
:
'@/pages/transaction/saleOrder/readyApprovedOrder/detail'
,
hideInMenu
:
true
,
noMargin
:
true
,
},
// 订单详情
{
path
:
'/memberCenter/tranactionAbility/saleOrder/orderPreview'
,
...
...
@@ -482,24 +504,56 @@ const TranactionRoute: RouterChild = {
name
:
'firstApprovedOrder'
,
component
:
'@/pages/transaction/saleOrder/firstApprovedOrder'
},
// 一级审核-详情
{
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/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/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/detail'
,
name
:
'readyPayResultDetail'
,
component
:
'@/pages/transaction/saleOrder/readyPayResult/detail'
,
hideInMenu
:
true
,
noMargin
:
true
,
},
// 新增销售发货单列表
{
path
:
'/memberCenter/tranactionAbility/saleOrder/addSaleDelevedOrder'
,
...
...
@@ -518,11 +572,27 @@ const TranactionRoute: RouterChild = {
name
:
'readyConfirmDelevedOrder'
,
component
:
'@/pages/transaction/saleOrder/readyConfirmDelevedOrder'
},
// 待确认发货单-详情
{
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'
component
:
'@/pages/transaction/saleOrder/readyConfirmReturnOrder'
,
},
// 待确认回单-详情
{
path
:
'/memberCenter/tranactionAbility/saleOrder/readyConfirmReturnOrder/detail'
,
name
:
'readyConfirmReturnOrderDetail'
,
component
:
'@/pages/transaction/saleOrder/readyConfirmReturnOrder/detail'
,
hideInMenu
:
true
,
noMargin
:
true
,
},
// 待归档订单
{
...
...
@@ -530,6 +600,14 @@ const TranactionRoute: RouterChild = {
name
:
'readyReturnDocument'
,
component
:
'@/pages/transaction/saleOrder/readyReturnDocument'
},
// 待归档订单-详情
{
path
:
'/memberCenter/tranactionAbility/saleOrder/readyReturnDocument/detail'
,
name
:
'readyReturnDocumentDetail'
,
component
:
'@/pages/transaction/saleOrder/readyReturnDocument/detail'
,
hideInMenu
:
true
,
noMargin
:
true
,
},
]
},
...
...
src/locales/zh-CN/menu.ts
View file @
dfb74a3d
...
...
@@ -2,7 +2,7 @@
* @Author: LeeJiancong
* @Date: 2020-07-13 14:08:50
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-10-12 1
7:12:3
3
* @LastEditTime: 2020-10-12 1
9:50:4
3
*/
export
default
{
...
...
@@ -176,6 +176,7 @@ export default {
'menu.tranactionAbility.purchaseOrder.readyPayOrderDetail'
:
'待支付订单详情'
,
'menu.tranactionAbility.purchaseOrder.addPurchaseWarehouseOrder'
:
'待新增入库单'
,
'menu.tranactionAbility.purchaseOrder.readyReceiveOrder'
:
'待收货订单'
,
'menu.tranactionAbility.purchaseOrder.readyReceiveOrderDetail'
:
'待收货订单详情'
,
'menu.tranactionAbility.purchaseOrder.readyFileOrder'
:
'待归档订单'
,
'menu.tranactionAbility.purchaseOrder.readyFileOrderDetail'
:
'待归档订单详情'
,
...
...
@@ -183,19 +184,27 @@ export default {
'menu.tranactionAbility.saleOrder'
:
'销售订单'
,
'menu.tranactionAbility.saleOrder.saleOrderSearch'
:
'订单查询'
,
'menu.tranactionAbility.saleOrder.readyApprovedOrder'
:
'待审核订单'
,
'menu.tranactionAbility.saleOrder.readyApprovedOrderDetail'
:
'待审核订单详情'
,
'menu.tranactionAbility.saleOrder.orderPreview'
:
'查看订单'
,
'menu.tranactionAbility.saleOrder.firstApprovedOrder'
:
'待审核订单(一级)'
,
'menu.tranactionAbility.saleOrder.firstApprovedOrderDetail'
:
'待审核订单(一级)详情'
,
'menu.tranactionAbility.saleOrder.secondApprovedOrder'
:
'待审核订单(二级)'
,
'menu.tranactionAbility.saleOrder.secondApprovedOrderDetail'
:
'待审核订单(二级)详情'
,
'menu.tranactionAbility.saleOrder.readyConfirmOrder'
:
'待确认订单'
,
'menu.tranactionAbility.saleOrder.readyConfirmOrderDetail'
:
'待确认订单详情'
,
'menu.tranactionAbility.saleOrder.readyPayResult'
:
'待确认支付结果'
,
'menu.tranactionAbility.saleOrder.readyPayResultDetail'
:
'待确认支付结果详情'
,
'menu.tranactionAbility.saleOrder.addSaleDelevedOrder'
:
'待新增销售发货单'
,
'menu.tranactionAbility.saleOrder.addSaleDelevedOrderDetail'
:
'新增销售发货单'
,
'menu.tranactionAbility.saleOrder.readyAddLogisticsOrder'
:
'待新增物流单'
,
'menu.tranactionAbility.saleOrder.readyConfirmDelevedOrder'
:
'待确认发货订单'
,
'menu.tranactionAbility.saleOrder.readyConfirmDelevedOrderDetail'
:
'待确认发货订单详情'
,
'menu.tranactionAbility.saleOrder.readyConfirmReturnOrder'
:
'待确认回单'
,
'menu.tranactionAbility.saleOrder.readyConfirmReturnOrderDetail'
:
'待确认回单详情'
,
'menu.tranactionAbility.saleOrder.readyReturnDocument'
:
'待确认归档'
,
'menu.tranactionAbility.saleOrder.readyReturnDocumentDetail'
:
'待确认归档详情'
,
//需求报价
//
需求报价
'menu.tranactionAbility.enquiryOffer'
:
'需求报价'
,
'menu.tranactionAbility.enquiryOffer.enquirySearch'
:
'需求单查询'
,
'menu.tranactionAbility.enquiryOffer.enquiryOfferSearch'
:
'报价单查询'
,
...
...
@@ -206,7 +215,7 @@ export default {
'menu.tranactionAbility.enquiryOffer.enquiryTwo'
:
'待审核报价单(二级)'
,
'menu.tranactionAbility.enquiryOffer.toSubmit'
:
'待提交报价单'
,
//确认报价
//
确认报价
'menu.tranactionAbility.enquiryOfferConfirm'
:
'确认需求报价'
,
'menu.tranactionAbility.enquiryOfferConfirm.enquiryOfferSearch'
:
'报价单查询'
,
'menu.tranactionAbility.enquiryOfferConfirm.toSubmit'
:
'待提交审核报价单'
,
...
...
src/pages/transaction/purchaseOrder/readyReceiveOrder/detail/index.less
0 → 100644
View file @
dfb74a3d
src/pages/transaction/purchaseOrder/readyReceiveOrder/detail/index.tsx
0 → 100644
View file @
dfb74a3d
import
React
from
'react'
;
const
ReadyReceiveOrderDetail
:
React
.
FC
=
()
=>
{
return
(
<
div
>
待收货订单详情
</
div
>
);
};
export
default
ReadyReceiveOrderDetail
;
\ No newline at end of file
src/pages/transaction/purchaseOrder/readyReceiveOrder/model/useSelfTable.tsx
View file @
dfb74a3d
...
...
@@ -31,9 +31,14 @@ export const useSelfTable = () => {
key
:
'orderNo'
,
render
:
(
text
,
record
)
=>
{
// 查看订单, 需根据状态显示不同schema
return
<
EyePreview
url=
{
`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`
}
>
{
text
}
</
EyePreview
>
return
(
// <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`}>
// {text}
// </EyePreview>
<
EyePreview
url=
{
`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?id=${record.id}`
}
>
{
text
}
</
EyePreview
>
)
}
},
{
...
...
@@ -99,7 +104,8 @@ export const useSelfTable = () => {
]
const
handleConfirm
=
async
(
record
)
=>
{
history
.
push
(
`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=6&id=
${
record
.
id
}
&preview=0&orderDeliveryDetailsId=
${
record
.
orderDeliveryDetailsId
}
`
)
// history.push(`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=6&id=${record.id}&preview=0&orderDeliveryDetailsId=${record.orderDeliveryDetailsId}`)
history
.
push
(
`/memberCenter/tranactionAbility/purchaseOrder/readyReceiveOrder/detail?id=
${
record
.
id
}
&orderDeliveryDetailsId=
${
record
.
orderDeliveryDetailsId
}
`
);
}
return
{
...
...
src/pages/transaction/saleOrder/addSaleDelevedOrder/model/useSelfTable.tsx
View file @
dfb74a3d
...
...
@@ -31,9 +31,14 @@ export const useSelfTable = () => {
key
:
'orderNo'
,
render
:
(
text
,
record
)
=>
{
// 查看订单, 需根据状态显示不同schema
return
<
EyePreview
url=
{
`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`
}
>
{
text
}
</
EyePreview
>
return
(
// <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`}>
// {text}
// </EyePreview>
<
EyePreview
url=
{
`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?id=${record.id}`
}
>
{
text
}
</
EyePreview
>
)
}
},
{
...
...
src/pages/transaction/saleOrder/constant/index.tsx
View file @
dfb74a3d
...
...
@@ -13,9 +13,14 @@ export const baseOrderListColumns: any[] = [
key
:
'orderNo'
,
render
:
(
text
,
record
)
=>
{
// 查看订单, 需根据状态显示不同schema
return
<
EyePreview
url=
{
`/memberCenter/tranactionAbility/saleOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`
}
>
{
text
}
</
EyePreview
>
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}`
}
>
{
text
}
</
EyePreview
>
)
}
},
{
...
...
src/pages/transaction/saleOrder/firstApprovedOrder/detail/index.less
0 → 100644
View file @
dfb74a3d
src/pages/transaction/saleOrder/firstApprovedOrder/detail/index.tsx
0 → 100644
View file @
dfb74a3d
import
React
from
'react'
;
const
FirstApprovedOrderDetail
:
React
.
FC
=
()
=>
{
return
(
<
div
>
待审核订单(一级)详情
</
div
>
);
};
export
default
FirstApprovedOrderDetail
;
\ No newline at end of file
src/pages/transaction/saleOrder/firstApprovedOrder/model/useSelfTable.tsx
View file @
dfb74a3d
...
...
@@ -13,7 +13,8 @@ export const useSelfTable = () => {
const
handleSubmit
=
async
(
record
)
=>
{
if
(
record
.
purchaseOrderInteriorState
===
SaleOrderInsideWorkState
.
ONE_LEVEL_AUDIT_ORDER
)
{
history
.
push
(
`/memberCenter/tranactionAbility/saleOrder/orderPreview?id=
${
record
.
id
}
&preview=0&page_type=1`
)
// history.push(`/memberCenter/tranactionAbility/saleOrder/orderPreview?id=${record.id}&preview=0&page_type=1`)
history
.
push
(
`/memberCenter/tranactionAbility/saleOrder/firstApprovedOrder/detail?id=
${
record
.
id
}
`
)
}
}
const
secondColumns
:
any
[]
=
baseOrderListColumns
.
concat
([
...
...
src/pages/transaction/saleOrder/readyAddLogisticsOrder/model/useSelfTable.tsx
View file @
dfb74a3d
...
...
@@ -21,9 +21,14 @@ export const useSelfTable = () => {
key
:
'orderNo'
,
render
:
(
text
,
record
)
=>
{
// 查看订单, 需根据状态显示不同schema
return
<
EyePreview
url=
{
`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`
}
>
{
text
}
</
EyePreview
>
return
(
// <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`}>
// {text}
// </EyePreview>
<
EyePreview
url=
{
`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?id=${record.id}`
}
>
{
text
}
</
EyePreview
>
)
}
},
{
...
...
src/pages/transaction/saleOrder/readyApprovedOrder/detail/index.less
0 → 100644
View file @
dfb74a3d
src/pages/transaction/saleOrder/readyApprovedOrder/detail/index.tsx
0 → 100644
View file @
dfb74a3d
import
React
from
'react'
;
const
ReadyApprovedOrderDetail
:
React
.
FC
=
()
=>
{
return
(
<
div
>
待审核订单详情
</
div
>
);
};
export
default
ReadyApprovedOrderDetail
;
\ No newline at end of file
src/pages/transaction/saleOrder/readyApprovedOrder/model/useSelfTable.tsx
View file @
dfb74a3d
...
...
@@ -12,7 +12,8 @@ export const useSelfTable = () => {
const
[
rowSelection
,
rowSelectionCtl
]
=
useRowSelectionTable
({
customKey
:
'id'
})
const
handleSubmit
=
async
(
id
)
=>
{
history
.
push
(
`/memberCenter/tranactionAbility/saleOrder/orderPreview?page_type=0&id=
${
id
}
&preview=0`
)
// history.push(`/memberCenter/tranactionAbility/saleOrder/orderPreview?page_type=0&id=${id}&preview=0`)
history
.
push
(
`/memberCenter/tranactionAbility/saleOrder/readyApprovedOrder/detail?id=
${
id
}
`
)
}
const
secondColumns
:
any
[]
=
baseOrderListColumns
.
concat
([
...
...
src/pages/transaction/saleOrder/readyConfirmDelevedOrder/detail/index.less
0 → 100644
View file @
dfb74a3d
src/pages/transaction/saleOrder/readyConfirmDelevedOrder/detail/index.tsx
0 → 100644
View file @
dfb74a3d
import
React
from
'react'
;
const
ReadyConfirmDelevedOrderDetail
:
React
.
FC
=
()
=>
{
return
(
<
div
>
待确认发货订单详情
</
div
>
);
};
export
default
ReadyConfirmDelevedOrderDetail
;
\ No newline at end of file
src/pages/transaction/saleOrder/readyConfirmDelevedOrder/model/useSelfTable.tsx
View file @
dfb74a3d
...
...
@@ -31,9 +31,14 @@ export const useSelfTable = () => {
key
:
'orderNo'
,
render
:
(
text
,
record
)
=>
{
// 查看订单, 需根据状态显示不同schema
return
<
EyePreview
url=
{
`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`
}
>
{
text
}
</
EyePreview
>
return
(
// <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`}>
// {text}
// </EyePreview>
<
EyePreview
url=
{
`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?id=${record.id}`
}
>
{
text
}
</
EyePreview
>
)
}
},
{
...
...
@@ -99,7 +104,8 @@ export const useSelfTable = () => {
]
const
handleConfirm
=
async
(
record
)
=>
{
history
.
push
(
`/memberCenter/tranactionAbility/saleOrder/orderPreview?page_type=7&id=
${
record
.
id
}
&preview=0&orderDeliveryDetailsId=
${
record
.
orderDeliveryDetailsId
}
`
)
// history.push(`/memberCenter/tranactionAbility/saleOrder/orderPreview?page_type=7&id=${record.id}&preview=0&orderDeliveryDetailsId=${record.orderDeliveryDetailsId}`)
history
.
push
(
`/memberCenter/tranactionAbility/saleOrder/readyConfirmDelevedOrder/detail?id=
${
record
.
id
}
&orderDeliveryDetailsId=
${
record
.
orderDeliveryDetailsId
}
`
)
}
return
{
...
...
src/pages/transaction/saleOrder/readyConfirmOrder/detail/index.less
0 → 100644
View file @
dfb74a3d
src/pages/transaction/saleOrder/readyConfirmOrder/detail/index.tsx
0 → 100644
View file @
dfb74a3d
import
React
from
'react'
;
const
ReadyConfirmOrderDetail
:
React
.
FC
=
()
=>
{
return
(
<
div
>
待确认订单
</
div
>
);
};
export
default
ReadyConfirmOrderDetail
;
\ No newline at end of file
src/pages/transaction/saleOrder/readyConfirmOrder/model/useSelfTable.tsx
View file @
dfb74a3d
...
...
@@ -6,7 +6,8 @@ import { baseOrderListColumns } from '../../constant'
// 业务hooks, 待新增订单
export
const
useSelfTable
=
()
=>
{
const
handleConfirm
=
async
(
record
)
=>
{
history
.
push
(
`/memberCenter/tranactionAbility/saleOrder/orderPreview?page_type=3&id=
${
record
.
id
}
&preview=1`
)
// history.push(`/memberCenter/tranactionAbility/saleOrder/orderPreview?page_type=3&id=${record.id}&preview=1`)
history
.
push
(
`/memberCenter/tranactionAbility/saleOrder/readyConfirmOrder/detail?id=
${
record
.
id
}
`
)
}
const
secondColumns
:
any
[]
=
baseOrderListColumns
.
concat
([
{
...
...
src/pages/transaction/saleOrder/readyConfirmReturnOrder/detail/index.less
0 → 100644
View file @
dfb74a3d
src/pages/transaction/saleOrder/readyConfirmReturnOrder/detail/index.tsx
0 → 100644
View file @
dfb74a3d
import
React
from
'react'
;
const
ReadyConfirmReturnOrderDetail
:
React
.
FC
=
()
=>
{
return
(
<
div
>
待确认回单详情
</
div
>
);
};
export
default
ReadyConfirmReturnOrderDetail
;
\ No newline at end of file
src/pages/transaction/saleOrder/readyConfirmReturnOrder/model/useSelfTable.tsx
View file @
dfb74a3d
...
...
@@ -31,9 +31,14 @@ export const useSelfTable = () => {
key
:
'orderNo'
,
render
:
(
text
,
record
)
=>
{
// 查看订单, 需根据状态显示不同schema
return
<
EyePreview
url=
{
`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`
}
>
{
text
}
</
EyePreview
>
return
(
// <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`}>
// {text}
// </EyePreview>
<
EyePreview
url=
{
`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?id=${record.id}`
}
>
{
text
}
</
EyePreview
>
)
}
},
{
...
...
@@ -99,7 +104,8 @@ export const useSelfTable = () => {
]
const
handleConfirm
=
async
(
record
)
=>
{
history
.
push
(
`/memberCenter/tranactionAbility/saleOrder/orderPreview?page_type=8&id=
${
record
.
id
}
&preview=0&orderDeliveryDetailsId=
${
record
.
orderDeliveryDetailsId
}
`
)
// history.push(`/memberCenter/tranactionAbility/saleOrder/orderPreview?page_type=8&id=${record.id}&preview=0&orderDeliveryDetailsId=${record.orderDeliveryDetailsId}`)
history
.
push
(
`/memberCenter/tranactionAbility/saleOrder/readyConfirmReturnOrder/detail?id=
${
record
.
id
}
&orderDeliveryDetailsId=
${
record
.
orderDeliveryDetailsId
}
`
)
}
return
{
...
...
src/pages/transaction/saleOrder/readyPayResult/detail/index.less
0 → 100644
View file @
dfb74a3d
src/pages/transaction/saleOrder/readyPayResult/detail/index.tsx
0 → 100644
View file @
dfb74a3d
import
React
from
'react'
;
const
ReadyPayResultDetail
:
React
.
FC
=
()
=>
{
return
(
<
div
>
待确认支付结果
</
div
>
);
};
export
default
ReadyPayResultDetail
;
\ No newline at end of file
src/pages/transaction/saleOrder/readyPayResult/model/useSelfTable.tsx
View file @
dfb74a3d
...
...
@@ -64,9 +64,14 @@ export const useSelfTable = () => {
key
:
'orderNo'
,
render
:
(
text
,
record
)
=>
{
// 查看订单, 需根据状态显示不同schema
return
<
EyePreview
url=
{
`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`
}
>
{
text
}
</
EyePreview
>
return
(
// <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`}>
// {text}
// </EyePreview>
<
EyePreview
url=
{
`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?id=${record.id}`
}
>
{
text
}
</
EyePreview
>
)
}
},
{
...
...
@@ -138,7 +143,8 @@ export const useSelfTable = () => {
]
const
handleConfirm
=
async
(
record
)
=>
{
history
.
push
(
`/memberCenter/tranactionAbility/saleOrder/orderPreview?page_type=4&id=
${
record
.
id
}
&preview=0`
)
// history.push(`/memberCenter/tranactionAbility/saleOrder/orderPreview?page_type=4&id=${record.id}&preview=0`)
history
.
push
(
`/memberCenter/tranactionAbility/saleOrder/readyPayResult/detail?id=
${
record
.
id
}
`
)
}
const
handleCancel
=
async
(
id
)
=>
{
...
...
src/pages/transaction/saleOrder/readyReturnDocument/detail/index.less
0 → 100644
View file @
dfb74a3d
src/pages/transaction/saleOrder/readyReturnDocument/detail/index.tsx
0 → 100644
View file @
dfb74a3d
import
React
from
'react'
;
const
ReadyReturnDocumentDetail
:
React
.
FC
=
()
=>
{
return
(
<
div
>
待确认归档详情
</
div
>
);
};
export
default
ReadyReturnDocumentDetail
;
\ No newline at end of file
src/pages/transaction/saleOrder/readyReturnDocument/model/useSelfTable.tsx
View file @
dfb74a3d
...
...
@@ -13,7 +13,8 @@ export const useSelfTable = () => {
const
handleSubmit
=
async
(
record
)
=>
{
if
(
record
.
purchaseOrderInteriorState
===
SaleOrderInsideWorkState
.
FILLING_ORDER
)
{
history
.
push
(
`/memberCenter/tranactionAbility/saleOrder/orderPreview?id=
${
record
.
id
}
&preview=0&page_type=9`
)
// history.push(`/memberCenter/tranactionAbility/saleOrder/orderPreview?id=${record.id}&preview=0&page_type=9`)
history
.
push
(
`/memberCenter/tranactionAbility/saleOrder/readyReturnDocument/detail?id=
${
record
.
id
}
`
)
}
}
const
secondColumns
:
any
[]
=
baseOrderListColumns
.
concat
([
...
...
src/pages/transaction/saleOrder/secondApprovedOrder/detail/index.less
0 → 100644
View file @
dfb74a3d
src/pages/transaction/saleOrder/secondApprovedOrder/detail/index.tsx
0 → 100644
View file @
dfb74a3d
import
React
from
'react'
;
const
SecondApprovedOrderDetail
:
React
.
FC
=
()
=>
{
return
(
<
div
>
待审核订单(二级)详情
</
div
>
);
};
export
default
SecondApprovedOrderDetail
;
\ No newline at end of file
src/pages/transaction/saleOrder/secondApprovedOrder/model/useSelfTable.tsx
View file @
dfb74a3d
...
...
@@ -10,7 +10,8 @@ export const useSelfTable = () => {
const
ref
=
useRef
<
any
>
({})
const
handleSubmit
=
async
(
record
)
=>
{
if
(
record
.
purchaseOrderInteriorState
===
SaleOrderInsideWorkState
.
TWO_LEVEL_AUDIT_ORDER
)
{
history
.
push
(
`/memberCenter/tranactionAbility/saleOrder/orderPreview?id=
${
record
.
id
}
&preview=0&page_type=2`
)
// history.push(`/memberCenter/tranactionAbility/saleOrder/orderPreview?id=${record.id}&preview=0&page_type=2`)
history
.
push
(
`/memberCenter/tranactionAbility/saleOrder/secondApprovedOrder/detail?id=
${
record
.
id
}
`
)
}
}
const
secondColumns
:
any
[]
=
baseOrderListColumns
.
concat
([
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment