diff --git a/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue b/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue
index aa9dc453..9a6b1201 100644
--- a/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue
+++ b/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue
@@ -171,7 +171,7 @@
:show-btn="false"
:value="record.designEngineers"
:placeholder="$t('pleaseSelect') + $t('workCenter.standardConsultationProcess.designEngineer')"
- type="checkbox"
+ type="radio"
v-if="!record.notInvolved"
@listChange="value => handleUserChange(value, record, index, 'designEngineers')" />
{{ global.emptyLine }}
@@ -307,7 +307,7 @@
-
+
@@ -727,13 +727,13 @@ export default {
])
}
// 设计工程师评估、模块负责人审批、各部门主管级领导审批、法规工程师归档,及用户新增的审批节点都显示审批节点的表头
- const showNode = [ProjectComplianceEvaluationProcessNode.designEngineerEvaluation.value, ProjectComplianceEvaluationProcessNode.moduleOwnerApproval.value, ProjectComplianceEvaluationProcessNode.departLeaderApproval.value, ProjectComplianceEvaluationProcessNode.regulatoryEngineerFiling.value]
+ const showNode = [ProjectComplianceEvaluationProcessNode.designEngineerEvaluation.value, ProjectComplianceEvaluationProcessNode.moduleOwnerApproval.value, ProjectComplianceEvaluationProcessNode.departLeaderApproval.value, ProjectComplianceEvaluationProcessNode.regulatoryEngineerFiling.value, ProjectComplianceEvaluationProcessNode.moduleOwnerModification.value]
if (showNode.includes(this.currentNode) || !ProjectComplianceEvaluationProcessNode.keyOfValue(this.currentNode)) {
return this.basicColumns.concat([
// 上一节点处理人
{
title: this.$t('workCenter.projectComplianceEvaluationProcess.preNodePeople'),
- dataIndex: 'preNodePeople',
+ dataIndex: 'previousNodeHandler',
width: 150,
align: 'center',
scopedSlots: { customRender: 'text' }
@@ -767,6 +767,13 @@ export default {
// 是否展示抄送人员
showCcPerson () {
return this.currentNode === ProjectComplianceEvaluationProcessNode.regulatoryEngineerFiling.value
+ },
+ // 转办、批量选人的用户弹窗类型
+ userSelectType () {
+ if (this.currentNode === ProjectComplianceEvaluationProcessNode.moduleOwnerIssued.value || this.isTransfer) {
+ return 'radio'
+ }
+ return 'checkbox'
}
},
created () {
@@ -811,6 +818,9 @@ export default {
// 流程审批信息
this.approvalInfo = Object.assign({}, draftResult.approvalInfo)
} else {
+ // 项目、标准信息回显
+ this.projectDataSource = [result.businessInfoDTO.processProjectAssess]
+ this.standardDataSource = result.businessInfoDTO.processProjectAssessLinkList || []
const dataList = result.businessInfoDTO.processProjectAssessTermList || []
this.dataSource = dataList.map((item, index) => {
item.tableRowKey = index
@@ -908,7 +918,7 @@ export default {
this.$router.push({
path: '/projectLibrary/VehicleItemLibraryDetail',
query: {
- id: project.id,
+ id: project.id || project.projectId,
projectName: project.projectName
}
})