From 709a912d1f6b0f0843a3aa06eac6c54c98520e07 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Mon, 25 Aug 2025 14:00:38 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-4418)=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=8D=8F=E5=8A=A9=E8=BD=AC=E6=8D=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/utils/BpmnJsonConverterUtil.java | 2 +- .../common/utils/BpmnMetaParserHelper.java | 8 +- .../json/ServiceTaskJsonConverter.java | 14 +- .../BasedIdentityV2TaskAssigneeSelector.java | 4 +- .../src/main/resources/convertorXML.bpmn | 356 ++-- .../src/main/resources/request.json | 1768 +++++++++-------- 6 files changed, 1195 insertions(+), 957 deletions(-) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java index 82bf275a7..d402e0675 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java @@ -846,7 +846,7 @@ public final class BpmnJsonConverterUtil { getSignConfig(bpmnModel.getMainProcess()); BpmnJsonModel bpmnJsonModel = convertToJson(bpmnModel); - FlowElement flowElement = bpmnModel.getFlowElement("node_779068202795_ltht"); + FlowElement flowElement = bpmnModel.getFlowElement("node_865016003134_707l"); Optional initiatorSpecifyRange = getInitiatorSpecifyRange(flowElement); Optional initiatorSpecifiedFilter = getInitiatorSpecifiedFilter(flowElement); Optional> excludeIdentityTypes = getExcludeIdentityTypes(flowElement); diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnMetaParserHelper.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnMetaParserHelper.java index 221a1cc77..ce7016f1b 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnMetaParserHelper.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnMetaParserHelper.java @@ -502,7 +502,7 @@ public final class BpmnMetaParserHelper { public static Optional getApproverSpecifyRange(UserTask userTask) { Optional approverSpecify = getApproverSpecify(userTask); - if (approverSpecify.isPresent() && Objects.equals(approverSpecify.get(), ApproverSpecifyEnum.position_v2)) { + if (approverSpecify.isPresent()) { return defaultValid(userTask, CONFIG_APPROVER_SPECIFY).map(element -> ApproverSpecifyRangeEnum.valueOf(element.getChildElements() .getOrDefault(CONFIG_APPROVE_SPECIFY_RANGE, Collections.emptyList()) .get(0).getAttributeValue(null, ELEMENT_ATTRIBUTE_VALUE))); @@ -519,7 +519,7 @@ public final class BpmnMetaParserHelper { public static Optional getApproverSpecifyRangeOrgLimit(UserTask userTask) { Optional approverSpecify = getApproverSpecify(userTask); - if (approverSpecify.isPresent() && Objects.equals(approverSpecify.get(), ApproverSpecifyEnum.position_v2)) { + if (approverSpecify.isPresent()) { return defaultValid(userTask, CONFIG_APPROVER_SPECIFY).flatMap(element -> element.getChildElements() .getOrDefault(CONFIG_APPROVE_SPECIFY_RANGE_ORG_LIMIT, Collections.emptyList()) .stream() @@ -538,7 +538,7 @@ public final class BpmnMetaParserHelper { public static Optional getCooperateShipType(UserTask userTask) { Optional approverSpecify = getApproverSpecify(userTask); - if (approverSpecify.isPresent() && Objects.equals(approverSpecify.get(), ApproverSpecifyEnum.position_v2)) { + if (approverSpecify.isPresent()) { return defaultValid(userTask, CONFIG_APPROVER_SPECIFY).flatMap(element -> element.getChildElements() .getOrDefault(CONFIG_APPROVE_SPECIFY_COOPERATE_TYPE, Collections.emptyList()) .stream() @@ -557,7 +557,7 @@ public final class BpmnMetaParserHelper { public static Optional getApproverSpecifyRangeUnit(UserTask userTask) { Optional approverSpecify = getApproverSpecify(userTask); - if (approverSpecify.isPresent() && Objects.equals(approverSpecify.get(), ApproverSpecifyEnum.position_v2)) { + if (approverSpecify.isPresent()) { return defaultValid(userTask, CONFIG_APPROVER_SPECIFY).flatMap(element -> element.getChildElements() .getOrDefault(CONFIG_APPROVE_SPECIFY_RANGE_UNIT, Collections.emptyList()) .stream() diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/ServiceTaskJsonConverter.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/ServiceTaskJsonConverter.java index 6d302e4d0..75168673d 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/ServiceTaskJsonConverter.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/ServiceTaskJsonConverter.java @@ -16,8 +16,6 @@ import java.util.List; import java.util.Objects; import static cn.axzo.workflow.common.code.ConvertorRespCode.CONVERTOR_COMMON_ERROR; -import static cn.axzo.workflow.common.constant.BpmnConstants.CONFIG_APPROVAL_METHOD; -import static cn.axzo.workflow.common.constant.BpmnConstants.CONFIG_APPROVER_SCOPE; import static cn.axzo.workflow.common.constant.BpmnConstants.CONFIG_APPROVER_SPECIFY; import static cn.axzo.workflow.common.constant.BpmnConstants.CONFIG_APPROVE_SPECIFY_COOPERATE_TYPE; import static cn.axzo.workflow.common.constant.BpmnConstants.CONFIG_APPROVE_SPECIFY_RANGE; @@ -236,15 +234,15 @@ public class ServiceTaskJsonConverter extends AbstractBpmnJsonConverter select(FlowElement flowElement, DelegateExecution execution, Boolean throwException) { Optional optRange = getApproverSpecifyRange(flowElement); if (!optRange.isPresent()) { - throw new WorkflowEngineException(ENGINE_ROLE_V2_CONFIG_INVALID, "级联配置", flowElement.getId()); + throw new WorkflowEngineException(ENGINE_IDENTITY_V2_CONFIG_INVALID, "级联配置", flowElement.getId()); } CooperationOrgDTO orgDTO = (CooperationOrgDTO) execution.getVariables().get(BIZ_ORG_RELATION); diff --git a/workflow-engine-server/src/main/resources/convertorXML.bpmn b/workflow-engine-server/src/main/resources/convertorXML.bpmn index ac9993283..913b6a525 100644 --- a/workflow-engine-server/src/main/resources/convertorXML.bpmn +++ b/workflow-engine-server/src/main/resources/convertorXML.bpmn @@ -1,6 +1,12 @@ - - + + remark @@ -12,7 +18,8 @@ - + + @@ -20,42 +27,54 @@ - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + + + @@ -69,191 +88,270 @@ - - + + - + - - - - + + + - + - - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - + + - + + - - ${nrOfInstances == nrOfCompletedInstances} + + ${nrOfInstances != nrOfActiveInstances} - - + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + - - - - + + - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - + + + - - ${nrOfInstances == nrOfCompletedInstances} + + ${nrOfInstances != nrOfActiveInstances} - - + + - - - + + + + + + - + + + + - - - - + + + + + + + - - - - - + + + + + + + + + + + - + - - - - - - \ No newline at end of file diff --git a/workflow-engine-server/src/main/resources/request.json b/workflow-engine-server/src/main/resources/request.json index c634a802d..fc14e0a30 100644 --- a/workflow-engine-server/src/main/resources/request.json +++ b/workflow-engine-server/src/main/resources/request.json @@ -1,6 +1,6 @@ { - "name": "新的模板", - "category": "we2", + "name": "测试项目新版本入参", + "category": "projNewConfig", "remark": "", "workspaceId": null, "jsonModel": { @@ -10,59 +10,542 @@ "type": "NODE_STARTER", "name": "发起人", "children": { - "id": "node_779068202795_ltht", + "id": "node_864990574287_ylc5", "parentId": "NODE_STARTER", - "property": { - "approverSpecify": "position_v2", - "approverSpecifyRange": "specified_org", - "approverSpecifyRangeOrgLimit": "LV_0", - "approverSpecifyRangeUnit": "in_project", -// "initiatorSpecifiedFilter": true, -// "excludeIdentityTypes": ["1", "2"], -// "excludeCooperateShipTypes": ["3","4"], - "areaFilterEnable":true, - "specialtyFilterEnable":true, - "approvalMethod": "human", - "multiMode": "AND", - "sign": false, - "approverEmptyHandleType": "autoPassed", - "nobody": { - "handler": "TO_PASS", - "assignedUser": [] - }, - "timeLimit": { - "timeout": { - "unit": "H", - "value": 0 + "type": "NODE_TASK", + "name": "审批节点", + "children": { + "id": "node_865038288523_ff8k", + "parentId": "node_864990574287_ylc5", + "type": "NODE_CARBON_COPY", + "name": "抄送节点", + "children": { + "id": "node_865016003134_707l", + "parentId": "node_865038288523_ff8k", + "type": "NODE_BUSINESS", + "name": "业务节点", + "children": { + "id": null, + "parentId": null, + "type": null, + "name": null, + "children": null, + "branches": null, + "property": null }, - "handler": { - "type": "REFUSE", - "notify": { - "once": true, - "hour": 1 - } + "branches": null, + "property": { + "approvalMethod": "human", + "approverScope": "entWorkspace", + "approverSpecify": "identity_v2", + "approverSpecifyRange": "pre_node_approver", + "cooperateShipType": null, + "approverSpecifyRangeOrgLimit": "LV_1", + "approverSpecifyRangeUnit": null, + "initiatorSpecifyRange": null, + "initiatorSpecifiedFilter": false, + "excludeIdentityTypes": [], + "excludeCooperateShipTypes": [], + "signApproverLimit": { + "orgLimit": "LV_0", + "roleLimit": "LEADER" + }, + "specifyValue": "[{\"name\":\"劳务分包负责人(项目内)\",\"value\":\"PROJ_LABOR_SUBCONTRACTING_SUPERVISOR\"},{\"name\":\"劳务分包企业管理员(单位内)\",\"value\":\"PROJ_LABOR_SUBCONTRACTING_ENT_SUPER_ADMIN\"}]", + "isMultiTask": true, + "isSequential": false, + "multiMode": "OR", + "approverEmptyHandleType": "transferToAdmin", + "emptyApproverSpecify": "", + "signature": null, + "upgradeApprovalConf": { + "enabled": false, + "orgLimit": "LV_1", + "approverSpecify": "position", + "specifyValue": "" + }, + "buttonPermission": { + "initiator": [ + { + "order": 1, + "btnKey": "BPMN_APPROVE", + "btnName": "同意", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 2, + "btnKey": "BPMN_REJECT", + "btnName": "驳回", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 5, + "btnKey": "BPMN_REVOCATION", + "btnName": "撤回", + "checked": true, + "disabled": false, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 6, + "btnKey": "BPMN_TRANSFER", + "btnName": "转交", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 7, + "btnKey": "BPMN_COUNTERSIGN", + "btnName": "加签", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 8, + "btnKey": "BPMN_COMMENT", + "btnName": "评论", + "checked": true, + "disabled": false, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 9, + "btnKey": "BPMN_ROLLBACK", + "btnName": "回退", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 10, + "btnKey": "BPMN_COPY", + "btnName": "抄送", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 12, + "btnKey": "BPMN_UPGRADE", + "btnName": "提级审批", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 11, + "btnKey": "BPMN_REMIND", + "btnName": "催办", + "checked": true, + "disabled": false, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + } + ], + "current": [ + { + "order": 1, + "btnKey": "BPMN_APPROVE", + "btnName": "同意", + "checked": true, + "disabled": false, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 2, + "btnKey": "BPMN_REJECT", + "btnName": "驳回", + "checked": true, + "disabled": false, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 5, + "btnKey": "BPMN_REVOCATION", + "btnName": "撤回", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 6, + "btnKey": "BPMN_TRANSFER", + "btnName": "转交", + "checked": true, + "disabled": false, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 7, + "btnKey": "BPMN_COUNTERSIGN", + "btnName": "加签", + "checked": true, + "disabled": false, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 8, + "btnKey": "BPMN_COMMENT", + "btnName": "评论", + "checked": true, + "disabled": false, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 9, + "btnKey": "BPMN_ROLLBACK", + "btnName": "回退", + "checked": false, + "disabled": false, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 10, + "btnKey": "BPMN_COPY", + "btnName": "抄送", + "checked": true, + "disabled": false, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 12, + "btnKey": "BPMN_UPGRADE", + "btnName": "提级审批", + "checked": true, + "disabled": false, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 11, + "btnKey": "BPMN_REMIND", + "btnName": "催办", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + } + ], + "history": [ + { + "order": 1, + "btnKey": "BPMN_APPROVE", + "btnName": "同意", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 2, + "btnKey": "BPMN_REJECT", + "btnName": "驳回", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 5, + "btnKey": "BPMN_REVOCATION", + "btnName": "撤回", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 6, + "btnKey": "BPMN_TRANSFER", + "btnName": "转交", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 7, + "btnKey": "BPMN_COUNTERSIGN", + "btnName": "加签", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 8, + "btnKey": "BPMN_COMMENT", + "btnName": "评论", + "checked": true, + "disabled": false, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 9, + "btnKey": "BPMN_ROLLBACK", + "btnName": "回退", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 10, + "btnKey": "BPMN_COPY", + "btnName": "抄送", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 12, + "btnKey": "BPMN_UPGRADE", + "btnName": "提级审批", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 11, + "btnKey": "BPMN_REMIND", + "btnName": "催办", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + } + ], + "carbonCopy": [ + { + "order": 1, + "btnKey": "BPMN_APPROVE", + "btnName": "同意", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 2, + "btnKey": "BPMN_REJECT", + "btnName": "驳回", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 5, + "btnKey": "BPMN_REVOCATION", + "btnName": "撤回", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 6, + "btnKey": "BPMN_TRANSFER", + "btnName": "转交", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 7, + "btnKey": "BPMN_COUNTERSIGN", + "btnName": "加签", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 8, + "btnKey": "BPMN_COMMENT", + "btnName": "评论", + "checked": true, + "disabled": false, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 9, + "btnKey": "BPMN_ROLLBACK", + "btnName": "回退", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 10, + "btnKey": "BPMN_COPY", + "btnName": "抄送", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 12, + "btnKey": "BPMN_UPGRADE", + "btnName": "提级审批", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 11, + "btnKey": "BPMN_REMIND", + "btnName": "催办", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + } + ] + }, + "pending": null, + "defaultBranch": null, + "groups": null, + "groupsType": "or", + "carbonCopyConf": null, + "fieldPermission": [], + "areaFilterEnable": null, + "specialtyFilterEnable": null } }, - "assignedUser": [], - "formPerms": [], - "selfSelect": { - "multiple": false + "branches": null, + "property": { + "approvalMethod": null, + "approverScope": null, + "approverSpecify": "role_v2", + "approverSpecifyRange": "within_the_project_construction_units", + "cooperateShipType": "PROJ_PRIMARY_CONTRACTING_UNIT", + "approverSpecifyRangeOrgLimit": null, + "approverSpecifyRangeUnit": "in_ent", + "initiatorSpecifyRange": null, + "initiatorSpecifiedFilter": false, + "excludeIdentityTypes": [], + "excludeCooperateShipTypes": [], + "signApproverLimit": null, + "specifyValue": "[{\"name\":\"其他\",\"value\":101357,\"type\":7},{\"name\":\"首页-待删除\",\"value\":101289,\"type\":7},{\"name\":\"班组管理(劳资)\",\"value\":101290,\"type\":7},{\"name\":\"人员管理-T\",\"value\":101291,\"type\":7},{\"name\":\"查看企业通讯录\",\"value\":101292,\"type\":7},{\"name\":\"部门管理-T\",\"value\":101293,\"type\":7},{\"name\":\"班组管理\",\"value\":101294,\"type\":7},{\"name\":\"岗位权限管理-T\",\"value\":101295,\"type\":7},{\"name\":\"编辑工程-待删除\",\"value\":101296,\"type\":7},{\"name\":\"查看工程\",\"value\":101297,\"type\":7},{\"name\":\"申请工程完结-待删除\",\"value\":101356,\"type\":7},{\"name\":\"发薪账户管理\",\"value\":101298,\"type\":7},{\"name\":\"查看发薪报表-T\",\"value\":101299,\"type\":7},{\"name\":\"招工\",\"value\":101300,\"type\":7}]", + "isMultiTask": true, + "isSequential": false, + "multiMode": null, + "approverEmptyHandleType": null, + "emptyApproverSpecify": null, + "signature": null, + "upgradeApprovalConf": null, + "buttonPermission": null, + "pending": null, + "defaultBranch": null, + "groups": null, + "groupsType": "or", + "carbonCopyConf": [], + "fieldPermission": [], + "areaFilterEnable": null, + "specialtyFilterEnable": null + } + }, + "branches": null, + "property": { + "approvalMethod": "human", + "approverScope": "entWorkspace", + "approverSpecify": "position_v2", + "approverSpecifyRange": "within_the_project", + "cooperateShipType": null, + "approverSpecifyRangeOrgLimit": null, + "approverSpecifyRangeUnit": null, + "initiatorSpecifyRange": null, + "initiatorSpecifiedFilter": null, + "excludeIdentityTypes": null, + "excludeCooperateShipTypes": null, + "signApproverLimit": { + "orgLimit": "LV_0", + "roleLimit": "LEADER" }, - "leaderTop": { - "endCondition": "TOP", - "endLevel": 1 + "specifyValue": "[{\"name\":\"总包/职员\",\"value\":\"coother\",\"type\":1},{\"name\":\"劳务分包/职员\",\"value\":\"lsother\",\"type\":4},{\"name\":\"劳务分包/预算员\",\"value\":\"lsBudgetmember\",\"type\":4},{\"name\":\"劳务分包/施工员\",\"value\":\"lsThebuilder\",\"type\":4},{\"name\":\"专业分包/职员\",\"value\":\"psother\",\"type\":5},{\"name\":\"专业分包/安全部部长\",\"value\":\"psSecuritychief\",\"type\":5},{\"name\":\"专业分包/施工员\",\"value\":\"psThebuilder\",\"type\":5},{\"name\":\"项目班组/小组长\",\"value\":\"projectTeamGPLeader\",\"type\":9}]", + "isMultiTask": true, + "isSequential": false, + "multiMode": "OR", + "approverEmptyHandleType": "autoPassed", + "emptyApproverSpecify": "", + "signature": null, + "upgradeApprovalConf": { + "enabled": false, + "orgLimit": "LV_1", + "approverSpecify": "position", + "specifyValue": "" }, - "leader": { - "level": 1 - }, - "role": [], - "position": [], - "specifyValue": "[{\"name\":\"总包/职员\",\"value\":\"coother\",\"type\":1}]", - "refuse": { - "type": "TO_END", - "target": "" - }, - "formUser": "", "buttonPermission": { "initiator": [ { @@ -71,7 +554,9 @@ "btnName": "同意", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { "order": 2, @@ -79,55 +564,89 @@ "btnName": "驳回", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 3, + "order": 5, "btnKey": "BPMN_REVOCATION", "btnName": "撤回", "checked": true, "disabled": false, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 4, + "order": 6, "btnKey": "BPMN_TRANSFER", "btnName": "转交", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 5, + "order": 7, "btnKey": "BPMN_COUNTERSIGN", "btnName": "加签", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 6, + "order": 8, "btnKey": "BPMN_COMMENT", "btnName": "评论", "checked": true, "disabled": false, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 7, + "order": 9, "btnKey": "BPMN_ROLLBACK", "btnName": "回退", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 8, + "order": 10, "btnKey": "BPMN_COPY", "btnName": "抄送", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 12, + "btnKey": "BPMN_UPGRADE", + "btnName": "提级审批", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 11, + "btnKey": "BPMN_REMIND", + "btnName": "催办", + "checked": true, + "disabled": false, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] } ], "current": [ @@ -137,7 +656,9 @@ "btnName": "同意", "checked": true, "disabled": false, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { "order": 2, @@ -145,55 +666,89 @@ "btnName": "驳回", "checked": true, "disabled": false, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 3, + "order": 5, "btnKey": "BPMN_REVOCATION", "btnName": "撤回", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 4, + "order": 6, "btnKey": "BPMN_TRANSFER", "btnName": "转交", "checked": true, "disabled": false, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 5, + "order": 7, "btnKey": "BPMN_COUNTERSIGN", "btnName": "加签", "checked": true, "disabled": false, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 6, + "order": 8, "btnKey": "BPMN_COMMENT", "btnName": "评论", "checked": true, "disabled": false, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 7, + "order": 9, "btnKey": "BPMN_ROLLBACK", "btnName": "回退", "checked": false, "disabled": false, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 8, + "order": 10, "btnKey": "BPMN_COPY", "btnName": "抄送", "checked": true, "disabled": false, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 12, + "btnKey": "BPMN_UPGRADE", + "btnName": "提级审批", + "checked": true, + "disabled": false, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 11, + "btnKey": "BPMN_REMIND", + "btnName": "催办", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] } ], "history": [ @@ -203,7 +758,9 @@ "btnName": "同意", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { "order": 2, @@ -211,55 +768,89 @@ "btnName": "驳回", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 3, + "order": 5, "btnKey": "BPMN_REVOCATION", "btnName": "撤回", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 4, + "order": 6, "btnKey": "BPMN_TRANSFER", "btnName": "转交", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 5, + "order": 7, "btnKey": "BPMN_COUNTERSIGN", "btnName": "加签", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 6, + "order": 8, "btnKey": "BPMN_COMMENT", "btnName": "评论", "checked": true, "disabled": false, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 7, + "order": 9, "btnKey": "BPMN_ROLLBACK", "btnName": "回退", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 8, + "order": 10, "btnKey": "BPMN_COPY", "btnName": "抄送", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 12, + "btnKey": "BPMN_UPGRADE", + "btnName": "提级审批", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 11, + "btnKey": "BPMN_REMIND", + "btnName": "催办", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] } ], "carbonCopy": [ @@ -269,7 +860,9 @@ "btnName": "同意", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { "order": 2, @@ -277,561 +870,100 @@ "btnName": "驳回", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 3, + "order": 5, "btnKey": "BPMN_REVOCATION", "btnName": "撤回", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 4, + "order": 6, "btnKey": "BPMN_TRANSFER", "btnName": "转交", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 5, + "order": 7, "btnKey": "BPMN_COUNTERSIGN", "btnName": "加签", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 6, + "order": 8, "btnKey": "BPMN_COMMENT", "btnName": "评论", "checked": true, "disabled": false, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 7, + "order": 9, "btnKey": "BPMN_ROLLBACK", "btnName": "回退", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 8, + "order": 10, "btnKey": "BPMN_COPY", "btnName": "抄送", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 12, + "btnKey": "BPMN_UPGRADE", + "btnName": "提级审批", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 11, + "btnKey": "BPMN_REMIND", + "btnName": "催办", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] } ] }, - "approverScope": "projectWorkspace", - "fieldPermission": [ - { - "fieldId": "field1", - "fieldName": "字典 1", - "required": false, - "editable": false, - "readonly": true, - "hidden": false, - "value": "readonly" - }, - { - "fieldId": "attachment", - "fieldName": "附件", - "required": false, - "editable": false, - "readonly": true, - "hidden": false, - "value": "readonly" - }, - { - "fieldId": "textarea1", - "fieldName": "多行文本", - "required": false, - "editable": false, - "readonly": true, - "hidden": false, - "value": "readonly" - }, - { - "fieldId": "images", - "fieldName": "图片", - "required": false, - "editable": false, - "readonly": true, - "hidden": false, - "value": "readonly" - }, - { - "fieldId": "custom_component1", - "fieldName": "自定义组件", - "required": false, - "editable": false, - "readonly": true, - "hidden": false, - "value": "readonly" - }, - { - "fieldId": "taskOrder1", - "fieldName": "任务单", - "required": false, - "editable": false, - "readonly": true, - "hidden": false, - "value": "readonly" - } - ], - "signApproverLimit": { - "orgLimit": "LV_0", - "roleLimit": "LEADER" - }, - "upgradeApprovalConf": { - "enabled": false, - "orgLimit": "LV_1", - "approverSpecify": "position", - "specifyValue": "" - } - }, - "type": "NODE_TASK", - "name": "审批节点", - "children": { - "id": "node_204162242163", - "parentId": "node_779068202795_ltht", - "type": "NODE_SIGN", - "name": "审批节点", - "children": { - "id": null, - "parentId": null, - "type": null, - "name": null, - "children": null, - "branches": null, - "property": null - }, - "branches": null, - "property": { - "approvalMethod": "human", - "approverScope": "projectWorkspace", - "approverSpecify": "position_v2", - "approverSpecifyRange": "within_the_project", - "cooperateShipType": null, - "approverSpecifyRangeOrgLimit": null, - "approverSpecifyRangeUnit": null, - "initiatorSpecifyRange": null, - "excludeIdentityTypes": null, - "excludeCooperateShipTypes": null, - "signApproverLimit": { - "orgLimit": "LV_0", - "roleLimit": "LEADER" - }, - "specifyValue": "", - "isMultiTask": true, - "isSequential": false, - "multiMode": "AND", - "approverEmptyHandleType": "autoPassed", - "emptyApproverSpecify": null, - "signature": true, - "upgradeApprovalConf": null, - "buttonPermission": { - "initiator": [ - { - "order": 1, - "btnKey": "BPMN_APPROVE", - "btnName": "同意", - "checked": false, - "disabled": true, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 2, - "btnKey": "BPMN_REJECT", - "btnName": "驳回", - "checked": false, - "disabled": true, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 3, - "btnKey": "BPMN_REVOCATION", - "btnName": "撤回", - "checked": true, - "disabled": false, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 4, - "btnKey": "BPMN_TRANSFER", - "btnName": "转交", - "checked": false, - "disabled": true, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 5, - "btnKey": "BPMN_COUNTERSIGN", - "btnName": "加签", - "checked": false, - "disabled": true, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 6, - "btnKey": "BPMN_COMMENT", - "btnName": "评论", - "checked": true, - "disabled": false, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 7, - "btnKey": "BPMN_ROLLBACK", - "btnName": "回退", - "checked": false, - "disabled": true, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 8, - "btnKey": "BPMN_COPY", - "btnName": "抄送", - "checked": false, - "disabled": true, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - } - ], - "current": [ - { - "order": 1, - "btnKey": "BPMN_APPROVE", - "btnName": "同意", - "checked": true, - "disabled": false, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 2, - "btnKey": "BPMN_REJECT", - "btnName": "驳回", - "checked": true, - "disabled": false, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 3, - "btnKey": "BPMN_REVOCATION", - "btnName": "撤回", - "checked": false, - "disabled": true, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 4, - "btnKey": "BPMN_TRANSFER", - "btnName": "转交", - "checked": true, - "disabled": false, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 5, - "btnKey": "BPMN_COUNTERSIGN", - "btnName": "加签", - "checked": true, - "disabled": false, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 6, - "btnKey": "BPMN_COMMENT", - "btnName": "评论", - "checked": true, - "disabled": false, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 7, - "btnKey": "BPMN_ROLLBACK", - "btnName": "回退", - "checked": false, - "disabled": false, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 8, - "btnKey": "BPMN_COPY", - "btnName": "抄送", - "checked": true, - "disabled": false, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - } - ], - "history": [ - { - "order": 1, - "btnKey": "BPMN_APPROVE", - "btnName": "同意", - "checked": false, - "disabled": true, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 2, - "btnKey": "BPMN_REJECT", - "btnName": "驳回", - "checked": false, - "disabled": true, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 3, - "btnKey": "BPMN_REVOCATION", - "btnName": "撤回", - "checked": false, - "disabled": true, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 4, - "btnKey": "BPMN_TRANSFER", - "btnName": "转交", - "checked": false, - "disabled": true, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 5, - "btnKey": "BPMN_COUNTERSIGN", - "btnName": "加签", - "checked": false, - "disabled": true, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 6, - "btnKey": "BPMN_COMMENT", - "btnName": "评论", - "checked": true, - "disabled": false, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 7, - "btnKey": "BPMN_ROLLBACK", - "btnName": "回退", - "checked": false, - "disabled": true, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 8, - "btnKey": "BPMN_COPY", - "btnName": "抄送", - "checked": false, - "disabled": true, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - } - ], - "carbonCopy": [ - { - "order": 1, - "btnKey": "BPMN_APPROVE", - "btnName": "同意", - "checked": false, - "disabled": true, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 2, - "btnKey": "BPMN_REJECT", - "btnName": "驳回", - "checked": false, - "disabled": true, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 3, - "btnKey": "BPMN_REVOCATION", - "btnName": "撤回", - "checked": false, - "disabled": true, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 4, - "btnKey": "BPMN_TRANSFER", - "btnName": "转交", - "checked": false, - "disabled": true, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 5, - "btnKey": "BPMN_COUNTERSIGN", - "btnName": "加签", - "checked": false, - "disabled": true, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 6, - "btnKey": "BPMN_COMMENT", - "btnName": "评论", - "checked": true, - "disabled": false, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 7, - "btnKey": "BPMN_ROLLBACK", - "btnName": "回退", - "checked": false, - "disabled": true, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - }, - { - "order": 8, - "btnKey": "BPMN_COPY", - "btnName": "抄送", - "checked": false, - "disabled": true, - "hidden": false, - "type": "SYSTEM", - "supportBizType": [] - } - ] - }, - "pending": null, - "defaultBranch": null, - "groups": null, - "groupsType": "or", - "carbonCopyConf": null, - "fieldPermission": [ - { - "fieldId": "field1", - "fieldName": "字典 1", - "required": false, - "editable": true, - "readonly": false, - "hidden": false, - "value": "editable" - }, - { - "fieldId": "attachment", - "fieldName": "附件", - "required": false, - "editable": true, - "readonly": false, - "hidden": false, - "value": "editable" - }, - { - "fieldId": "textarea1", - "fieldName": "多行文本", - "required": false, - "editable": true, - "readonly": false, - "hidden": false, - "value": "editable" - }, - { - "fieldId": "images", - "fieldName": "图片", - "required": false, - "editable": true, - "readonly": false, - "hidden": false, - "value": "editable" - }, - { - "fieldId": "custom_component1", - "fieldName": "自定义组件", - "required": false, - "editable": true, - "readonly": false, - "hidden": false, - "value": "editable" - }, - { - "fieldId": "taskOrder1", - "fieldName": "任务单", - "required": false, - "editable": true, - "readonly": false, - "hidden": false, - "value": "editable" - } - ], - "areaFilterEnable": null, - "specialtyFilterEnable": null, - "initiatorSpecifiedFilter": null - } + "pending": null, + "defaultBranch": null, + "groups": null, + "groupsType": "or", + "carbonCopyConf": null, + "fieldPermission": [], + "areaFilterEnable": null, + "specialtyFilterEnable": null } }, "branches": null, @@ -844,6 +976,7 @@ "approverSpecifyRangeOrgLimit": null, "approverSpecifyRangeUnit": null, "initiatorSpecifyRange": null, + "initiatorSpecifiedFilter": null, "excludeIdentityTypes": null, "excludeCooperateShipTypes": null, "signApproverLimit": null, @@ -863,14 +996,14 @@ "carbonCopyConf": null, "fieldPermission": [], "areaFilterEnable": null, - "specialtyFilterEnable": null, - "initiatorSpecifiedFilter": null + "specialtyFilterEnable": null } }, "signConf": { + "signType": null, "signPendingProperty": { "pendingMessageId": "", - "viewJson": "" + "viewJson": null } }, "noticeConf": { @@ -897,20 +1030,19 @@ "assigners": { "selected": false, "viewJson": null - }, - "notifyObject": [] + } }, "pending": { - "pendingMessageId": "5c1b028f1ccd495ebfd9bdb66691d092", - "viewJson": "{\"templateName\":\"管理人员加入单位(新)\",\"templateCode\":\"5c1b028f1ccd495ebfd9bdb66691d092\",\"category\":\"APPROVAL_PENDING_MESSAGE\",\"title\":\"人员申请加入单位\",\"content\":\"${personName},申请加入${workspace},请尽快审批!\",\"groupNodeNamePaths\":[],\"status\":\"ENABLE\",\"createPersonId\":290607,\"createPersonName\":\"张鹏辉\",\"updatePersonId\":290607,\"updatePersonName\":\"张鹏辉\",\"styleType\":{\"code\":\"FLOW_COMMON\",\"category\":\"APPROVAL_PENDING_MESSAGE\",\"name\":\"样式2001(审批详情页通用样式)\",\"url\":null},\"pushData\":{\"switchOn\":false,\"ability\":[],\"type\":\"\",\"voiceType\":\"\"}}" - }, - "sms": { - "smsId": "", - "viewJson": null + "pendingMessageId": "306f58976da64bf18042bd3ca94df977", + "viewJson": "{\"templateName\":\"项目批量导入工人\",\"templateCode\":\"306f58976da64bf18042bd3ca94df977\",\"category\":\"APPROVAL_PENDING_MESSAGE\",\"title\":\"批量导入工人\",\"content\":\"${operatorName}对${workspaceName}批量导入工人,请知悉!\",\"groupNodeNamePaths\":[],\"status\":\"ENABLE\",\"createPersonId\":86109,\"createPersonName\":\"张弘昊\",\"updatePersonId\":86109,\"updatePersonName\":\"张弘昊\",\"styleType\":{\"code\":\"FLOW_COMMON\",\"category\":\"APPROVAL_PENDING_MESSAGE\",\"name\":\"样式2001(审批详情页通用样式)\",\"url\":null},\"pushData\":{\"switchOn\":false,\"ability\":[],\"type\":\"\",\"voiceType\":\"\"}}" }, "carbonCopy": { "carbonCopyMessageId": "8733f93de8db49699a78eda5a342763c", "viewJson": "{\"templateName\":\"审批流抄送通用模板\",\"templateCode\":\"8733f93de8db49699a78eda5a342763c\"}" + }, + "sms": { + "smsId": "", + "viewJson": null } }, "buttonConf": { @@ -921,7 +1053,9 @@ "btnName": "同意", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { "order": 2, @@ -929,55 +1063,89 @@ "btnName": "驳回", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 3, + "order": 5, "btnKey": "BPMN_REVOCATION", "btnName": "撤回", "checked": true, "disabled": false, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 4, + "order": 6, "btnKey": "BPMN_TRANSFER", "btnName": "转交", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 5, + "order": 7, "btnKey": "BPMN_COUNTERSIGN", "btnName": "加签", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 6, + "order": 8, "btnKey": "BPMN_COMMENT", "btnName": "评论", "checked": true, "disabled": false, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 7, + "order": 9, "btnKey": "BPMN_ROLLBACK", "btnName": "回退", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 8, + "order": 10, "btnKey": "BPMN_COPY", "btnName": "抄送", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 12, + "btnKey": "BPMN_UPGRADE", + "btnName": "提级审批", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 11, + "btnKey": "BPMN_REMIND", + "btnName": "催办", + "checked": true, + "disabled": false, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] } ], "current": [ @@ -987,7 +1155,9 @@ "btnName": "同意", "checked": true, "disabled": false, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { "order": 2, @@ -995,55 +1165,89 @@ "btnName": "驳回", "checked": true, "disabled": false, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 3, + "order": 5, "btnKey": "BPMN_REVOCATION", "btnName": "撤回", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 4, + "order": 6, "btnKey": "BPMN_TRANSFER", "btnName": "转交", "checked": true, "disabled": false, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 5, + "order": 7, "btnKey": "BPMN_COUNTERSIGN", "btnName": "加签", "checked": true, "disabled": false, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 6, + "order": 8, "btnKey": "BPMN_COMMENT", "btnName": "评论", "checked": true, "disabled": false, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 7, + "order": 9, "btnKey": "BPMN_ROLLBACK", "btnName": "回退", "checked": false, "disabled": false, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 8, + "order": 10, "btnKey": "BPMN_COPY", "btnName": "抄送", "checked": true, "disabled": false, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 12, + "btnKey": "BPMN_UPGRADE", + "btnName": "提级审批", + "checked": true, + "disabled": false, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 11, + "btnKey": "BPMN_REMIND", + "btnName": "催办", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] } ], "history": [ @@ -1053,7 +1257,9 @@ "btnName": "同意", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { "order": 2, @@ -1061,55 +1267,89 @@ "btnName": "驳回", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 3, + "order": 5, "btnKey": "BPMN_REVOCATION", "btnName": "撤回", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 4, + "order": 6, "btnKey": "BPMN_TRANSFER", "btnName": "转交", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 5, + "order": 7, "btnKey": "BPMN_COUNTERSIGN", "btnName": "加签", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 6, + "order": 8, "btnKey": "BPMN_COMMENT", "btnName": "评论", "checked": true, "disabled": false, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 7, + "order": 9, "btnKey": "BPMN_ROLLBACK", "btnName": "回退", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 8, + "order": 10, "btnKey": "BPMN_COPY", "btnName": "抄送", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 12, + "btnKey": "BPMN_UPGRADE", + "btnName": "提级审批", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 11, + "btnKey": "BPMN_REMIND", + "btnName": "催办", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] } ], "carbonCopy": [ @@ -1119,7 +1359,9 @@ "btnName": "同意", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { "order": 2, @@ -1127,55 +1369,89 @@ "btnName": "驳回", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 3, + "order": 5, "btnKey": "BPMN_REVOCATION", "btnName": "撤回", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 4, + "order": 6, "btnKey": "BPMN_TRANSFER", "btnName": "转交", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 5, + "order": 7, "btnKey": "BPMN_COUNTERSIGN", "btnName": "加签", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 6, + "order": 8, "btnKey": "BPMN_COMMENT", "btnName": "评论", "checked": true, "disabled": false, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 7, + "order": 9, "btnKey": "BPMN_ROLLBACK", "btnName": "回退", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] }, { - "order": 8, + "order": 10, "btnKey": "BPMN_COPY", "btnName": "抄送", "checked": false, "disabled": true, - "type": "SYSTEM" + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 12, + "btnKey": "BPMN_UPGRADE", + "btnName": "提级审批", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] + }, + { + "order": 11, + "btnKey": "BPMN_REMIND", + "btnName": "催办", + "checked": false, + "disabled": true, + "hidden": false, + "type": "SYSTEM", + "supportBizType": [] } ] }, @@ -1186,145 +1462,7 @@ "autoApprovalType": "NO_AUTO_APPROVAL" } }, - "formFields": [ - { - "fieldType": "FormContainer", - "type": "div", - "id": "group_071287566026", - "name": "分组名称1", - "value": null, - "placeholder": null, - "params": null, - "fields": [ - [ - { - "fieldType": "FormField", - "type": "input", - "id": "field1", - "name": "字典 1", - "value": null, - "placeholder": null, - "params": { - "defaultValue": "" - }, - "fields": null - }, - { - "fieldType": "FormField", - "type": "upload", - "id": "attachment", - "name": "附件", - "value": null, - "placeholder": null, - "params": { - "defaultValue": "" - }, - "fields": null - } - ] - ] - }, - { - "fieldType": "FormContainer", - "type": "div", - "id": "group_071461235738", - "name": "分组名称 2", - "value": null, - "placeholder": null, - "params": null, - "fields": [ - [ - { - "fieldType": "FormField", - "type": "textarea", - "id": "textarea1", - "name": "多行文本", - "value": null, - "placeholder": null, - "params": { - "defaultValue": "" - }, - "fields": null - }, - { - "fieldType": "FormField", - "type": "image", - "id": "images", - "name": "图片", - "value": null, - "placeholder": null, - "params": { - "defaultValue": "" - }, - "fields": null - }, - { - "fieldType": "FormContainer", - "type": "customComponent", - "id": "custom_component1", - "name": "自定义组件", - "value": null, - "placeholder": null, - "params": null, - "fields": [ - [ - { - "fieldType": "FormField", - "type": "input", - "id": "text-input1", - "name": "文本输入框", - "value": null, - "placeholder": null, - "params": { - "defaultValue": "" - }, - "fields": null - }, - { - "fieldType": "FormField", - "type": "textarea", - "id": "textarea2", - "name": "多行文本2", - "value": null, - "placeholder": null, - "params": { - "defaultValue": "" - }, - "fields": null - }, - { - "fieldType": "FormField", - "type": "image", - "id": "images", - "name": "图片", - "value": null, - "placeholder": null, - "params": { - "maxCount": 10, - "defaultValue": "" - }, - "fields": null - } - ] - ] - }, - { - "fieldType": "FormField", - "type": "taskOrder", - "id": "taskOrder1", - "name": "任务单", - "value": null, - "placeholder": null, - "params": { - "defaultValue": "" - }, - "fields": null - } - ] - ] - } - ], + "formFields": null, "originModelId": null, - "id": "202501151433100000000", - "type": [] + "id": "202508251020200000000" } \ No newline at end of file