diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js
index 1d19a0d6..a144b998 100644
--- a/src/common/lang/en-us.js
+++ b/src/common/lang/en-us.js
@@ -148,6 +148,8 @@ module.exports = {
turnTo: 'Turn To',
agree: 'agree',
reject: 'Reject',
+ basicInformation: 'Basic Information',
+ personalInformation: 'Personnel Information',
// 树右键
treeRight: {
addFolder: 'Create New Folder',
diff --git a/src/common/lang/workCenter/en.js b/src/common/lang/workCenter/en.js
index 62b61e6d..57cc6590 100644
--- a/src/common/lang/workCenter/en.js
+++ b/src/common/lang/workCenter/en.js
@@ -76,6 +76,14 @@ module.exports = {
superintendent: '所长',
relatedPersonnel: '相关人员'
},
+ // 年度制修订计划(各部门主动上报)
+ revisionPlanActivelyReport: {
+ revisionPlanDesc: '制修订计划说明',
+ whetherToSendAContact: '是否下发联络人',
+ workingGroupContactPerson: '工作组/所联络人',
+ contactSupervisorSuperiorLeader: '联络人主管级上一级领导',
+ affiliatedWorkingGroup: '隶属工作组'
+ },
// 流程配置
processConfig: {
processType: '流程类型',
diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js
index 82350ec7..57cc6590 100644
--- a/src/common/lang/workCenter/zh.js
+++ b/src/common/lang/workCenter/zh.js
@@ -78,7 +78,11 @@ module.exports = {
},
// 年度制修订计划(各部门主动上报)
revisionPlanActivelyReport: {
- revisionPlanDesc: '制修订计划说明'
+ revisionPlanDesc: '制修订计划说明',
+ whetherToSendAContact: '是否下发联络人',
+ workingGroupContactPerson: '工作组/所联络人',
+ contactSupervisorSuperiorLeader: '联络人主管级上一级领导',
+ affiliatedWorkingGroup: '隶属工作组'
},
// 流程配置
processConfig: {
diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js
index a14f7aa5..d27477cc 100644
--- a/src/common/lang/zh-cn.js
+++ b/src/common/lang/zh-cn.js
@@ -150,6 +150,7 @@ module.exports = {
reject: '驳回',
basicInformation: '基础信息',
personalInformation: '人员信息',
+ rangeOfApplication: '适用范围',
// 树右键
treeRight: {
addFolder: '新增文件夹',
diff --git a/src/components/PersonnelInfo.vue b/src/components/PersonnelInfo.vue
index 873d43b8..c484c136 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 3739221b..a25f5e18 100644
--- a/src/views/workCenter/NewProcess.vue
+++ b/src/views/workCenter/NewProcess.vue
@@ -55,7 +55,7 @@ export default {
},
{ // 年度制修订计划审批流程(各部门主动上报)
title: this.$t('workCenter.newProcess.annualRevisionPlanActivelyReport'),
- path: ''
+ path: '/workCenter/annualRevisionPlanActivelyReport/revisionPlanActivelyReportFlow'
},
{ // 年度制修订计划审批流程(标准化发起)
title: this.$t('workCenter.newProcess.annualRevisionPlanStandardizationInit'),
diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue
index 0ace2761..66d2e28a 100644
--- a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue
+++ b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue
@@ -12,7 +12,7 @@
-
+
{{ $t('processInformation') }}
@@ -52,7 +52,10 @@
{{ $t('basicServiceInformation') }}
-
+
+
+
+
{{ $t('processApprovalInformation') }}
@@ -70,17 +73,167 @@
+
+
+
-
diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskForm.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskForm.vue
new file mode 100644
index 00000000..e4df4925
--- /dev/null
+++ b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskForm.vue
@@ -0,0 +1,447 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('newlyAdded') }}
+
+
+
+ {{ $t('import') }}
+
+
+
+ {{ $t('batchDelete') }}
+
+
+
+
+
+
+
+
+
+ {{ text || text === 0 ? text : global.emptyLine }}
+ {{ text }}
+ {{ global.emptyLine }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue
new file mode 100644
index 00000000..14156202
--- /dev/null
+++ b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue
@@ -0,0 +1,780 @@
+
+
+
+
+
{{ $t('cancel') }}
+
{{ $t('submit') }}
+
+
+
+
+
+
+
diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/EngineerInitForm.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/EngineerInitForm.vue
index 0d9aed8c..06d2909b 100644
--- a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/EngineerInitForm.vue
+++ b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/EngineerInitForm.vue
@@ -3,7 +3,7 @@