diff --git a/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue b/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue index 918897fa..39ca0c6f 100644 --- a/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue +++ b/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue @@ -682,7 +682,6 @@ export default { }, // 业务分派信息部分表头 columns () { - console.log(this.currentNode) // 法规工程师发起 if (this.currentNode === ProjectComplianceEvaluationProcessNode.initiate.value) { return this.basicColumns.concat([ @@ -746,9 +745,8 @@ export default { } ]) } - // 设计工程师评估、模块负责人审批,及用户新增的审批节点都显示审批节点的表头 - const showNode = [ProjectComplianceEvaluationProcessNode.designEngineerEvaluation.value, ProjectComplianceEvaluationProcessNode.moduleOwnerApproval.value, ProjectComplianceEvaluationProcessNode.moduleOwnerModification.value] - if (showNode.includes(this.currentNode) || !ProjectComplianceEvaluationProcessNode.keyOfValue(this.currentNode)) { + // 设计工程师评估 + if (this.currentNode === ProjectComplianceEvaluationProcessNode.designEngineerEvaluation.value) { return this.basicColumns.concat([ // 上一节点处理人 { @@ -760,8 +758,29 @@ export default { }, // 评估反馈 { - // 设计工程师评估节点是评估反馈,其他节点是评估结果 - title: this.currentNode === ProjectComplianceEvaluationProcessNode.designEngineerEvaluation.value ? this.$t('workCenter.projectComplianceEvaluationProcess.evaluationFeedback') : this.$t('projectLibrary.vehicleItemLibrary.evaluationResult'), + title: this.$t('workCenter.projectComplianceEvaluationProcess.evaluationFeedback'), + dataIndex: 'evaluationFeedback_dictText', + width: 150, + align: 'center', + scopedSlots: { customRender: 'evaluationFeedback' } + } + ]) + } + // 模块负责人审批、模块负责人修改,及用户新增的审批节点都显示审批节点的表头 + const showNode = [ProjectComplianceEvaluationProcessNode.moduleOwnerApproval.value, ProjectComplianceEvaluationProcessNode.moduleOwnerModification.value] + if (showNode.includes(this.currentNode) || !ProjectComplianceEvaluationProcessNode.keyOfValue(this.currentNode)) { + return this.basicColumns.concat([ + // 评估人 + { + title: this.$t('projectLibrary.vehicleItemLibrary.evaluator'), + dataIndex: 'assessorName', + width: 150, + align: 'center', + scopedSlots: { customRender: 'text' } + }, + // 评估反馈 + { + title: this.$t('projectLibrary.vehicleItemLibrary.evaluationResult'), dataIndex: 'evaluationFeedback_dictText', width: 150, align: 'center',