From 3bd34938984360ee9c0af7024f0a2d398a6e9e54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Wed, 20 Dec 2023 15:27:09 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=E3=80=81=E4=B8=8D=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E8=BD=AC=E5=8A=9E=E7=9A=84=E8=8A=82=E7=82=B9=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/table/TodoList.vue          | 17 +++++++----
 .../ProjectComplianceEvaluationProcess.vue    | 28 +++++++++++++++++--
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/views/workCenter/processCenter/table/TodoList.vue b/src/views/workCenter/processCenter/table/TodoList.vue
index 00b168ea..57938be3 100644
--- a/src/views/workCenter/processCenter/table/TodoList.vue
+++ b/src/views/workCenter/processCenter/table/TodoList.vue
@@ -97,7 +97,12 @@ import {
   EsInspectionProcess,
   InspectionExtensionRequestProcess,
   EsInspectionRectification,
-  PermissionApply, PostMeetingManage
+  PermissionApply,
+  PostMeetingManage,
+  FGEntryChangeProcessNode,
+  ConsultationProcess,
+  ProjectComplianceEvaluationProcessNode,
+  ProcurementProcessNodes
 } from '@/enums/commonEnums'
 
 export default {
@@ -164,17 +169,17 @@ export default {
       // 每个流程不显示待办按钮的节点nodeId
       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.REGULATORY_COMPLIANCE_ASSESSMENT.value]: [],
         // 法规采购流程
-        [ProcessType.LEGAL_PROCUREMENT.value]: [],
+        [ProcessType.LEGAL_PROCUREMENT.value]: [ProcurementProcessNodes.initiate.value, ProcurementProcessNodes.regulatoryEngineerConfirmation.value],
         // 企标立项/变更计划
         [ProcessType.ES_INIT_CHANGE.value]: [
           EsInitChangeNodes.mainDrafterStart.value,
@@ -358,7 +363,7 @@ export default {
     // 是否显示转办按钮
     isShowTurnTo (record) {
       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 {
         return false
       }
diff --git a/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue b/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue
index 6e2f9bf8..e81f9ad0 100644
--- a/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue
+++ b/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue
@@ -203,7 +203,7 @@
 
             <!--条文内容-->
             <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, ' ') : '' }}
               </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)) {
         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',
             width: 150,
             align: 'center',