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
47425c33
Commit
47425c33
authored
Aug 20, 2021
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: 删除 suspence
parent
7ab3760d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
44 deletions
+40
-44
index.tsx
...Service/returnApplication/components/DetailInfo/index.tsx
+15
-17
index.tsx
...afterService/returnManage/components/DetailInfo/index.tsx
+25
-27
No files found.
src/pages/afterService/returnApplication/components/DetailInfo/index.tsx
View file @
47425c33
...
@@ -33,7 +33,7 @@ import AnchorPage from '@/layouts/AnchorPage';
...
@@ -33,7 +33,7 @@ import AnchorPage from '@/layouts/AnchorPage';
import
StatusTag
from
'@/components/StatusTag'
;
import
StatusTag
from
'@/components/StatusTag'
;
import
{
EditableColumns
}
from
'@/components/PolymericTable/interface'
;
import
{
EditableColumns
}
from
'@/components/PolymericTable/interface'
;
import
DescProgress
from
'@/components/DescProgress'
;
import
DescProgress
from
'@/components/DescProgress'
;
import
AuditProcess
,
{
StepsItem
}
from
'@/components/AuditProcess'
;
import
AuditProcess
from
'@/components/AuditProcess'
;
import
ReturnInfoDrawer
,
{
OrderInfo
}
from
'../../../components/ReturnInfoDrawer'
;
import
ReturnInfoDrawer
,
{
OrderInfo
}
from
'../../../components/ReturnInfoDrawer'
;
import
{
OuterHistoryData
,
InnerHistoryData
}
from
'../../../components/FlowRecords'
;
import
{
OuterHistoryData
,
InnerHistoryData
}
from
'../../../components/FlowRecords'
;
import
{
import
{
...
@@ -507,22 +507,20 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
...
@@ -507,22 +507,20 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<
Row
gutter=
{
[
16
,
16
]
}
>
<
Row
gutter=
{
[
16
,
16
]
}
>
{
/* 流转进度 */
}
{
/* 流转进度 */
}
<
Col
span=
{
24
}
>
<
Col
span=
{
24
}
>
<
Suspense
fallback=
{
null
}
>
<
AuditProcess
<
AuditProcess
outerVerifyCurrent=
{
findLastIndexFlowState
(
detailInfo
?.
outerTaskList
)
}
outerVerifyCurrent=
{
findLastIndexFlowState
(
detailInfo
?.
outerTaskList
)
}
outerVerifySteps=
{
(
outerVerifySteps=
{
(
detailInfo
&&
detailInfo
.
outerTaskList
?
detailInfo
&&
detailInfo
.
outerTaskList
?
detailInfo
.
outerTaskList
.
map
(
item
=>
({
detailInfo
.
outerTaskList
.
map
(
item
=>
({
...
item
,
...
item
,
status
:
item
.
isExecute
?
'finish'
:
'wait'
,
status
:
item
.
isExecute
?
'finish'
:
'wait'
,
}))
:
}))
:
[]
[]
)
}
)
}
customTitleKey=
"taskName"
customTitleKey=
"taskName"
id=
"taskList"
id=
"taskList"
ellipsis
ellipsis
/>
/>
</
Suspense
>
</
Col
>
</
Col
>
{
/* 基本信息 */
}
{
/* 基本信息 */
}
...
...
src/pages/afterService/returnManage/components/DetailInfo/index.tsx
View file @
47425c33
...
@@ -537,33 +537,31 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
...
@@ -537,33 +537,31 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<
Row
gutter=
{
[
16
,
16
]
}
>
<
Row
gutter=
{
[
16
,
16
]
}
>
{
/* 流转进度 */
}
{
/* 流转进度 */
}
<
Col
span=
{
24
}
>
<
Col
span=
{
24
}
>
<
Suspense
fallback=
{
null
}
>
<
AuditProcess
<
AuditProcess
outerVerifySteps=
{
outerVerifySteps=
{
detailInfo
&&
detailInfo
.
outerTaskList
?
detailInfo
&&
detailInfo
.
outerTaskList
?
detailInfo
.
outerTaskList
.
map
(
item
=>
({
detailInfo
.
outerTaskList
.
map
(
item
=>
({
step
:
item
.
step
,
step
:
item
.
step
,
stepName
:
item
.
taskName
,
stepName
:
item
.
taskName
,
roleName
:
item
.
roleName
,
roleName
:
item
.
roleName
,
status
:
item
.
isExecute
?
'finish'
:
'wait'
,
status
:
item
.
isExecute
?
'finish'
:
'wait'
,
}))
:
}))
:
[]
[]
}
}
outerVerifyCurrent=
{
findLastIndexFlowState
(
detailInfo
?.
outerTaskList
)
}
outerVerifyCurrent=
{
findLastIndexFlowState
(
detailInfo
?.
outerTaskList
)
}
innerVerifySteps=
{
innerVerifySteps=
{
detailInfo
&&
detailInfo
.
innerTaskList
?
detailInfo
&&
detailInfo
.
innerTaskList
?
detailInfo
.
innerTaskList
.
map
(
item
=>
({
detailInfo
.
innerTaskList
.
map
(
item
=>
({
step
:
item
.
step
,
step
:
item
.
step
,
stepName
:
item
.
taskName
,
stepName
:
item
.
taskName
,
roleName
:
item
.
roleName
,
roleName
:
item
.
roleName
,
status
:
item
.
isExecute
?
'finish'
:
'wait'
,
status
:
item
.
isExecute
?
'finish'
:
'wait'
,
}))
:
}))
:
[]
[]
}
}
innerVerifyCurrent=
{
findLastIndexFlowState
(
detailInfo
?.
innerTaskList
)
}
innerVerifyCurrent=
{
findLastIndexFlowState
(
detailInfo
?.
innerTaskList
)
}
id=
"taskList"
id=
"taskList"
/>
/>
</
Suspense
>
</
Col
>
</
Col
>
{
/* 基本信息 */
}
{
/* 基本信息 */
}
...
...
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