Merge branch 'master' of http://139.196.39.194:9021/chenc/cd-work-flow-web

src/views/activiti/todoManage.vue

@@ -105,8 +105,9 @@
             </a-table-column>
             <a-table-column title="操作" dataIndex="" align="center">
               <template slot-scope="t, r, i">
-                <a href="javascript:void(0);" @click="detail(r)">表单数据</a>
+                <a href="javascript:void(0);" @click="detail(r)">审批</a>
                 <a-divider type="vertical" />
+                <!--
                 <span
                   v-if="Boolean(r.isSuspended)"
                   style="cursor: no-drop;color: #999999;"
@@ -123,7 +124,7 @@
                   <a-divider type="vertical" />
                   <a href="javascript:void(0);" @click="delegateTask(r)" style="color: #00A0E9">委托</a>
                   <a-divider type="vertical" />
-                </span>
+                </span>-->
                 <a href="javascript:void(0);" @click="history(r)" style="color: gray">审批历史</a>
               </template>
             </a-table-column>