update 项目合规评估流程、不需要转办的节点处理
This commit is contained in:
@@ -97,7 +97,12 @@ import {
|
|||||||
EsInspectionProcess,
|
EsInspectionProcess,
|
||||||
InspectionExtensionRequestProcess,
|
InspectionExtensionRequestProcess,
|
||||||
EsInspectionRectification,
|
EsInspectionRectification,
|
||||||
PermissionApply, PostMeetingManage
|
PermissionApply,
|
||||||
|
PostMeetingManage,
|
||||||
|
FGEntryChangeProcessNode,
|
||||||
|
ConsultationProcess,
|
||||||
|
ProjectComplianceEvaluationProcessNode,
|
||||||
|
ProcurementProcessNodes
|
||||||
} from '@/enums/commonEnums'
|
} from '@/enums/commonEnums'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
@@ -164,17 +169,17 @@ export default {
|
|||||||
// 每个流程不显示待办按钮的节点nodeId
|
// 每个流程不显示待办按钮的节点nodeId
|
||||||
notTurnToBtn: {
|
notTurnToBtn: {
|
||||||
// 标准法规入库/变更流程
|
// 标准法规入库/变更流程
|
||||||
[ProcessType.FB_ENTRY_CHANGE.value]: [],
|
[ProcessType.FB_ENTRY_CHANGE.value]: [FGEntryChangeProcessNode.initiate.value],
|
||||||
// 征求意见流程
|
// 征求意见流程
|
||||||
[ProcessType.CONSULTATION.value]: [],
|
[ProcessType.CONSULTATION.value]: [ConsultationProcess.initiate.value],
|
||||||
// 项目合规评估流程
|
// 项目合规评估流程
|
||||||
[ProcessType.PROJECT_COMPLIANCE_EVALUATION.value]: [],
|
[ProcessType.PROJECT_COMPLIANCE_EVALUATION.value]: [ProjectComplianceEvaluationProcessNode.initiate.value],
|
||||||
// 未符合项跟踪流程
|
// 未符合项跟踪流程
|
||||||
[ProcessType.NO_MATCH_TRACKING.value]: [],
|
[ProcessType.NO_MATCH_TRACKING.value]: [],
|
||||||
// 法规合规评估流程
|
// 法规合规评估流程
|
||||||
[ProcessType.REGULATORY_COMPLIANCE_ASSESSMENT.value]: [],
|
[ProcessType.REGULATORY_COMPLIANCE_ASSESSMENT.value]: [],
|
||||||
// 法规采购流程
|
// 法规采购流程
|
||||||
[ProcessType.LEGAL_PROCUREMENT.value]: [],
|
[ProcessType.LEGAL_PROCUREMENT.value]: [ProcurementProcessNodes.initiate.value, ProcurementProcessNodes.regulatoryEngineerConfirmation.value],
|
||||||
// 企标立项/变更计划
|
// 企标立项/变更计划
|
||||||
[ProcessType.ES_INIT_CHANGE.value]: [
|
[ProcessType.ES_INIT_CHANGE.value]: [
|
||||||
EsInitChangeNodes.mainDrafterStart.value,
|
EsInitChangeNodes.mainDrafterStart.value,
|
||||||
@@ -358,7 +363,7 @@ export default {
|
|||||||
// 是否显示转办按钮
|
// 是否显示转办按钮
|
||||||
isShowTurnTo (record) {
|
isShowTurnTo (record) {
|
||||||
if (record.prcType && record.nodeId) {
|
if (record.prcType && record.nodeId) {
|
||||||
return !this.notTurnToBtn[record.prcType + ''].includes(record.nodeId)
|
return !this.notTurnToBtn[record.prcType + ''].some(tt => record.nodeId.indexOf(tt) !== -1)
|
||||||
} else {
|
} else {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|||||||
+25
-3
@@ -203,7 +203,7 @@
|
|||||||
|
|
||||||
<!--条文内容-->
|
<!--条文内容-->
|
||||||
<template v-slot:clauseContent="{text}">
|
<template v-slot:clauseContent="{text}">
|
||||||
<div class="table-text" @click="showContent(text)" v-if="text">
|
<div class="table-text" style="cursor: pointer" @click="showContent(text)" v-if="text">
|
||||||
{{ text && text !== 'null' ? text.replace(/<.*?>/ig, ' ') : '' }}
|
{{ text && text !== 'null' ? text.replace(/<.*?>/ig, ' ') : '' }}
|
||||||
</div>
|
</div>
|
||||||
<div class="table-text" v-else>{{ global.emptyLine }}</div>
|
<div class="table-text" v-else>{{ global.emptyLine }}</div>
|
||||||
@@ -729,7 +729,7 @@ export default {
|
|||||||
])
|
])
|
||||||
}
|
}
|
||||||
// 设计工程师评估、模块负责人审批、各部门主管级领导审批、法规工程师归档,及用户新增的审批节点都显示审批节点的表头
|
// 设计工程师评估、模块负责人审批、各部门主管级领导审批、法规工程师归档,及用户新增的审批节点都显示审批节点的表头
|
||||||
const showNode = [ProjectComplianceEvaluationProcessNode.designEngineerEvaluation.value, ProjectComplianceEvaluationProcessNode.moduleOwnerApproval.value, ProjectComplianceEvaluationProcessNode.departLeaderApproval.value, ProjectComplianceEvaluationProcessNode.regulatoryEngineerFiling.value, ProjectComplianceEvaluationProcessNode.moduleOwnerModification.value]
|
const showNode = [ProjectComplianceEvaluationProcessNode.designEngineerEvaluation.value, ProjectComplianceEvaluationProcessNode.moduleOwnerApproval.value, ProjectComplianceEvaluationProcessNode.departLeaderApproval.value, ProjectComplianceEvaluationProcessNode.moduleOwnerModification.value]
|
||||||
if (showNode.includes(this.currentNode) || !ProjectComplianceEvaluationProcessNode.keyOfValue(this.currentNode)) {
|
if (showNode.includes(this.currentNode) || !ProjectComplianceEvaluationProcessNode.keyOfValue(this.currentNode)) {
|
||||||
return this.basicColumns.concat([
|
return this.basicColumns.concat([
|
||||||
// 上一节点处理人
|
// 上一节点处理人
|
||||||
@@ -742,7 +742,29 @@ export default {
|
|||||||
},
|
},
|
||||||
// 评估反馈
|
// 评估反馈
|
||||||
{
|
{
|
||||||
title: this.$t('workCenter.projectComplianceEvaluationProcess.evaluationFeedback'),
|
// 设计工程师评估节点是评估反馈,其他节点是评估结果
|
||||||
|
title: this.currentNode === ProjectComplianceEvaluationProcessNode.designEngineerEvaluation.value ? this.$t('workCenter.projectComplianceEvaluationProcess.evaluationFeedback') : this.$t('projectLibrary.vehicleItemLibrary.evaluationResult'),
|
||||||
|
dataIndex: 'evaluationFeedback_dictText',
|
||||||
|
width: 150,
|
||||||
|
align: 'center',
|
||||||
|
scopedSlots: { customRender: 'evaluationFeedback' }
|
||||||
|
}
|
||||||
|
])
|
||||||
|
}
|
||||||
|
// 法规工程师归档
|
||||||
|
if (this.currentNode === ProjectComplianceEvaluationProcessNode.regulatoryEngineerFiling.value) {
|
||||||
|
return this.basicColumns.concat([
|
||||||
|
// 设计工程师
|
||||||
|
{
|
||||||
|
title: this.$t('workCenter.standardConsultationProcess.designEngineer'),
|
||||||
|
dataIndex: 'designEngineer',
|
||||||
|
width: 150,
|
||||||
|
align: 'center',
|
||||||
|
scopedSlots: { customRender: 'text' }
|
||||||
|
},
|
||||||
|
// 评估结果
|
||||||
|
{
|
||||||
|
title: this.$t('projectLibrary.vehicleItemLibrary.evaluationResult'),
|
||||||
dataIndex: 'evaluationFeedback_dictText',
|
dataIndex: 'evaluationFeedback_dictText',
|
||||||
width: 150,
|
width: 150,
|
||||||
align: 'center',
|
align: 'center',
|
||||||
|
|||||||
Reference in New Issue
Block a user