diff --git a/package.json b/package.json index b193f9e..f2404dc 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "vue-json-viewer": "^3.0.4", "vue-router": "^4.1.6", "vue3-pdf-app": "^1.0.3", + "vue3-print-nb": "^0.1.4", "vuedraggable": "^4.1.0", "xlsx": "^0.18.5", "xlsx-style-vite": "^0.0.2" diff --git a/src/components/NameCircle.vue b/src/components/NameCircle.vue index 4e016aa..e240ae0 100644 --- a/src/components/NameCircle.vue +++ b/src/components/NameCircle.vue @@ -6,9 +6,9 @@
- +
@@ -18,7 +18,6 @@ diff --git a/src/views/workflow/process/config/ApprovalNodeConfig.vue b/src/views/workflow/process/config/ApprovalNodeConfig.vue index 2545821..9be3431 100644 --- a/src/views/workflow/process/config/ApprovalNodeConfig.vue +++ b/src/views/workflow/process/config/ApprovalNodeConfig.vue @@ -102,6 +102,7 @@ + @@ -129,6 +130,8 @@ + + @@ -273,6 +276,7 @@ const approvalTypes = reactive([ {name: "发起人自己", type: "SELF"}, {name: "下属企业领导", type: "SUB_LEADER"}, {name: "下属企业科创部对接人", type: "DSTI_CONTACT_PERSON"}, + {name: "项目负责人", type: "PROJECT_LEADER"}, // {name: "表单内联系人", type: "FORM_USER"}, // {name: "矩阵审批", type: "MATRIX_APPROVAL"}, ]) diff --git a/src/views/workflow/process/nodes/ApprovalNode.vue b/src/views/workflow/process/nodes/ApprovalNode.vue index a650e49..b3f1c2a 100644 --- a/src/views/workflow/process/nodes/ApprovalNode.vue +++ b/src/views/workflow/process/nodes/ApprovalNode.vue @@ -71,10 +71,10 @@ const content = computed(() => { return '科创部用户跳过' case "NO_USER_SKIP": return '无用户审批,跳过' - case "DSTI_CONTACT_PERSON": - return '下属企业科创部对接人' case "SUB_LEADER": return '下属企业领导' + case "PROJECT_LEADER": + return '项目负责人' case "SELF_SELECT": return config.selfSelect.multiple ? '发起人自选多人' : '发起人自选一人' case "LEADER_TOP": @@ -124,6 +124,7 @@ const validate = (err) => { case "DSTI_CONTACT_PERSON": case "SUB_LEADER": case "LEADER_TOP": + case "PROJECT_LEADER": showError.value = !validate_LEADER_TOP(err); break; case "LEADER":