diff --git a/src/utils/workflow/index.ts b/src/utils/workflow/index.ts index cbd8b0b..176bf81 100644 --- a/src/utils/workflow/index.ts +++ b/src/utils/workflow/index.ts @@ -62,8 +62,10 @@ All.prototype = { console.log("setApproverStr---签字解析--->",nodeConfig); if (nodeConfig.settype == 1) { if (nodeConfig.nodeUserList.length == 1) { + nodeConfig.error=false return nodeConfig.nodeUserList[0].name } else if (nodeConfig.nodeUserList.length > 1) { + nodeConfig.error=false if (nodeConfig.examineMode == 1) { return this.arrToStr(nodeConfig.nodeUserList) } else if (nodeConfig.examineMode == 2) { @@ -75,7 +77,7 @@ All.prototype = { // return "指定成员" } } else if (nodeConfig.settype == 2) { - + nodeConfig.error=false let level = nodeConfig.directorLevel == 1 ? '直接主管' : '第' + nodeConfig.directorLevel + '级主管' if (nodeConfig.examineMode == 1) { return level @@ -85,6 +87,7 @@ All.prototype = { return level + + "或签" } } else if (nodeConfig.settype == 3) { + nodeConfig.error=false // console.log("nodeConfig==会签==>",nodeConfig) if (nodeConfig.nodeUserList.length == 1) { return nodeConfig.nodeUserList[0].name @@ -94,9 +97,11 @@ All.prototype = { } else if (nodeConfig.settype == 4) { // console.log("nodeConfig.selectRange",nodeConfig.selectRange,nodeConfig.nodeUserList); if (nodeConfig.selectRange == 1) { + nodeConfig.error=false return "发起人自选" } else { if (nodeConfig.nodeUserList.length > 0) { + nodeConfig.error=false if (nodeConfig.selectRange == 2) { return "发起人从指定成员中自选" } else { @@ -107,15 +112,20 @@ All.prototype = { } } } else if (nodeConfig.settype == 5) { + nodeConfig.error=false return "发起人自己" } else if (nodeConfig.settype == 6) { + nodeConfig.error=false + // console.log("nodeConfig==直接主管==>",nodeConfig) return '从直接主管到通讯录中级别最高的第' + nodeConfig.examineEndDirectorLevel + '个层级主管' }else if (nodeConfig.settype == 7){ + nodeConfig.error=false return "指定前置审批为本节点设置审批人" }else if (nodeConfig.settype == 8){ // console.log("checkedFormList--1111->",nodeConfig) if(nodeConfig.nodeUserList.length > 0){ + nodeConfig.error=false if (nodeConfig.examineMode == 1) { return nodeConfig.nodeUserList[0].name + "依次审批" } else if (nodeConfig.examineMode == 2) { @@ -129,7 +139,7 @@ All.prototype = { console.log("setApproverStr---签字解析--9->",nodeConfig.matrix.list); if(nodeConfig.matrix && nodeConfig.matrix.list){ let strVal = "" - + nodeConfig.error=false if(nodeConfig.matrix.list.length > 0){ nodeConfig.matrix.list.forEach((item:any,inx:number)=>{ if (inx > 0) { @@ -148,6 +158,7 @@ All.prototype = { } }else{ if(nodeConfig.matrix && nodeConfig.matrix.outcomeName){ + nodeConfig.error=false let strVal = nodeConfig.matrix.outcomeName if (nodeConfig.examineMode == 1) { return strVal + "依次审批" @@ -161,6 +172,7 @@ All.prototype = { }else if (nodeConfig.settype == 10){ + nodeConfig.error=false return "指定部门负责人" } }, diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue index 1cd3b2e..4b5ed83 100644 --- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue +++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue @@ -247,7 +247,7 @@ const initWorkFlowData = async () => { processConfig.value.workFlowDef.formKey = appPageKey.value; nodeConfig.value = nodes; flowPermission.value = flowPermissiones; - directorMaxLeveling = levels; + directorMaxLeveling.value = levels; workFlowDef.value = workName; setTableId(tableId); @@ -397,7 +397,7 @@ const gainFlowCont = () => { processConfig.value.workFlowDef.formKey = appPageKey.value; nodeConfig.value = data.data.nodeConfig; flowPermission.value = data.data.flowPermission; - directorMaxLeveling = data.data.directorMaxLevel; + directorMaxLeveling.value = data.data.directorMaxLevel; workFlowDef.value = data.data.workFlowDef; setTableId(data.data.tableId); flowIsTrue.value = true;