|
@@ -218,7 +218,6 @@ function Detail(props) {
|
|
};
|
|
};
|
|
|
|
|
|
const onCommit = (values, id) => {
|
|
const onCommit = (values, id) => {
|
|
- console.log("=================================", values, id)
|
|
|
|
let currentNode = flowDetail.nodes.find?.(item => item.Id == version.template_node_id);
|
|
let currentNode = flowDetail.nodes.find?.(item => item.Id == version.template_node_id);
|
|
let currentData = sheetRef.current.getSheetJson().data;
|
|
let currentData = sheetRef.current.getSheetJson().data;
|
|
let sheets = JSON.parse(JSON.stringify(currentData));
|
|
let sheets = JSON.parse(JSON.stringify(currentData));
|
|
@@ -332,8 +331,28 @@ function Detail(props) {
|
|
let isSingle = false;
|
|
let isSingle = false;
|
|
let serviceNode;
|
|
let serviceNode;
|
|
const flowNode = flow.currentNode;
|
|
const flowNode = flow.currentNode;
|
|
|
|
+ const getLastTemplateNodeId = (data) => {
|
|
|
|
+ let result;
|
|
|
|
+ const getFun = (item) => {
|
|
|
|
+ if(item.flow_path?.length > 0){
|
|
|
|
+ getFun(item.flow_path[0])
|
|
|
|
+ }else{
|
|
|
|
+ result = item.template_node_id;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ if(!data) return version.template_node_id
|
|
|
|
+ getFun(data[0])
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+ let lastTemplateNodeId = version.template_node_id;
|
|
|
|
+ if(version.flow_path){
|
|
|
|
+ //如果多节点审批 获取当前是否审批流程的最后一个审批节点
|
|
|
|
+ let flowPathList = JSON.parse(version.flow_path)
|
|
|
|
+ lastTemplateNodeId = getLastTemplateNodeId(flowPathList)
|
|
|
|
+ }
|
|
|
|
+
|
|
// 判断是否为最后一个审批节点
|
|
// 判断是否为最后一个审批节点
|
|
- if (flow.current == flow.list.FlowNodes.length - 1) {
|
|
|
|
|
|
+ if (lastTemplateNodeId == version.template_node_id && flow.current == flow.list.FlowNodes.length - 1) {
|
|
serviceNode = flowDetail.nodes.find?.(item => item.Id == version.next_template_node_id);
|
|
serviceNode = flowDetail.nodes.find?.(item => item.Id == version.next_template_node_id);
|
|
if (!serviceNode.muti_version) {
|
|
if (!serviceNode.muti_version) {
|
|
//audit_status=4 表示为清单推进后留存的副本.不计入多清单计算
|
|
//audit_status=4 表示为清单推进后留存的副本.不计入多清单计算
|
|
@@ -542,11 +561,12 @@ function Detail(props) {
|
|
if (!flowDetail?.nodes || !nodeId) return;
|
|
if (!flowDetail?.nodes || !nodeId) return;
|
|
const node = flowDetail.nodes.find(item => item.Id == nodeId);
|
|
const node = flowDetail.nodes.find(item => item.Id == nodeId);
|
|
if(node.name=='custom-circle') return ;
|
|
if(node.name=='custom-circle') return ;
|
|
- if( node?.role_list && node?.role_list.length > 0){
|
|
|
|
|
|
+ if( node?.role_list ){
|
|
return node.role_list.split(",").some(id=> currentUser.roleList?.find(role=>role.ID == id))
|
|
return node.role_list.split(",").some(id=> currentUser.roleList?.find(role=>role.ID == id))
|
|
}
|
|
}
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
|
|
+ console.log("是否有权限提交流转 ", getIsSubmit())
|
|
if(getIsSubmit()) menuList.push(<Menu.Item key="commitAudit">提交流转</Menu.Item>);
|
|
if(getIsSubmit()) menuList.push(<Menu.Item key="commitAudit">提交流转</Menu.Item>);
|
|
|
|
|
|
|
|
|
|
@@ -575,10 +595,12 @@ function Detail(props) {
|
|
|
|
|
|
const renderAlert = () => {
|
|
const renderAlert = () => {
|
|
const audit_comment = history.list[0]?.audit_comment;
|
|
const audit_comment = history.list[0]?.audit_comment;
|
|
- let item = '';
|
|
|
|
|
|
+ let item = '';
|
|
switch (active_audit) {
|
|
switch (active_audit) {
|
|
case 0:
|
|
case 0:
|
|
- return;
|
|
|
|
|
|
+ if (!flow.list || flow.list.FlowNodes?.length == 0) return
|
|
|
|
+ item = <Alert message="审批拒绝" type="error" />;
|
|
|
|
+ break;
|
|
case 1:
|
|
case 1:
|
|
item = <Alert message="等待审核中" type="info" />;
|
|
item = <Alert message="等待审核中" type="info" />;
|
|
break;
|
|
break;
|
|
@@ -596,7 +618,7 @@ function Detail(props) {
|
|
item = <Alert message="审批通过" type="success" />;
|
|
item = <Alert message="审批通过" type="success" />;
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
return <div style={{ marginTop: 20 }}>{item}</div>;
|
|
return <div style={{ marginTop: 20 }}>{item}</div>;
|
|
};
|
|
};
|
|
|
|
|