Commit fa7887ca authored by Bill's avatar Bill

修改加工详情流转状态

parent d24bb205
......@@ -63,7 +63,7 @@ const Detail: React.FC<{}> = () => {
}
>
<Card bodyStyle={{padding: '5px 24px 15px 24px'}}>
<Circulation innerStatus={info?.innerStatus} outerStatus={info?.outerStatus} innerTaskList={info?.innerTaskList} outerTaskList={info?.outerTaskList}/>
<Circulation innerTaskList={info?.innerTaskList} outerTaskList={info?.outerTaskList}/>
</Card>
<div style={{marginTop: '20px'}}>
......@@ -77,10 +77,10 @@ const Detail: React.FC<{}> = () => {
<Card bodyStyle={{padding: '10px 24px 24px 24px'}}>
<Tabs>
<TabPane tab="收发货统计" key="1">
<WrapTable />
<WrapTable dataSource={[]} />
</TabPane>
<TabPane tab="收发货明细" key="2">
<WrapTable />
<WrapTable dataSource={[]} />
</TabPane>
</Tabs>
</Card>
......
import React, { useState, useEffect } from 'react';
import { Tabs, Steps, Popover } from 'antd';
import React from 'react';
import { Tabs, Steps } from 'antd';
const TabPane = Tabs.TabPane;
const { Step } = Steps;
......@@ -10,50 +10,28 @@ const customDot = (dot, { status, index }) => (
</span>
);
interface Istatus {
isExecute: number,
roleName: string,
step: number,
taskName: string
}
interface Iprops {
innerTaskList: any[],
outerTaskList: any[],
innerStatus: number,
outerStatus: number
innerTaskList: Istatus[],
outerTaskList: Istatus[],
}
const Circulation: React.FC<Iprops> = (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 (
<Tabs defaultActiveKey="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 (
<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) => {
</Steps>
</TabPane>
<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 (
<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} />
)
})
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment