Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

告警消除页中审核意见在处理人下的审核中不显示



See merge request !495

@@ -10,6 +10,7 @@ export default {
             type:Object,
             default:{}
         },
+        //同类型告警处理审核部分是否显示
         isExamine: {
             type: Boolean,
             default: false

@@ -119,7 +119,7 @@
             <div v-html="handleInfoObj.pcontent"></div>
         </div>
     </div>
-    <div class="detail_comments"  v-if="isExamine && status!=0 && status!=3">
+    <div class="detail_comments"  v-if="isExamine && status!=0 && status!=3 && approverName==loginName">
         <div class="detail_comments_title">审核意见</div>
 
         <el-input

@@ -426,7 +426,7 @@ export default {
                         repositoryInto.value=handleInfoObj.value.repositoryinto==1?true:false;
                         detail.value=handleInfoObj.value.pcontent;
                         repositoryInfo.value=handleInfoObj.value.pcontent;
-                        opinion.value=handleInfoObj.value.opinion;
+                        opinion.value=props.status==1?'':handleInfoObj.value.opinion;
                         approverLabel.value=handleInfoObj.value.approverName;
                         approverName.value=handleInfoObj.value.approver;
                         if(handleInfoObj.value.keyword){