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
linweijiong
jinfa-platform
Commits
a2d3f1f8
Commit
a2d3f1f8
authored
Jun 22, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 处理订单详情账期月结和合同下单商品id显示异常
parent
805285dd
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
index.tsx
...pages/transaction/components/orderDetailSection/index.tsx
+2
-2
index.tsx
src/pages/transaction/components/orderPayTabs/index.tsx
+2
-2
index.tsx
src/pages/transaction/components/orderProductTable/index.tsx
+2
-2
index.tsx
...es/transaction/components/saleOrderProductTable/index.tsx
+2
-2
No files found.
src/pages/transaction/components/orderDetailSection/index.tsx
View file @
a2d3f1f8
...
...
@@ -29,7 +29,7 @@ const OrderDetailSection:React.FC<OrderDetailSectionProps> = ({formContext, type
...
item
,
status
:
item
.
isExecute
?
'finish'
:
'wait'
,
}))
:
[]
null
}
innerVerifySteps=
{
formContext
.
data
.
interiorWorkflowFlowRecordLogResponses
?
...
...
@@ -37,7 +37,7 @@ const OrderDetailSection:React.FC<OrderDetailSectionProps> = ({formContext, type
...
item
,
status
:
item
.
isExecute
?
'finish'
:
'wait'
,
}))
:
[]
null
}
></
AuditProcess
>
...
...
src/pages/transaction/components/orderPayTabs/index.tsx
View file @
a2d3f1f8
...
...
@@ -100,10 +100,10 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {
<
Col
>
{
v
.
payNode
}
</
Col
>
</
Row
>
{
v
.
payWay
===
-
1
?
v
.
channel
===
-
1
?
<
Row
>
<
Col
className=
{
style
.
fontGray
}
span=
{
4
}
>
支付方式:
</
Col
>
<
Col
>
{
v
.
channel
===
100
?
'账期'
:
'月结'
}
</
Col
>
<
Col
>
{
v
.
payWay
===
5
?
'账期'
:
'月结'
}
</
Col
>
</
Row
>
:
<>
...
...
src/pages/transaction/components/orderProductTable/index.tsx
View file @
a2d3f1f8
...
...
@@ -396,9 +396,9 @@ const OrderProductTable:React.FC<OrderProductTableProps> = ({editable}) => {
},
{
title
:
'关联报价商品ID/名称/规格/品类/品牌'
,
dataIndex
:
'
material
Id'
,
dataIndex
:
'
product
Id'
,
align
:
'center'
,
key
:
'
material
Id'
,
key
:
'
product
Id'
,
render
:
(
t
,
r
)
=>
`
${
t
}
/
${
r
.
productName
}
/
${
r
.
category
}
/
${
r
.
brand
}
`
},
{
...
...
src/pages/transaction/components/saleOrderProductTable/index.tsx
View file @
a2d3f1f8
...
...
@@ -502,9 +502,9 @@ const SaleOrderProductTable:React.FC<OrderProductTableProps> = (props) => {
},
{
title
:
'关联报价商品ID/名称/规格/品类/品牌'
,
dataIndex
:
'
material
Id'
,
dataIndex
:
'
product
Id'
,
align
:
'center'
,
key
:
'
material
Id'
,
key
:
'
product
Id'
,
render
:
(
t
,
r
)
=>
`
${
t
}
/
${
r
.
productName
}
/
${
r
.
category
}
/
${
r
.
brand
}
`
},
{
...
...
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