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

告警驳回关键字不能输入



See merge request !534

@@ -146,10 +146,10 @@
         </div>
     </div>
     <div class="alarmsClearTag" v-if="repositoryInto && (!isExamine || status==0 || status==3) ">
-        <div class="tag-keyword" v-if="isExamine && status!=0 && approverName==loginName">
+        <div class="tag-keyword" v-if="isExamine && status == 2 && approverName==loginName">
             关键字：<span class="tag-keyword-span" v-for="tag in dynamicTags">{{tag}}</span>
         </div>
-        <div class="tag-keyword" v-if="!isExamine || status==0">
+        <div class="tag-keyword" v-if="!isExamine || status==0 || status==3">
             关键字：
             <el-tag
                     v-for="tag in dynamicTags"