diff --git a/src/common/lang/workCenter/en.js b/src/common/lang/workCenter/en.js index 9e231fdc..fe6e0c8d 100644 --- a/src/common/lang/workCenter/en.js +++ b/src/common/lang/workCenter/en.js @@ -122,7 +122,25 @@ module.exports = { scorer: '评分人', reviewDate: '评审日期', judgingVenue: '评审地点', - pleaseEnterAllMarkItem: '请填写所有评分项' + pleaseEnterAllMarkItem: '请填写所有评分项', + isOpenComment: '是否开启征求意见', + departmentalLiaison: '部门联络人', + deadlineForComments: '征求意见截止日期', + workingGroup: '工作组', + clauseNumber: '条款号', + clauseName: '条款名称', + contentOfRevisedOpinion: '修改意见内容(包括修改理由和依据)', + departLiaisonLeader: '部门联络人主管级领导', + proposer: '意见提出人', + handlingSuggestion: '处理意见', + reason: '理由', + proofreader: '校对人(其他起草人)', + approverLeader: '审批人(主管级领导)', + approverStandardization: '审批人(标准化)', + countersign: '会签(相关部门领导)', + approverHeadEngineer: '审批(总工程师)', + releaseDate: '发布日期', + implementationDate: '实施日期' }, // 流程配置 processConfig: { diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index c422232f..54be5522 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -122,7 +122,25 @@ module.exports = { scorer: '评分人', reviewDate: '评审日期', judgingVenue: '评审地点', - pleaseEnterAllMarkItem: '请填写所有评分项' + pleaseEnterAllMarkItem: '请填写所有评分项', + isOpenComment: '是否开启征求意见', + departmentalLiaison: '部门联络人', + deadlineForComments: '征求意见截止日期', + workingGroup: '工作组', + clauseNumber: '条款号', + clauseName: '条款名称', + contentOfRevisedOpinion: '修改意见内容(包括修改理由和依据)', + departLiaisonLeader: '部门联络人主管级领导', + proposer: '意见提出人', + handlingSuggestion: '处理意见', + reason: '理由', + proofreader: '校对人(其他起草人)', + approverLeader: '审批人(主管级领导)', + approverStandardization: '审批人(标准化)', + countersign: '会签(相关部门领导)', + approverHeadEngineer: '审批(总工程师)', + releaseDate: '发布日期', + implementationDate: '实施日期' }, // 流程配置 processConfig: { diff --git a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue index f2821e01..da7f4fd4 100644 --- a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue +++ b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue @@ -59,24 +59,34 @@ - + + + + + + + + + + +
{{ $t('processApprovalInformation') }}
@@ -149,9 +159,18 @@ import ProcessDetailList from '@/components/ProcessDetailList' import PersonnelInfo from '@/components/PersonnelInfo' import MainDrafterSentBaseInfo from './modules/MainDrafterSentBaseInfo' import OtherDrafterUploadStandardBaseInfo from './modules/OtherDrafterUploadStandardBaseInfo' -import MainDrafterUploadMinuteBaseInfo from './modules/MainDrafterUploadMinuteBaseInfo' import StandardizationAuditBaseInfo from './modules/StandardizationAuditBaseInfo' import ScorerMarkBaseInfo from './modules/ScorerMarkBaseInfo' +import ConfirmWhetherCommentBaseInfo from './modules/ConfirmWhetherCommentBaseInfo' +import DepartLiaisonIssueBaseInfo from './modules/DepartLiaisonIssueBaseInfo' +import CommentObjectEnterBaseInfo from './modules/CommentObjectEnterBaseInfo' +import DepartLiaisonCollectBaseInfo from './modules/DepartLiaisonCollectBaseInfo' +import DepartLiaisonLeaderApproveBaseInfo from './modules/DepartLiaisonLeaderApproveBaseInfo' +import MainDrafterCollectBaseInfo from './modules/MainDrafterCollectBaseInfo' +import MainDrafterCollectUploadMinuteBaseInfo from './modules/MainDrafterCollectUploadMinuteBaseInfo' +import MainDrafterUploadMinuteBaseInfo from './modules/MainDrafterUploadMinuteBaseInfo' +import OtherDrafterProofreadBaseInfo from './modules/OtherDrafterProofreadBaseInfo' +import MainDrafterPublishBaseInfo from './modules/MainDrafterPublishBaseInfo' const personData = [ { @@ -271,9 +290,18 @@ const personData = [ export default { name: 'EnterpriseStandardRevisionFlow', components: { + MainDrafterPublishBaseInfo, + OtherDrafterProofreadBaseInfo, + MainDrafterUploadMinuteBaseInfo, + MainDrafterCollectUploadMinuteBaseInfo, + MainDrafterCollectBaseInfo, + DepartLiaisonLeaderApproveBaseInfo, + DepartLiaisonCollectBaseInfo, + CommentObjectEnterBaseInfo, + DepartLiaisonIssueBaseInfo, + ConfirmWhetherCommentBaseInfo, ScorerMarkBaseInfo, StandardizationAuditBaseInfo, - MainDrafterUploadMinuteBaseInfo, OtherDrafterUploadStandardBaseInfo, MainDrafterSentBaseInfo, InternalDetailPage, @@ -345,7 +373,7 @@ export default { validateTrigger: 'blur' } }, - currentNode: 5, + currentNode: 18, approvalInfoForm: this.$form.createForm(this), // 审批信息表单 personnelInfoData: [], // 人员信息数据 url: { diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/CommentModal.vue b/src/views/workCenter/enterpriseStandardRevision/modules/CommentModal.vue new file mode 100644 index 00000000..4f792f43 --- /dev/null +++ b/src/views/workCenter/enterpriseStandardRevision/modules/CommentModal.vue @@ -0,0 +1,198 @@ + + + + + diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/CommentObjectEnterBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/CommentObjectEnterBaseInfo.vue new file mode 100644 index 00000000..c3bde3ad --- /dev/null +++ b/src/views/workCenter/enterpriseStandardRevision/modules/CommentObjectEnterBaseInfo.vue @@ -0,0 +1,189 @@ + + + + + diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/ConfirmWhetherCommentBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/ConfirmWhetherCommentBaseInfo.vue new file mode 100644 index 00000000..5980845c --- /dev/null +++ b/src/views/workCenter/enterpriseStandardRevision/modules/ConfirmWhetherCommentBaseInfo.vue @@ -0,0 +1,161 @@ + + + + + diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonCollectBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonCollectBaseInfo.vue new file mode 100644 index 00000000..48075c7c --- /dev/null +++ b/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonCollectBaseInfo.vue @@ -0,0 +1,225 @@ + + + + + diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonIssueBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonIssueBaseInfo.vue new file mode 100644 index 00000000..13e9def5 --- /dev/null +++ b/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonIssueBaseInfo.vue @@ -0,0 +1,160 @@ + + + + + diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonLeaderApproveBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonLeaderApproveBaseInfo.vue new file mode 100644 index 00000000..240a518c --- /dev/null +++ b/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonLeaderApproveBaseInfo.vue @@ -0,0 +1,196 @@ + + + + + diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue new file mode 100644 index 00000000..87314448 --- /dev/null +++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue new file mode 100644 index 00000000..abdc85fe --- /dev/null +++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue @@ -0,0 +1,466 @@ + + + + + diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterPublishBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterPublishBaseInfo.vue new file mode 100644 index 00000000..09d9bec8 --- /dev/null +++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterPublishBaseInfo.vue @@ -0,0 +1,148 @@ + + + + + diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue index 86f6f743..0416c399 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue @@ -1,46 +1,40 @@ + +