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
8ef0085b
Commit
8ef0085b
authored
Jun 16, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 取消采购商订单物流单跳转,采购合同下单隐藏订单详情隐藏电子合同项
parent
b8da003c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
index.tsx
src/pages/transaction/components/orderDeleveRecord/index.tsx
+1
-1
index.tsx
src/pages/transaction/components/orderMergeInfo/index.tsx
+11
-11
No files found.
src/pages/transaction/components/orderDeleveRecord/index.tsx
View file @
8ef0085b
...
...
@@ -193,7 +193,7 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
dataIndex
:
'logisticsNo'
,
align
:
'center'
,
key
:
'logisticsNo'
,
render
:
text
=>
<
a
target=
"blank"
href=
{
`/memberCenter/logisticsAbility/logisticsSubmit/orderSubmitSearchList/detail?code=${text}`
}
>
{
text
}
</
a
>
//
render: text => <a target="blank" href={`/memberCenter/logisticsAbility/logisticsSubmit/orderSubmitSearchList/detail?code=${text}`}>{text}</a>
},
{
title
:
'物流公司'
,
...
...
src/pages/transaction/components/orderMergeInfo/index.tsx
View file @
8ef0085b
...
...
@@ -77,20 +77,22 @@ const OrderMergeInfo: React.FC<OrderMergeInfoProps> = (props) => {
return
(
<>
<
Row
style=
{
{
marginTop
:
24
}
}
gutter=
{
24
}
>
<
Col
span=
{
12
}
>
<
Col
span=
{
(
data
.
externalStateName
!==
'不接受订单'
)
||
(
data
.
orderModel
>
30
)
?
15
:
12
}
>
<
MellowCard
title=
'交易信息'
fullHeight
>
<
RenderCard
infoList=
{
payInfo
}
dataSource=
{
data
}
/>
</
MellowCard
>
</
Col
>
<
Col
span=
{
6
}
>
<
Col
span=
{
(
data
.
externalStateName
!==
'不接受订单'
)
||
(
data
.
orderModel
>
30
)
?
9
:
6
}
>
<
MellowCard
title=
'其他信息'
fullHeight
>
<
RenderCard
infoList=
{
otherInfo
}
dataSource=
{
data
}
/>
</
MellowCard
>
</
Col
>
<
Col
span=
{
6
}
>
<
MellowCard
title=
'电子合同'
fullHeight
>
{
(
data
.
externalStateName
!==
'不接受订单'
)
||
(
data
.
orderModel
>
30
)
?
{
(
data
.
externalStateName
!==
'不接受订单'
)
||
(
data
.
orderModel
>
30
)
?
null
:
<
Col
span=
{
6
}
>
<
MellowCard
title=
'电子合同'
fullHeight
>
<
ContractList
dataSource=
{
data
.
electronicContractUrl
?
...
...
@@ -103,11 +105,9 @@ const OrderMergeInfo: React.FC<OrderMergeInfoProps> = (props) => {
null
}
/>
:
null
}
</
MellowCard
>
</
Col
>
</
MellowCard
>
</
Col
>
}
</
Row
>
<
Modal
title=
"发票信息"
visible=
{
isModalVisible
}
onOk=
{
()
=>
setIsModalVisible
(
false
)
}
onCancel=
{
()
=>
setIsModalVisible
(
false
)
}
>
<
Row
gutter=
{
[
0
,
10
]
}
style=
{
{
fontSize
:
14
}
}
>
...
...
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