monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit ef07a12cf6d28e07032ad740445267c65bca5973 2 parents e1dfb117 1d594005

Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w… 

…eb into master-500-dev-lushangqing
Inline Side-by-side
Showing 2 changed files with 1 additions and 2 deletions
@@ -129,7 +129,7 @@ @@ -129,7 +129,7 @@
129 <div v-html="handleInfoObj.pcontent"></div> 129 <div v-html="handleInfoObj.pcontent"></div>
130 </div> 130 </div>
131 </div> 131 </div>
132 - <div class="detail_comments" v-if="isExamine && (((status==3 || (status==1 && !isView)) && approverName==loginName) || status==2) "> 132 + <div class="detail_comments" v-if="isExamine && ((status==3 || (status==1 && !isView)) || status==2) ">
133 <div class="detail_comments_title">审核意见</div> 133 <div class="detail_comments_title">审核意见</div>
134 134
135 <el-input 135 <el-input
1 -  
2 spring: 1 spring:
3 application: 2 application:
4 name: zjweb 3 name: zjweb