Merge remote-tracking branch 'origin/master'

src/api/taskPlan/TaskChainList.js

@@ -25,4 +25,13 @@ export default class TaskChainList {
       data,
       data,
     });
     });
   }
   }
+
+  //任务执行清单队列删除
+  setdeleteById(data) {
+    return request({
+      url: `/task/taskList/deleteById`,
+      method: "post",
+      data,
+    });
+  }
 }
 }

src/views/modules/taskPlan/taskChainList/index.vue

@@ -120,6 +120,12 @@
                 v-if="scope.row.taskStatus === '1' && hasPermission('taskChainList:cancel')"
                 v-if="scope.row.taskStatus === '1' && hasPermission('taskChainList:cancel')"
                 @click="setTaskStatus(scope.row,'4')">取消
                 @click="setTaskStatus(scope.row,'4')">取消
               </el-button>
               </el-button>
+              <el-divider direction="vertical"
+                          v-if="scope.row.taskStatus === '5' && hasPermission('taskChainList:delete')"></el-divider>
+              <el-button type="text" size="mini"
+                         v-if="scope.row.taskStatus === '5' && hasPermission('taskChainList:delete')"
+                         @click="delete(scope.row)">删除
+              </el-button>
             </template>
             </template>
           </vxe-column>
           </vxe-column>
         </vxe-table>
         </vxe-table>
@@ -226,6 +232,20 @@ export default {
         }
         }
       })
       })
     },
     },
+    async delete (row) {
+      const can = {
+        id: row.id
+      }
+      this.TaskChainList.setdeleteById(can).then(({ data }) => {
+        if (data.code === 200) {
+          this.$set(row, 'taskStatus', taskStatus)
+          this.$message({
+            type: 'success',
+            message: data.msg
+          });
+        }
+      })
+    },
   },
   },
   created () {
   created () {
     this.TaskChainList = new TaskChainList()
     this.TaskChainList = new TaskChainList()