diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index 5030d795..9e1082cf 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -161,6 +161,7 @@ module.exports = { lookDetail: '查看详情', batchReject: '批量驳回', pleaseSelectDistributeData: '请选择要分发的数据', + deadline: '截止时间', // 树右键 treeRight: { addFolder: 'Create New Folder', diff --git a/src/common/lang/workCenter/en.js b/src/common/lang/workCenter/en.js index 325ca20a..335a366e 100644 --- a/src/common/lang/workCenter/en.js +++ b/src/common/lang/workCenter/en.js @@ -100,6 +100,16 @@ module.exports = { batchSetDrafter: '批量设置主起草人', drafter: '主起草人' }, + // 企标制修订流程 + enStandardRevision: { + standardText: '标准文本', + onLineEditing: '在线编辑', + addOtherDrafter: '添加其他起草人', + addEditDrafter: '新增/编辑起草人', + draftingUnit: '起草单位', + drafter: '起草人', + draftingScope: '起草范围' + }, // 流程配置 processConfig: { processType: '流程类型', diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index 7aa1a424..e5991243 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -13,7 +13,7 @@ module.exports = { enterpriseProjectChangePlan: '企标立项/变更计划', annualRevisionPlanActivelyReport: '年度制修订计划审批流程(各部门主动上报)', annualRevisionPlanStandardizationInit: '年度制修订计划审批流程(标准化发起)', - enterpriseStandardSystemRevisionProcess: '企标制修订流程', + enterpriseStandardSystemRevisionProcess: '企标制修订流程(草案编写/征求意见/报批)', bidChangeProcess: '企标更改流程', processOfEnterpriseBidReview: '企标复审流程', processOfEnterpriseBidAnnulment: '企标废止流程', @@ -100,6 +100,16 @@ module.exports = { batchSetDrafter: '批量设置主起草人', drafter: '主起草人' }, + // 企标制修订流程 + enStandardRevision: { + standardText: '标准文本', + onLineEditing: '在线编辑', + addOtherDrafter: '添加其他起草人', + addEditDrafter: '新增/编辑起草人', + draftingUnit: '起草单位', + drafter: '起草人', + draftingScope: '起草范围' + }, // 流程配置 processConfig: { processType: '流程类型', diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index 01141253..0bf152a3 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -164,6 +164,7 @@ module.exports = { lookDetail: '查看详情', batchReject: '批量驳回', pleaseSelectDistributeData: '请选择要分发的数据', + deadline: '截止时间', // 树右键 treeRight: { addFolder: '新增文件夹', diff --git a/src/views/workCenter/NewProcess.vue b/src/views/workCenter/NewProcess.vue index ffdb91b5..c368ccaf 100644 --- a/src/views/workCenter/NewProcess.vue +++ b/src/views/workCenter/NewProcess.vue @@ -63,7 +63,7 @@ export default { }, { // 企标制修订流程 title: this.$t('workCenter.newProcess.enterpriseStandardSystemRevisionProcess'), - path: '' + path: '/workCenter/enterpriseStandardRevision/enterpriseStandardRevisionFlow' }, { // 企标更改流程 title: this.$t('workCenter.newProcess.bidChangeProcess'), diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue index 4e3d9066..256b15bd 100644 --- a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue +++ b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue @@ -224,7 +224,7 @@ export default { this.personnelInfoData = personData } else { this.personnelInfoData = personData.map(item => { - return { ...item, canChoose: false } + return { ...item, canChoose: false, fieldName: undefined } }) } // 如果是查看进入的,不可编辑,不可操作 diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue index 1c932ab3..fca5ee6d 100644 --- a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue +++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue @@ -206,7 +206,7 @@ export default { this.personnelInfoData = personData } else { this.personnelInfoData = personData.map(item => { - return { ...item, canChoose: false } + return { ...item, canChoose: false, fieldName: undefined } }) } // 如果是查看进入的,不可编辑,不可操作 diff --git a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue index f3f381d4..56c1858b 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue @@ -479,6 +479,9 @@ export default { this.personnelInfoData = approvalPersonalInfo this.disabled = false } else { + this.personnelInfoData = approvalPersonalInfo.map(item => { + return { ...item, canChoose: false, fieldName: undefined } + }) this.disabled = true } // 如果是查看进入的,不可编辑,不可操作 diff --git a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue new file mode 100644 index 00000000..7cc9b9cf --- /dev/null +++ b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue @@ -0,0 +1,452 @@ + + + + + diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/AddEditDrafterDrawer.vue b/src/views/workCenter/enterpriseStandardRevision/modules/AddEditDrafterDrawer.vue new file mode 100644 index 00000000..b385d0d1 --- /dev/null +++ b/src/views/workCenter/enterpriseStandardRevision/modules/AddEditDrafterDrawer.vue @@ -0,0 +1,133 @@ + + + + + diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue b/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue new file mode 100644 index 00000000..016592d2 --- /dev/null +++ b/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue @@ -0,0 +1,369 @@ + + + + + diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterSentBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterSentBaseInfo.vue new file mode 100644 index 00000000..c065c444 --- /dev/null +++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterSentBaseInfo.vue @@ -0,0 +1,129 @@ + + + + + diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue new file mode 100644 index 00000000..a2d752c3 --- /dev/null +++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue @@ -0,0 +1,29 @@ + + + + +