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

src/views/activiti/todoManage.vue

@@ -105,6 +105,8 @@
             </a-table-column>
             <a-table-column title="操作" dataIndex="" align="center">
               <template slot-scope="t, r, i">
+                <a href="javascript:void(0);" @click="passTask(r)" style="color: green">通过</a>
+                <a-divider type="vertical" />
                 <a href="javascript:void(0);" @click="detail(r)">审批</a>
                 <a-divider type="vertical" />
                 <!--
@@ -443,6 +445,12 @@ export default {
       }
     },
     passTask(v) {
+      // console.log("v.id",v.id);
+      // console.log("v.procInstId",v.procInstId);
+      // console.log("v.priority",v.priority);
+      // console.log("this.url.getNextNode",this.url.getNextNode);
+      // console.log("this.url.getNextNode",this.url.getNextNode);
+      
       this.forminitial()
       this.modalTaskTitle = '审批通过'
       this.form.id = v.id
@@ -454,6 +462,7 @@ export default {
       this.userLoading = true
       this.getAction(this.url.getNextNode, { procDefId: v.procDefId, currActId: v.key, procInstId: v.procInstId }).then(
         res => {
+          debugger
           this.userLoading = false
           if (res.success) {
             if (res.result.type == 3 || res.result.type == 4) {