|
@@ -97,7 +97,8 @@ function FlowModal(props) {
|
|
|
const updateSteps = async (data, curNodeId) => {
|
|
|
const dataList = [];
|
|
|
for (let i = 0; i < data.length; i++) {
|
|
|
- let curNode = flowDetail.nodes.find(item => item.Id == data[0].template_node_id);
|
|
|
+ let curNode = flowDetail.nodes.find(item => item.Id == data[i].template_node_id);
|
|
|
+ console.log(curNode);
|
|
|
const response = await queryDingInstanceDetail({
|
|
|
process_instance_id: data[i].ding_instance_id, //创建表单成功返回的id
|
|
|
});
|
|
@@ -113,17 +114,18 @@ function FlowModal(props) {
|
|
|
formComponentValues: [],
|
|
|
activityId: '',
|
|
|
cc_userids: [],
|
|
|
- status: version.audit_status,
|
|
|
+ status: 'undefined',
|
|
|
+ name: curNode?.label || itemDataList[0].FlowInfo.name,
|
|
|
};
|
|
|
if (processInstance?.tasks && processInstance.tasks?.length > 0) {
|
|
|
- let item = flowDetail.nodes.find(item => item.Id == version.template_node_id);
|
|
|
- if (!item) return data;
|
|
|
+ // let item = flowDetail.nodes.find(item => item.Id == version.template_node_id);
|
|
|
+ // if (!item) return data;
|
|
|
const { tasks, form_component_values, cc_userids } = processInstance;
|
|
|
data.processCode = curNode.process_code;
|
|
|
data.activityId = tasks[tasks.length - 1]?.activity_id;
|
|
|
data.tasks = tasks || [];
|
|
|
data.cc_userids = cc_userids;
|
|
|
- data.formComponentValues = form_component_values?.filter(item => item.name);
|
|
|
+ data.formComponentValues = form_component_values?.filter(curNode => curNode.name);
|
|
|
}
|
|
|
dataList.push(data);
|
|
|
}
|
|
@@ -261,7 +263,10 @@ function FlowModal(props) {
|
|
|
/>
|
|
|
</div>
|
|
|
{stepsData.map((item, idx) => (
|
|
|
- <AuditFlow {...item} />
|
|
|
+ <div key={`${item.name}_${idx}`} style={{ marginBottom: '20px' }}>
|
|
|
+ <div style={{ margin: '0 0 10px 20px', fontSize: '16px' }}>{item.name}</div>
|
|
|
+ <AuditFlow {...item} />
|
|
|
+ </div>
|
|
|
))}
|
|
|
</Col>
|
|
|
</Row>
|