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
bcc267f9
Commit
bcc267f9
authored
Aug 07, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:
parent
adad797b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
13 deletions
+9
-13
index.tsx
src/pages/transaction/components/orderMergeInfo/index.tsx
+6
-10
index.tsx
src/pages/transaction/purchaseOrder/index.tsx
+3
-3
No files found.
src/pages/transaction/components/orderMergeInfo/index.tsx
View file @
bcc267f9
...
@@ -3,7 +3,7 @@ import { Row, Col, Tag, Modal } from 'antd'
...
@@ -3,7 +3,7 @@ import { Row, Col, Tag, Modal } from 'antd'
import
MellowCard
from
'@/components/MellowCard'
import
MellowCard
from
'@/components/MellowCard'
import
{
OrderDetailContext
}
from
'../../_public/order/context'
import
{
OrderDetailContext
}
from
'../../_public/order/context'
import
{
formatTimeString
}
from
'@/utils'
import
{
formatTimeString
}
from
'@/utils'
import
{
DELIVERY_TYPE
}
from
'@/constants/order'
import
{
DELIVERY_TYPE
,
OrderKindType
}
from
'@/constants/order'
import
style
from
'./index.less'
import
style
from
'./index.less'
import
ContractList
from
'../ContractList'
import
ContractList
from
'../ContractList'
import
cx
from
'classnames'
import
cx
from
'classnames'
...
@@ -56,29 +56,25 @@ const OrderMergeInfo: React.FC<OrderMergeInfoProps> = (props) => {
...
@@ -56,29 +56,25 @@ const OrderMergeInfo: React.FC<OrderMergeInfoProps> = (props) => {
</
div
>
</
div
>
}
}
</
div
>,
resetCol
:
{
flex
:
'1 1 100%'
}
},
</
div
>,
resetCol
:
{
flex
:
'1 1 100%'
}
},
{
title
:
'包装要求
:'
,
name
:
'pageRequire
'
},
{
title
:
'包装要求
'
,
name
:
'requirement'
,
render
:
(
t
,
d
)
=>
d
.
requirement
.
detail
?.
pageRequire
||
'
'
},
{
title
:
'其他要求
:'
,
name
:
'restsRequire
'
},
{
title
:
'其他要求
'
,
name
:
'requirement'
,
render
:
(
t
,
d
)
=>
d
.
requirement
.
detail
?.
restsRequire
||
'
'
},
]
]
if
(
data
.
orderModel
>
30
)
{
otherInfo
.
shift
()
}
return
(
return
(
<>
<>
<
Row
style=
{
{
marginTop
:
24
}
}
gutter=
{
24
}
>
<
Row
style=
{
{
marginTop
:
24
}
}
gutter=
{
24
}
>
<
Col
span=
{
(
data
.
externalStateName
!==
'不接受订单'
)
||
(
data
.
order
Model
>
30
)
?
15
:
12
}
>
<
Col
span=
{
(
data
.
externalStateName
!==
'不接受订单'
)
||
(
data
.
order
Kind
===
OrderKindType
.
SRM_ORDER
)
?
15
:
12
}
>
<
MellowCard
title=
'交易信息'
fullHeight
>
<
MellowCard
title=
'交易信息'
fullHeight
>
<
RenderCard
infoList=
{
payInfo
}
dataSource=
{
consignee
}
/>
<
RenderCard
infoList=
{
payInfo
}
dataSource=
{
consignee
}
/>
</
MellowCard
>
</
MellowCard
>
</
Col
>
</
Col
>
<
Col
span=
{
(
data
.
externalStateName
!==
'不接受订单'
)
||
(
data
.
order
Model
>
30
)
?
9
:
6
}
>
<
Col
span=
{
(
data
.
externalStateName
!==
'不接受订单'
)
||
(
data
.
order
Kind
===
OrderKindType
.
SRM_ORDER
)
?
9
:
6
}
>
<
MellowCard
title=
'其他信息'
fullHeight
>
<
MellowCard
title=
'其他信息'
fullHeight
>
<
RenderCard
infoList=
{
otherInfo
}
dataSource=
{
data
}
/>
<
RenderCard
infoList=
{
otherInfo
}
dataSource=
{
data
}
/>
</
MellowCard
>
</
MellowCard
>
</
Col
>
</
Col
>
{
{
(
data
.
externalStateName
!==
'不接受订单'
)
||
(
data
.
orderModel
>
30
)
?
(
data
.
orderKind
===
OrderKindType
.
SRM_ORDER
)
||
!
data
.
hasContract
?
null
null
:
:
<
Col
span=
{
6
}
>
<
Col
span=
{
6
}
>
...
...
src/pages/transaction/purchaseOrder/index.tsx
View file @
bcc267f9
...
@@ -117,7 +117,7 @@ const PurchaseOrder: React.FC<PurchaseOrderProps> = (props) => {
...
@@ -117,7 +117,7 @@ const PurchaseOrder: React.FC<PurchaseOrderProps> = (props) => {
const
handleCancel
=
async
(
id
)
=>
{
const
handleCancel
=
async
(
id
)
=>
{
destoryRef
.
current
.
setVisible
(
true
)
destoryRef
.
current
.
setVisible
(
true
)
destroyActions
.
setFieldValue
(
'
i
d'
,
id
)
destroyActions
.
setFieldValue
(
'
orderI
d'
,
id
)
}
}
/** 参照后台数据生成 */
/** 参照后台数据生成 */
...
@@ -250,12 +250,12 @@ const PurchaseOrder: React.FC<PurchaseOrderProps> = (props) => {
...
@@ -250,12 +250,12 @@ const PurchaseOrder: React.FC<PurchaseOrderProps> = (props) => {
labelAlign
:
'top'
,
labelAlign
:
'top'
,
},
},
properties
:
{
properties
:
{
i
d
:
{
orderI
d
:
{
type
:
'number'
,
type
:
'number'
,
title
:
'当前id'
,
title
:
'当前id'
,
visible
:
false
,
visible
:
false
,
},
},
cancelR
eason
:
{
r
eason
:
{
type
:
'textarea'
,
type
:
'textarea'
,
"x-component-props"
:
{
"x-component-props"
:
{
rows
:
4
,
rows
:
4
,
...
...
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