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

审批中时查看消除页不出现审核意见



See merge request !536

@@ -129,11 +129,11 @@
             <div v-html="handleInfoObj.pcontent"></div>
             <div v-html="handleInfoObj.pcontent"></div>
         </div>
         </div>
     </div>
     </div>
-    <div class="detail_comments"  v-if="isExamine && (((status==3 || status==1) && approverName==loginName) || status==2)">
+    <div class="detail_comments"  v-if="isExamine && (((status==3 || (status==1  && !isView)) && approverName==loginName) || status==2) ">
         <div class="detail_comments_title">审核意见</div>
         <div class="detail_comments_title">审核意见</div>
 
 
         <el-input
         <el-input
-                v-if="status==1 && approverName==loginName"
+                v-if="status==1 && approverName==loginName && !isView"
                 v-model="opinion"
                 v-model="opinion"
                 type="textarea"
                 type="textarea"
                 :rows="5"
                 :rows="5"