diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index cc42f44..86cae80 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -41,6 +41,7 @@ module.exports = { clickToUpload: '点击上传', operation: 'Operation', strip: 'Items', + total: '共', // 标准法规入库/变更流程 standardEntryOrChange: { source: '来源', @@ -182,6 +183,13 @@ module.exports = { theFollowingDocuments: 'M以下文件', file: '文件' }, + // 法规采购流程 + procurement: { + reasonForPurchase: '采购理由', + export: '导出', + goToThePCToExport: '请前往PC端导出', + carbonCopy: '抄送' + }, // 企标稽查计划 esInspectionPlan: { inspectionPlan: '稽查计划', @@ -258,5 +266,19 @@ module.exports = { file: '附件', requestExtensionDate: '申请延期日期', extensionDescription: '延期说明' + }, + // 项目合规评估流程 + projectCompliance: { + vehicleItemInfo: '车型项目信息', + propertiesAndTextAttachments: '属性及文本附件', + projectAppraisal: '项目评估', + estimatedDateOfCompletionOfRectification: '预计整改完成日期', + standardNumberClauseNumber: '标准编号/条款号', + standardNameClauseName: '标准名称/条款名称', + terms: '条款内容', + preNodeProcessesPeople: '上一节点处理人', + evaluationFeedback: '评估反馈', + evaluator: '评估人', + evaluationResult:'评估结果' } } diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index 6f9ffc3..3b1bebf 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -278,5 +278,7 @@ module.exports = { terms: '条款内容', preNodeProcessesPeople: '上一节点处理人', evaluationFeedback: '评估反馈', + evaluator: '评估人', + evaluationResult:'评估结果' } } diff --git a/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue b/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue index 8dc9261..0b34afd 100644 --- a/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue +++ b/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue @@ -168,7 +168,7 @@ export default { }, projectInfo: {}, // 项目信息 standardList: [], // 属性及文本附件的内容(多个标准) - columns: [ + basicColumns: [ // 序号 { title: this.$t('serialNumber'), @@ -208,9 +208,9 @@ export default { width: 150, align: 'center' }, - // 评估反馈 + // 评估结果 { - title: this.$t('projectCompliance.evaluationFeedback'), + title: this.$t('projectCompliance.evaluationResult'), dataIndex: 'evaluationFeedback_dictText', width: 150, align: 'center' @@ -340,10 +340,29 @@ export default { showQuickJumper: true, showSizeChanger: true, total: 0 + }, + currentNode: null + } + }, + computed: { + columns () { + const list = JSON.parse(JSON.stringify(this.basicColumns)) + // 各部门主管级领导审批是评估人 + if (this.currentNode === ProjectComplianceEvaluationProcessNode.departLeaderApproval.value) { + list[4] = { + // 评估人 + title: this.$t('projectCompliance.evaluator'), + dataIndex: 'assessorName', + width: 150, + align: 'center', + scopedSlots: { customRender: 'text' } + } } + return list } }, created () { + this.currentNode = this.$route.query.nodeId this.initProcessData() }, methods: { diff --git a/src/views/workCenter/standardConsultation/StandardConsultationProcess.vue b/src/views/workCenter/standardConsultation/StandardConsultationProcess.vue index 3316735..bc38a0e 100644 --- a/src/views/workCenter/standardConsultation/StandardConsultationProcess.vue +++ b/src/views/workCenter/standardConsultation/StandardConsultationProcess.vue @@ -4,7 +4,7 @@