From 3317565ebe331c9f931c8741d2b41110283f77e3 Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Mon, 24 Oct 2022 09:52:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=85=E5=8A=9E=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E7=BB=86=E8=8A=82=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/evaluatorFeedback.vue          | 30 ++++++++++---------
 .../components/evaluatorFeedbackList.vue      |  4 ++-
 .../components/feedbackInformation.vue        |  7 +++++
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
index 901df1907..66b4c56aa 100644
--- a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
+++ b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
@@ -156,7 +156,8 @@
             </a-col>
           </a-row>
         </div>
-        <div class="box-text" style="margin-top: 10px" v-if="disabled && $route.query.taskDefinitionKey == 'fqrsc'">
+        <div class="box-text" style="margin-top: 10px"
+             v-if="disabled && $route.query.taskDefinitionKey == 'fqrsc' && !isTrue">
           <div class="header-text">
             {{$t('sponsorReview')}}
           </div>
@@ -175,18 +176,18 @@
             </div>
           </a-col>
         </a-row>
-        <a-row :gutter="24" v-if="disabled && $route.query.taskDefinitionKey == 'fqrsc' && isTrue">
-          <a-col :span="24">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" :title="$t('reviewComments')">{{$t('reviewComments')}}</span>
-              </div>
-              <div class="title-text-right" :class="{'title-text-right-text':disabled}" :title="formInline.approvalOpinion">
-                {{formInline.approvalOpinion}}
-              </div>
-            </div>
-          </a-col>
-        </a-row>
+        <!--        <a-row :gutter="24" v-if="disabled && $route.query.taskDefinitionKey == 'fqrsc' && isTrue">-->
+        <!--          <a-col :span="24">-->
+        <!--            <div class="box-title-text">-->
+        <!--              <div class="title-text">-->
+        <!--                <span class="title-text-text" :title="$t('reviewComments')">{{$t('reviewComments')}}</span>-->
+        <!--              </div>-->
+        <!--              <div class="title-text-right" :class="{'title-text-right-text':disabled}" :title="formInline.approvalOpinion">-->
+        <!--                {{formInline.approvalOpinion}}-->
+        <!--              </div>-->
+        <!--            </div>-->
+        <!--          </a-col>-->
+        <!--        </a-row>-->
       </a-form-model>
     </div>
     <uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
@@ -272,7 +273,7 @@
         disabled: false,
         uploadIndex: '',
         dataList: [],
-        isTrue:false,
+        isTrue: false
       }
     },
     mounted() {
@@ -462,4 +463,5 @@
     white-space: normal;
     word-break: break-all;
   }
+
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
index ec8a35034..e3cdc3930 100644
--- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
+++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
@@ -74,7 +74,9 @@
                <span v-else>--</span>
         </span>
         <span slot="Results" slot-scope="text,result">
-           {{text == 'Compliance' ? $t('accord'):$t('nonConformity')}}
+            <span v-if="text == 'Compliance'">{{$t('accord')}}</span>
+            <span v-else-if="text == 'Non-Compliance'">{{$t('nonConformity')}}</span>
+            <span v-else>--</span>
         </span>
         <span slot="sponsorFeedback" slot-scope="text,result">
              <a-textarea :placeholder="$t('pleaseEnter')+$t('sponsorFeedback')"
diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue
index 4db812447..b90f15da4 100644
--- a/jero-web/src/views/processCenter/components/feedbackInformation.vue
+++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue
@@ -33,6 +33,7 @@
                                     }]">
                   <a-input class="box-input"
                            :disabled="disabled"
+                           :title="item.relatedSection"
                            v-model="item.relatedSection"
                            :placeholder="$t('PleaseEnter')+$t('relevantSections')"/>
                 </a-form-model-item>
@@ -68,6 +69,7 @@
                                     }]">
                   <a-textarea :placeholder="$t('PleaseEnter')+$t('questionsSuggestions')"
                               :disabled="disabled"
+                              :title="item.issueOrSuggest"
                               v-model="item.issueOrSuggest" :rows="4"/>
                 </a-form-model-item>
               </div>
@@ -85,6 +87,7 @@
                                      {max: 300,message: $t('reason') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
                                     }]">
                   <a-textarea :placeholder="$t('PleaseEnter')+$t('reason')"
+                              :title="item.reason"
                               :disabled="disabled"
                               v-model="item.reason" :rows="4"/>
                 </a-form-model-item>
@@ -104,6 +107,7 @@
                                     }]">
                   <a-textarea :placeholder="$t('PleaseEnter')+$t('clauseContent')"
                               :disabled="disabled"
+                              :title="item.clauseContent"
                               v-model="item.clauseContent" :rows="4"/>
                 </a-form-model-item>
               </div>
@@ -301,4 +305,7 @@
     margin-left: 8px;
     cursor: pointer;
   }
+  ::v-deep .ant-input-disabled{
+    color: #000F16;
+  }
 </style>
\ No newline at end of file