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
fa7887ca
Commit
fa7887ca
authored
Nov 09, 2020
by
Bill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改加工详情流转状态
parent
d24bb205
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
42 deletions
+20
-42
index.tsx
src/pages/handling/assign/detail/index.tsx
+3
-3
index.tsx
src/pages/handling/components/Circulation/index.tsx
+17
-39
No files found.
src/pages/handling/assign/detail/index.tsx
View file @
fa7887ca
...
@@ -63,7 +63,7 @@ const Detail: React.FC<{}> = () => {
...
@@ -63,7 +63,7 @@ const Detail: React.FC<{}> = () => {
}
}
>
>
<
Card
bodyStyle=
{
{
padding
:
'5px 24px 15px 24px'
}
}
>
<
Card
bodyStyle=
{
{
padding
:
'5px 24px 15px 24px'
}
}
>
<
Circulation
inner
Status=
{
info
?.
innerStatus
}
outerStatus=
{
info
?.
outerStatus
}
inner
TaskList=
{
info
?.
innerTaskList
}
outerTaskList=
{
info
?.
outerTaskList
}
/>
<
Circulation
innerTaskList=
{
info
?.
innerTaskList
}
outerTaskList=
{
info
?.
outerTaskList
}
/>
</
Card
>
</
Card
>
<
div
style=
{
{
marginTop
:
'20px'
}
}
>
<
div
style=
{
{
marginTop
:
'20px'
}
}
>
...
@@ -77,10 +77,10 @@ const Detail: React.FC<{}> = () => {
...
@@ -77,10 +77,10 @@ const Detail: React.FC<{}> = () => {
<
Card
bodyStyle=
{
{
padding
:
'10px 24px 24px 24px'
}
}
>
<
Card
bodyStyle=
{
{
padding
:
'10px 24px 24px 24px'
}
}
>
<
Tabs
>
<
Tabs
>
<
TabPane
tab=
"收发货统计"
key=
"1"
>
<
TabPane
tab=
"收发货统计"
key=
"1"
>
<
WrapTable
/>
<
WrapTable
dataSource=
{
[]
}
/>
</
TabPane
>
</
TabPane
>
<
TabPane
tab=
"收发货明细"
key=
"2"
>
<
TabPane
tab=
"收发货明细"
key=
"2"
>
<
WrapTable
/>
<
WrapTable
dataSource=
{
[]
}
/>
</
TabPane
>
</
TabPane
>
</
Tabs
>
</
Tabs
>
</
Card
>
</
Card
>
...
...
src/pages/handling/components/Circulation/index.tsx
View file @
fa7887ca
import
React
,
{
useState
,
useEffect
}
from
'react'
;
import
React
from
'react'
;
import
{
Tabs
,
Steps
,
Popover
}
from
'antd'
;
import
{
Tabs
,
Steps
}
from
'antd'
;
const
TabPane
=
Tabs
.
TabPane
;
const
TabPane
=
Tabs
.
TabPane
;
const
{
Step
}
=
Steps
;
const
{
Step
}
=
Steps
;
...
@@ -10,50 +10,28 @@ const customDot = (dot, { status, index }) => (
...
@@ -10,50 +10,28 @@ const customDot = (dot, { status, index }) => (
</
span
>
</
span
>
);
);
interface
Istatus
{
isExecute
:
number
,
roleName
:
string
,
step
:
number
,
taskName
:
string
}
interface
Iprops
{
interface
Iprops
{
innerTaskList
:
any
[],
innerTaskList
:
Istatus
[],
outerTaskList
:
any
[],
outerTaskList
:
Istatus
[],
innerStatus
:
number
,
outerStatus
:
number
}
}
const
Circulation
:
React
.
FC
<
Iprops
>
=
(
props
)
=>
{
const
Circulation
:
React
.
FC
<
Iprops
>
=
(
props
)
=>
{
const
{
innerTaskList
=
[],
outerTaskList
=
[]
}
=
props
;
const
{
innerTaskList
=
[],
outerTaskList
=
[]
}
=
props
;
const
[
innerStatus
,
setInnerStatus
]
=
useState
(
0
);
const
[
outerStatus
,
setOuterStatus
]
=
useState
(
0
);
// const innerStatus = innerTaskList.map(())
useEffect
(()
=>
{
const
length
=
innerTaskList
.
length
;
if
(
length
>
0
)
{
for
(
let
i
=
length
-
1
;
i
>=
0
;
i
--
)
{
if
(
innerTaskList
[
i
].
isExecute
==
1
)
{
setInnerStatus
(
i
);
break
;
}
}
}
},
[
innerTaskList
])
useEffect
(()
=>
{
const
length
=
outerTaskList
.
length
;
if
(
length
>
0
)
{
for
(
let
i
=
length
-
1
;
i
>=
0
;
i
--
)
{
if
(
outerTaskList
[
i
].
isExecute
==
1
)
{
setOuterStatus
(
i
);
break
;
}
}
}
},
[
innerTaskList
])
return
(
return
(
<
Tabs
defaultActiveKey=
"1"
>
<
Tabs
defaultActiveKey=
"1"
>
<
TabPane
tab=
"外部流转"
key=
"1"
>
<
TabPane
tab=
"外部流转"
key=
"1"
>
<
Steps
current=
{
innerStatus
}
progressDot=
{
customDot
}
style=
{
{
marginTop
:
'20px'
}
}
>
<
Steps
progressDot=
{
customDot
}
style=
{
{
marginTop
:
'20px'
}
}
>
{
{
outerTaskList
.
map
((
item
)
=>
{
outerTaskList
.
map
((
item
:
Istatus
)
=>
{
return
(
return
(
<
Step
title=
{
item
.
taskName
}
description=
{
item
.
roleName
}
key=
{
item
.
step
}
/>
<
Step
title=
{
item
.
taskName
}
status=
{
item
.
isExecute
==
1
?
'finish'
:
'wait'
}
description=
{
item
.
roleName
}
key=
{
item
.
step
}
/>
)
)
})
})
}
}
...
@@ -61,11 +39,11 @@ const Circulation: React.FC<Iprops> = (props) => {
...
@@ -61,11 +39,11 @@ const Circulation: React.FC<Iprops> = (props) => {
</
Steps
>
</
Steps
>
</
TabPane
>
</
TabPane
>
<
TabPane
tab=
"内部流转"
key=
"2"
>
<
TabPane
tab=
"内部流转"
key=
"2"
>
<
Steps
current=
{
outerStatus
}
progressDot=
{
customDot
}
style=
{
{
marginTop
:
'20px'
}
}
>
<
Steps
progressDot=
{
customDot
}
style=
{
{
marginTop
:
'20px'
}
}
>
{
{
innerTaskList
.
map
((
item
)
=>
{
innerTaskList
.
map
((
item
:
Istatus
)
=>
{
return
(
return
(
<
Step
title=
{
item
.
taskName
}
description=
{
item
.
roleName
}
key=
{
item
.
step
}
/>
<
Step
title=
{
item
.
taskName
}
status=
{
item
.
isExecute
==
1
?
'finish'
:
'wait'
}
description=
{
item
.
roleName
}
key=
{
item
.
step
}
/>
)
)
})
})
}
}
...
...
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