diff --git a/src/assets/less/common.less b/src/assets/less/common.less index a7a1ffe7..a60555dd 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -793,6 +793,7 @@ padding-left: 12px; position: relative; margin-top: 32px; + margin-bottom: 20px; } .process-part-title::before { diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index b7304b50..f7cc5d4c 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -76,6 +76,10 @@ module.exports = { superintendent: '所长', relatedPersonnel: '相关人员' }, + // 年度制修订计划(各部门主动上报) + revisionPlanActivelyReport: { + revisionPlanDesc: '制修订计划说明' + }, // 流程配置 processConfig: { processType: '流程类型', diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index f1883343..a14f7aa5 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -148,6 +148,8 @@ module.exports = { turnTo: '转办', agree: '同意', reject: '驳回', + basicInformation: '基础信息', + personalInformation: '人员信息', // 树右键 treeRight: { addFolder: '新增文件夹', diff --git a/src/components/PersonnelInfo.vue b/src/components/PersonnelInfo.vue index 0ac44d73..7dce9baf 100644 --- a/src/components/PersonnelInfo.vue +++ b/src/components/PersonnelInfo.vue @@ -29,9 +29,9 @@
{{ step.userList }}
diff --git a/src/views/workCenter/NewProcess.vue b/src/views/workCenter/NewProcess.vue index 18a56cd8..3739221b 100644 --- a/src/views/workCenter/NewProcess.vue +++ b/src/views/workCenter/NewProcess.vue @@ -51,7 +51,7 @@ export default { list: [ { // 企标立项/变更计划 title: this.$t('workCenter.newProcess.enterpriseProjectChangePlan'), - path: '/workCenter/enterpriseStandardInitChange/flow/planApprovalChangeFlow' + path: '/workCenter/enterpriseStandardInitChange/planApprovalChangeFlow' }, { // 年度制修订计划审批流程(各部门主动上报) title: this.$t('workCenter.newProcess.annualRevisionPlanActivelyReport'), diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue new file mode 100644 index 00000000..0ace2761 --- /dev/null +++ b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue @@ -0,0 +1,86 @@ + + + + + diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/EngineerInitForm.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/EngineerInitForm.vue new file mode 100644 index 00000000..0d9aed8c --- /dev/null +++ b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/EngineerInitForm.vue @@ -0,0 +1,55 @@ + + + + + diff --git a/src/views/workCenter/enterpriseStandardInitChange/flow/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue similarity index 98% rename from src/views/workCenter/enterpriseStandardInitChange/flow/PlanApprovalChangeFlow.vue rename to src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue index 7b61ccfa..9549685e 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/flow/PlanApprovalChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue @@ -1,13 +1,13 @@