|
|
@@ -62,32 +62,12 @@ function FlowModal(props) {
|
|
|
data = [...data, arr];
|
|
|
}
|
|
|
});
|
|
|
-
|
|
|
+ data.sort((a,b) => a.id - b.id)
|
|
|
data.forEach((item, id)=>{
|
|
|
//解决key报错问题
|
|
|
data[id].key=`${id}-${item.name}`;
|
|
|
item.isParent = true;
|
|
|
})
|
|
|
-
|
|
|
- // let dataNew = [...nameSet].map(name=>{
|
|
|
- // let list = data.filter(item=>item.version_name == name)
|
|
|
- // if(list.length == 1) {
|
|
|
- // return list[0]
|
|
|
- // }else if(list.filter(item=>!item.version_no).length > 0) {
|
|
|
- // return list.filter(item=>!item.version_no)[0]
|
|
|
- // }else {
|
|
|
- // return list.reduce((a, b)=> a.version_no > b.version_no ? b : a)
|
|
|
- // }
|
|
|
- // })
|
|
|
- // // let dataNew = data.filter(item=>!item.version_no);
|
|
|
- // dataNew.forEach(item=>{
|
|
|
- // let curItem = data.find(node => node.version_name == item.version_name && node.version_id != item.version_id)
|
|
|
- // if(curItem) {
|
|
|
- // curItem.isChild = true;
|
|
|
- // item.children = [curItem]
|
|
|
- // };
|
|
|
- // })
|
|
|
- // setData(dataNew);
|
|
|
setData(data);
|
|
|
} catch (error) {
|
|
|
console.log(error);
|
|
|
@@ -156,7 +136,7 @@ function FlowModal(props) {
|
|
|
},
|
|
|
{
|
|
|
title: '状态',
|
|
|
- width: '20%',
|
|
|
+ width: '30%',
|
|
|
render: item => {
|
|
|
let style = { color: getColor(item) };
|
|
|
let txt = '';
|
|
|
@@ -168,16 +148,16 @@ function FlowModal(props) {
|
|
|
txt = '待审批';
|
|
|
break;
|
|
|
case 2:
|
|
|
- txt = '拒绝';
|
|
|
+ txt = '已拒绝';
|
|
|
break;
|
|
|
case 3:
|
|
|
- txt = '通过';
|
|
|
+ txt = '已通过';
|
|
|
break;
|
|
|
case 4:
|
|
|
txt = '已提交';
|
|
|
break;
|
|
|
}
|
|
|
- if(item.status == 1) txt = '失效';
|
|
|
+ if(item.status == 1) txt = '已失效';
|
|
|
return item.audit_status != 0 ?
|
|
|
<Button onClick={()=>handleChangeClick(item)}>{txt}</Button> :
|
|
|
<span style={style} >{txt}</span>
|
|
|
@@ -194,7 +174,7 @@ function FlowModal(props) {
|
|
|
onClose();
|
|
|
}}
|
|
|
>
|
|
|
- 切换
|
|
|
+ 加载
|
|
|
</a>
|
|
|
),
|
|
|
},
|
