Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-admin
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
shenshaokai
jinfa-admin
Commits
e68d4405
Commit
e68d4405
authored
Nov 20, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:处理订单详情无法显示物流方式/隐藏无数据的流转记录
parent
1a4cd9d1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
21 deletions
+31
-21
index.tsx
...System/orderDetail/components/orderProductTable/index.tsx
+2
-1
index.tsx
...tem/orderDetail/components/orderTransformRecord/index.tsx
+29
-20
No files found.
src/pages/orderSystem/orderDetail/components/orderProductTable/index.tsx
View file @
e68d4405
...
...
@@ -13,6 +13,7 @@ import { SALE_ORDER_STATUS } from '../../constant'
import
{
usePageStatus
}
from
'@/hooks/usePageStatus'
import
ModalTable
from
'@/components/ModalTable'
import
{
formatTimeString
}
from
'@/utils'
import
{
DELIVERY_TYPE
}
from
'@/constants'
export
interface
OrderProductTableProps
{}
...
...
@@ -388,7 +389,7 @@ const OrderProductTable:React.FC<OrderProductTableProps> = (props) => {
dataIndex
:
'logistics'
,
align
:
'center'
,
key
:
'logistics'
,
render
:
text
=>
(
text
&&
text
.
render
)
||
''
render
:
(
text
)
=>
text
&&
text
.
deliveryType
&&
DELIVERY_TYPE
[
text
.
deliveryType
]
},
{
title
:
'仓位库存扣减记录'
,
...
...
src/pages/orderSystem/orderDetail/components/orderTransformRecord/index.tsx
View file @
e68d4405
...
...
@@ -106,26 +106,35 @@ const OrderTransformRecord:React.FC<OrderTransformRecordProps> = (props) => {
const
{
data
}
=
useContext
(
OrderDetailContext
)
const
{
externalProcurementOrderLogResponses
,
interiorProcurementOrderLogResponses
}
=
data
return
(
<
MellowCard
style=
{
{
marginTop
:
24
}
}
bordered=
{
false
}
>
<
Tabs
defaultActiveKey=
"1"
animated=
{
false
}
>
<
Tabs
.
TabPane
tab=
'外部订单流转记录'
key=
"1"
>
<
Table
columns=
{
outOrderCols
}
dataSource=
{
externalProcurementOrderLogResponses
}
pagination=
{
false
}
rowKey=
"id"
/>
</
Tabs
.
TabPane
>
<
Tabs
.
TabPane
tab=
'内部订单流转记录'
key=
"2"
>
<
Table
columns=
{
sideOrderCols
}
dataSource=
{
interiorProcurementOrderLogResponses
}
pagination=
{
false
}
rowKey=
"id"
/>
</
Tabs
.
TabPane
>
</
Tabs
>
</
MellowCard
>
<>
{
(
externalProcurementOrderLogResponses
?.
length
>
0
||
interiorProcurementOrderLogResponses
?.
length
>
0
)
&&
<
MellowCard
style=
{
{
marginTop
:
24
}
}
bordered=
{
false
}
>
<
Tabs
defaultActiveKey=
"1"
animated=
{
false
}
>
{
externalProcurementOrderLogResponses
?.
length
>
0
&&
<
Tabs
.
TabPane
tab=
'外部订单流转记录'
key=
"1"
>
<
Table
columns=
{
outOrderCols
}
dataSource=
{
externalProcurementOrderLogResponses
}
pagination=
{
false
}
rowKey=
"id"
/>
</
Tabs
.
TabPane
>
}
{
interiorProcurementOrderLogResponses
?.
length
>
0
&&
<
Tabs
.
TabPane
tab=
'内部订单流转记录'
key=
"2"
>
<
Table
columns=
{
sideOrderCols
}
dataSource=
{
interiorProcurementOrderLogResponses
}
pagination=
{
false
}
rowKey=
"id"
/>
</
Tabs
.
TabPane
>
}
</
Tabs
>
</
MellowCard
>
}
</>
)
}
...
...
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