From 58a627eca185a55af34349dc5d7252afcb46df69 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 11 Aug 2022 17:32:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../documentComparison/index.vue              |  9 ++--
 .../components/evaluatorFeedback.vue          | 52 ++++++++++++++++++-
 2 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue
index 974e48a5b..17cd09b9e 100644
--- a/jero-web/src/views/documentTools/documentComparison/index.vue
+++ b/jero-web/src/views/documentTools/documentComparison/index.vue
@@ -354,10 +354,13 @@
         window.open(newUrl.href, '_blank')
       },
       initiatingProcessClick() {
-        let newUrl = this.$router.resolve({
-          path: '/initiateDocumentComparison'
+        this.$router.push({
+          path:'/initiateDocumentComparison'
         })
-        window.open(newUrl.href, '_blank')
+        // let newUrl = this.$router.resolve({
+        //   path: '/initiateDocumentComparison'
+        // })
+        // window.open(newUrl.href, '_blank')
       },
       deleteData(val) {
         let _this = this
diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
index caef7a4ed..ef8d4b8d1 100644
--- a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
+++ b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
@@ -43,7 +43,7 @@
                     v-if="formInline.dataList.length > 1 && (formInline.dataList.length - 1) == index && !disabled"
                     type="minus-circle"/>
           </div>
-          <a-row :gutter="24">
+          <a-row :gutter="24" v-if="!disabled">
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
@@ -87,7 +87,7 @@
               </div>
             </a-col>
           </a-row>
-          <a-row :gutter="24">
+          <a-row :gutter="24" v-if="!disabled">
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
@@ -113,6 +113,48 @@
               </div>
             </a-col>
           </a-row>
+
+          <a-row :gutter="24" v-if="disabled">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
+                </div>
+                <div class="title-text-right" :class="{'title-text-right-text':disabled}" :title="item.relatedSection">
+                  {{item.relatedSection}}
+                </div>
+              </div>
+            </a-col>
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text"
+                        :title="$t('problemDescription')">{{$t('problemDescription')}}</span>
+                </div>
+                <div class="title-text-right" :class="{'title-text-right-text':disabled}" :title="item.issueOrSuggest">
+                  {{item.issueOrSuggest}}
+                </div>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24" v-if="disabled">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
+                </div>
+                <div class="title-text-right">
+                  <span style="color: #21c9cc;cursor: pointer"
+                        v-if="item.accessoryFile" @click="viewUploadedFilesClick(item.accessoryFile)">
+                     {{$t('viewFile')}}
+                  </span>
+                  <span v-else>
+                     --
+                  </span>
+                </div>
+              </div>
+            </a-col>
+          </a-row>
         </div>
         <div class="box-text" style="margin-top: 10px" v-if="disabled">
           <div class="header-text">
@@ -395,4 +437,10 @@
     margin-left: 8px;
     cursor: pointer;
   }
+
+  .title-text-right-text {
+    overflow: visible;
+    white-space: normal;
+    word-break: break-all;
+  }
 </style>
\ No newline at end of file