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
36c8ed50
Commit
36c8ed50
authored
Aug 20, 2021
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: 替换全局组件
parent
d18260db
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
44 deletions
+33
-44
index.tsx
...rvice/exchangeApplication/components/DetailInfo/index.tsx
+17
-17
index.tsx
...terService/exchangeManage/components/DetailInfo/index.tsx
+16
-27
No files found.
src/pages/afterService/exchangeApplication/components/DetailInfo/index.tsx
View file @
36c8ed50
...
...
@@ -31,13 +31,13 @@ import { normalizeFiledata, FileData, findLastIndexFlowState } from '@/utils';
import
AnchorPage
from
'@/layouts/AnchorPage'
;
import
StatusTag
from
'@/components/StatusTag'
;
import
{
EditableColumns
}
from
'@/components/PolymericTable/interface'
;
import
AuditProcess
from
'@/components/AuditProcess'
;
import
{
OuterHistoryData
,
InnerHistoryData
}
from
'../../../components/FlowRecords'
;
import
{
EXCHANGE_OUTER_STATUS_TAG_MAP
,
EXCHANGE_INNER_STATUS_BADGE_MAP
,
}
from
'../../../constants'
;
const
OuterCirculation
=
React
.
lazy
(()
=>
import
(
'../../../components/OuterCirculation'
));
const
ProductList
=
React
.
lazy
(()
=>
import
(
'../../../components/ProductList'
));
const
ExchangeReceivedInfo
=
React
.
lazy
(()
=>
import
(
'../../../components/ExchangeReceivedInfo'
));
const
ExchangeDeliverInfo
=
React
.
lazy
(()
=>
import
(
'../../../components/ExchangeDeliverInfo'
));
...
...
@@ -433,22 +433,20 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<
Row
gutter=
{
[
16
,
16
]
}
>
{
/* 外部流转 */
}
<
Col
span=
{
24
}
>
<
Suspense
fallback=
{
null
}
>
<
OuterCirculation
steps=
{
detailInfo
&&
detailInfo
.
outerTaskList
?
detailInfo
.
outerTaskList
.
map
(
item
=>
({
step
:
item
.
step
,
title
:
item
.
taskName
,
description
:
item
.
roleName
,
status
:
item
.
isExecute
?
'finish'
:
'wait'
,
}))
:
[]
}
current=
{
findLastIndexFlowState
(
detailInfo
?.
outerTaskList
)
}
id=
"taskList"
/>
</
Suspense
>
<
AuditProcess
outerVerifyCurrent=
{
findLastIndexFlowState
(
detailInfo
?.
outerTaskList
)
}
outerVerifySteps=
{
(
detailInfo
&&
detailInfo
.
outerTaskList
?
detailInfo
.
outerTaskList
.
map
(
item
=>
({
...
item
,
status
:
item
.
isExecute
?
'finish'
:
'wait'
,
}))
:
[]
)
}
customTitleKey=
"taskName"
id=
"taskList"
ellipsis
/>
</
Col
>
{
/* 基本信息 */
}
...
...
@@ -557,6 +555,8 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
innerStatus=
{
detailInfo
?.
innerStatus
}
target=
{
target
}
isEdit=
{
isEditRefundDeliver
}
afterType=
{
2
}
deliveryType=
{
detailInfo
?.
returnGoodsAddress
?.
deliveryType
}
id=
"returnDeliveryGoodsList"
/>
</
Suspense
>
...
...
src/pages/afterService/exchangeManage/components/DetailInfo/index.tsx
View file @
36c8ed50
...
...
@@ -488,33 +488,20 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<
Row
gutter=
{
[
16
,
16
]
}
>
{
/* 流转进度 */
}
<
Col
span=
{
24
}
>
<
Suspense
fallback=
{
null
}
>
<
AuditProcess
outerVerifySteps=
{
detailInfo
&&
detailInfo
.
outerTaskList
?
detailInfo
.
outerTaskList
.
map
(
item
=>
({
step
:
item
.
step
,
stepName
:
item
.
taskName
,
roleName
:
item
.
roleName
,
status
:
item
.
isExecute
?
'finish'
:
'wait'
,
}))
:
[]
}
outerVerifyCurrent=
{
findLastIndexFlowState
(
detailInfo
?.
outerTaskList
)
}
innerVerifySteps=
{
detailInfo
&&
detailInfo
.
innerTaskList
?
detailInfo
.
innerTaskList
.
map
(
item
=>
({
step
:
item
.
step
,
stepName
:
item
.
taskName
,
roleName
:
item
.
roleName
,
status
:
item
.
isExecute
?
'finish'
:
'wait'
,
}))
:
[]
}
innerVerifyCurrent=
{
findLastIndexFlowState
(
detailInfo
?.
innerTaskList
)
}
id=
"taskList"
/>
</
Suspense
>
<
AuditProcess
outerVerifyCurrent=
{
findLastIndexFlowState
(
detailInfo
?.
outerTaskList
)
}
outerVerifySteps=
{
(
detailInfo
&&
detailInfo
.
outerTaskList
?
detailInfo
.
outerTaskList
.
map
(
item
=>
({
...
item
,
status
:
item
.
isExecute
?
'finish'
:
'wait'
,
}))
:
[]
)
}
customTitleKey=
"taskName"
id=
"taskList"
ellipsis
/>
</
Col
>
{
/* 基本信息 */
}
...
...
@@ -621,6 +608,8 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
innerStatus=
{
detailInfo
?.
innerStatus
}
target=
{
target
}
isEdit=
{
isEditRefundDeliver
}
afterType=
{
2
}
deliveryType=
{
detailInfo
?.
returnGoodsAddress
?.
deliveryType
}
id=
"returnDeliveryGoodsList"
/>
</
Suspense
>
...
...
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