From f6151ecea66363de8a5e45e73184554463925c5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Tue, 9 Jan 2024 17:22:05 +0800
Subject: [PATCH] fix 80342

---
 .../inconformityItem/InconformityItemList.vue |  4 +-
 .../modules/InconformityItemDetailModal.vue   | 43 ++++++++++++-------
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/views/projectLibrary/inconformityItem/InconformityItemList.vue b/src/views/projectLibrary/inconformityItem/InconformityItemList.vue
index d9092759..af357a5c 100644
--- a/src/views/projectLibrary/inconformityItem/InconformityItemList.vue
+++ b/src/views/projectLibrary/inconformityItem/InconformityItemList.vue
@@ -315,8 +315,8 @@ export default {
         path, query
       })
     },
-    handlePreview ({ id }) {
-      this.$refs.detailModal.open()
+    handlePreview (record) {
+      this.$refs.detailModal.open(record)
     }
   }
 }
diff --git a/src/views/projectLibrary/inconformityItem/modules/InconformityItemDetailModal.vue b/src/views/projectLibrary/inconformityItem/modules/InconformityItemDetailModal.vue
index 1747bd8c..b6326861 100644
--- a/src/views/projectLibrary/inconformityItem/modules/InconformityItemDetailModal.vue
+++ b/src/views/projectLibrary/inconformityItem/modules/InconformityItemDetailModal.vue
@@ -11,41 +11,42 @@
         <!--标准编号-->
         <div class="detail-page-part-form-item">
           <label>{{ $t('standardNumber') }}</label>
-          <span>{{ detailData.standardNumber }}</span>
+          <span>{{ detailData.standardNumber || global.emptyLine }}</span>
         </div>
         <!--标准名称-->
         <div class="detail-page-part-form-item">
           <label>{{ $t('standardName') }}</label>
-          <span>{{ detailData.a }}</span>
+          <span>{{ detailData.standardName || global.emptyLine }}</span>
         </div>
         <!--整改状态-->
         <div class="detail-page-part-form-item">
           <label>{{ $t('workCenter.esInspectionProcess.rectificationStatus') }}</label>
-          <span>{{ detailData.state_dictText }}</span>
+          <span>{{ detailData.state_dictText || global.emptyLine }}</span>
         </div>
         <!--预计整改完成日期-->
         <div class="detail-page-part-form-item">
           <label>{{ $t('projectLibrary.vehicleItemLibrary.estimatedDateOfCompletionOfRectification') }}</label>
-          <span>{{ detailData.expectedTime }}</span>
+          <span>{{ detailData.expectedTime || global.emptyLine }}</span>
         </div>
         <!--相关项目-->
         <div class="detail-page-part-form-item">
           <label>{{ $t('projectLibrary.noncoincidenceItem.relevantProject') }}</label>
-          <span>{{ detailData.projectName }}</span>
+          <span>{{ detailData.projectName || global.emptyLine }}</span>
         </div>
         <!--设计工程师-->
         <div class="detail-page-part-form-item">
           <label>{{ $t('workCenter.standardConsultationProcess.designEngineer') }}</label>
-          <span>{{ detailData.engineerName }}</span>
+          <span>{{ detailData.engineerId_dictText || global.emptyLine }}</span>
         </div>
         <!--相关流程-->
         <div class="detail-page-part-form-item">
           <label>{{ $t('projectLibrary.noncoincidenceItem.relatedProcess') }}</label>
-          <span>{{ detailData.b }}</span>
+          <span>{{ detailData.prcNum || global.emptyLine }}</span>
         </div>
         <!--查看未符合项评估结果-->
         <div class="btn-box">
-          <a-button type="primary" class="form-btn">{{ $t('projectLibrary.noncoincidenceItem.viewNonMatchItemEvaluationResult') }}
+          <a-button type="primary" class="form-btn" @click="handleToProcessDetail">
+            {{ $t('projectLibrary.noncoincidenceItem.viewNonMatchItemEvaluationResult') }}
           </a-button>
         </div>
       </div>
@@ -56,22 +57,22 @@
         <!--条款号-->
         <div class="line-form-item">
           <label>{{ $t('workCenter.enStandardRevision.clauseNumber') }}</label>
-          <span>{{ detailData.termNum }}</span>
+          <span>{{ detailData.termNum || global.emptyLine }}</span>
         </div>
         <!--条款名称-->
         <div class="line-form-item">
           <label>{{ $t('workCenter.enStandardRevision.clauseName') }}</label>
-          <span>{{ detailData.termName }}</span>
+          <span>{{ detailData.termName || global.emptyLine }}</span>
         </div>
         <!--涉及项目-->
         <div class="line-form-item">
           <label>{{ $t('projectLibrary.noncoincidenceItem.involvedItem') }}</label>
-          <span>{{ detailData.projectName }}</span>
+          <span>{{ detailData.projectName || global.emptyLine }}</span>
         </div>
         <!--设计工程师-->
         <div class="line-form-item">
           <label>{{ $t('workCenter.standardConsultationProcess.designEngineer') }}</label>
-          <span>{{ detailData.engineerName }}</span>
+          <span>{{ detailData.engineerName || global.emptyLine }}</span>
         </div>
       </div>
     </div>
@@ -79,6 +80,8 @@
 </template>
 
 <script>
+import { ProcessKey } from '../../../../enums/commonEnums'
+
 export default {
   name: 'InconformityItemDetailModal',
   data () {
@@ -88,12 +91,22 @@ export default {
     }
   },
   methods: {
-    open () {
+    open (record) {
       this.visible = true
+      this.detailData = Object.assign({}, record)
     },
     close () {
       this.visible = false
-
+      this.detailData = {}
+    },
+    handleToProcessDetail () {
+      this.$router.push({
+        path: '/workCenter/processCenter/detail/processDetail',
+        query: {
+          processKey: ProcessKey.NO_MATCH_TRACKING.value,
+          processInstanceId: this.detailData.prcNum_dictText
+        }
+      })
     }
   }
 }
@@ -166,4 +179,4 @@ export default {
   border: 1px solid rgba(128, 128, 128, 0.15);
   border-radius: 8px;
 }
-</style>
\ No newline at end of file
+</style>