fix:流程相关调整

src/components/tools/HeaderNotice.vue

@@ -11,24 +11,7 @@
     <template slot="content">
       <a-spin :spinning="loadding">
         <a-tabs>
-          <a-tab-pane :tab="msg1Title" key="1">
-            <!--<a-list>
-              <a-list-item>
-                <a-list-item-meta title="你收到了 14 份新周报" description="一年前">
-                  <a-avatar style="background-color: white" slot="avatar" src="https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png"/>
-                </a-list-item-meta>
-              </a-list-item>
-              <a-list-item>
-                <a-list-item-meta title="你推荐的 IT大牛 已通过第三轮面试" description="一年前">
-                  <a-avatar style="background-color: white" slot="avatar" src="https://gw.alipayobjects.com/zos/rmsportal/OKJXDXrmkNshAMvwtvhu.png"/>
-                </a-list-item-meta>
-              </a-list-item>
-              <a-list-item>
-                <a-list-item-meta title="这种模板可以区分多种通知类型" description="一年前">
-                  <a-avatar style="background-color: white" slot="avatar" src="https://gw.alipayobjects.com/zos/rmsportal/kISTdvpyTAhtGxpovNWd.png"/>
-                </a-list-item-meta>
-              </a-list-item>
-            </a-list>-->
+          <!-- <a-tab-pane :tab="msg1Title" key="1">
             <a-list>
               <a-list-item :key="index" v-for="(record, index) in announcement1">
                 <div style="margin-left: 5%;width: 80%">
@@ -52,7 +35,7 @@
                 <a-button @click="toMyAnnouncement()" type="dashed" block>查看更多</a-button>
               </div>
             </a-list>
-          </a-tab-pane>
+          </a-tab-pane> -->
           <a-tab-pane :tab="msg2Title" key="2">
             <a-list>
               <a-list-item :key="index" v-for="(record, index) in announcement2">

src/views/activiti/applyList.vue

@@ -5,12 +5,12 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :md="4" :sm="12">
-            <a-form-item label="标题">
+            <a-form-item label="所属流程">
               <a-input placeholder="请输入搜索关键词" v-model="queryParam.title"></a-input>
             </a-form-item>
           </a-col>
 
-          <a-col :md="4" :sm="12">
+          <!-- <a-col :md="4" :sm="12">
             <a-form-item label="状态">
               <a-select v-model="queryParam.status" placeholder="请选择" :allowClear="true">
                 <a-select-option value="0">草稿</a-select-option>
@@ -19,7 +19,7 @@
                 <a-select-option value="3">已撤回</a-select-option>
               </a-select>
             </a-form-item>
-          </a-col>
+          </a-col> -->
 
           <a-col :md="4" :sm="12">
             <a-form-item label="结果">
@@ -103,7 +103,7 @@
           </a-table-column>
 
           <!-- 状态 -->
-          <a-table-column
+          <!-- <a-table-column
             title="状态"
             dataIndex="status"
             :width="100"
@@ -128,7 +128,7 @@
                 <a-tag color="orange">已撤回</a-tag>
               </template>
             </template>
-          </a-table-column>
+          </a-table-column> -->
 
           <!-- 结果 -->
           <a-table-column
@@ -152,12 +152,12 @@
 
               <!-- 已通过 -->
               <template v-if="r.result == 2">
-                <a-tag color="#87d068">已通过</a-tag>
+                <a-tag color="#87d068">通过</a-tag>
               </template>
 
               <!-- 已驳回 -->
               <template v-if="r.result == 3">
-                <a-tag color="gray">已驳回</a-tag>
+                <a-tag color="gray">驳回</a-tag>
               </template>
             </template>
           </a-table-column>

src/views/activiti/doneManage.vue

@@ -90,10 +90,12 @@
           <a-table-column title="审批操作" dataIndex="deleteReason" :width="100" align="center">
             <template slot-scope="t, r, i">
               <template v-if="r.deleteReason == '审批通过'">
-                <a-tag color="#87d068">{{ t }}</a-tag>
+                <!-- <a-tag color="#87d068">{{ t }}</a-tag> -->
+                <a-tag color="#87d068">通过</a-tag>
               </template>
               <template v-else>
-                <a-tag color="#b7b7a4">{{ t }}</a-tag>
+                <!-- <a-tag color="#b7b7a4">{{ t }}</a-tag> -->
+                <a-tag color="#b7b7a4">驳回</a-tag>
               </template>
             </template>
           </a-table-column>

src/views/activiti/todoManage.vue

@@ -9,8 +9,8 @@
         <a-form layout="inline" @keyup.enter.native="handleSearch">
           <a-row :gutter="24">
             <a-col :md="6" :sm="8">
-              <a-form-item label="关键字" prop="name">
-                <a-input type="text" allowClear v-model="searchForm.name" placeholder="请输入业务信息或流程发起人" />
+              <a-form-item label="发起人" prop="name">
+                <a-input type="text" allowClear v-model="searchForm.name" placeholder="请输入流程发起人" />
               </a-form-item>
             </a-col>
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">

src/views/dashboard/MyoaTabs.vue

@@ -147,9 +147,9 @@ export default {
                     this.doneList.map(item => {
                         var reallyResult = ''
                         if (item.deleteReason == '审批通过') {
-                            reallyResult = '<span style="color:green">审批通过</span>'
+                            reallyResult = '<span style="color:green">通过</span>'
                         } else if(item.deleteReason == '审批驳回'){
-                            reallyResult = '<span style="color:red">审批驳回</span>'
+                            reallyResult = '<span style="color:red">驳回</span>'
                         }else{
                           reallyResult = item.deleteReason
                         }