From ae345f232d46e7c7b0a21be70079fbc47830fb04 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 21 Jun 2021 17:03:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BB=BB=E5=8A=A1=E5=86=85?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/api/task.js                  |  7 +++++++
 client/src/views/supervision/taskdo.vue | 16 +++++++++++++++-
 server/apps/supervision/views.py        | 11 ++++++++++-
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/client/src/api/task.js b/client/src/api/task.js
index c28950a..7e6e14e 100644
--- a/client/src/api/task.js
+++ b/client/src/api/task.js
@@ -103,4 +103,11 @@ export function confirmTaskdept(id) {
     url: `/supervision/taskdept/${id}/confirm/`,
     method: 'put'
   })
+}
+
+export function deleteTaskdept(id) {
+  return request({
+    url: `/supervision/taskdept/${id}/`,
+    method: 'delete'
+  })
 }
\ No newline at end of file
diff --git a/client/src/views/supervision/taskdo.vue b/client/src/views/supervision/taskdo.vue
index 83a8725..a0652b3 100644
--- a/client/src/views/supervision/taskdo.vue
+++ b/client/src/views/supervision/taskdo.vue
@@ -141,6 +141,15 @@
               @click="handleConfirmDept(scope)"
               >确认</el-link
             >
+            <el-link
+              v-if="
+                checkPermission(['task_update'])
+              "
+              type="danger"
+              size="small"
+              @click="handleDeleteDept(scope)"
+              >删除</el-link
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -328,7 +337,7 @@
 }
 </style>
 <script>
-import { gettask, inittask, gettaskdeptall, starttask, appendtask, confirmTaskdept } from "@/api/task";
+import { gettask, inittask, gettaskdeptall, starttask, appendtask, confirmTaskdept, deleteTaskdept } from "@/api/task";
 import { getRecordList, updateRecords } from "@/api/record";
 import Pagination from "@/components/Pagination";
 import taskinit from "@/views/supervision/taskinit";
@@ -467,6 +476,11 @@ export default {
         this.gettaskdeptall()
       })
     },
+    handleDeleteDept(scope){
+      deleteTaskdept(scope.row.id).then(res=>{
+        this.gettaskdeptall()
+      })
+    },
     handleUp2(){
       if (this.selectRecords.length) {
         this.$prompt('请输入备注内容', '提示').then(({ value }) => {
diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py
index 5f3cd1d..1e61df8 100644
--- a/server/apps/supervision/views.py
+++ b/server/apps/supervision/views.py
@@ -353,4 +353,13 @@ class TaskDeptViewSet(ModelViewSet):
             obj.confirm_rate = 100
             obj.save()
             return Response(status=status.HTTP_200_OK)
-        return Response('报送未完成', status=status.HTTP_400_BAD_REQUEST)
\ No newline at end of file
+        return Response('报送未完成', status=status.HTTP_400_BAD_REQUEST)
+    
+    def destroy(self, request, *args, **kwargs):
+        """
+        删除
+        """
+        obj = self.get_object()
+        Record.objects.filter(task=obj.task, belong_dept=obj.dept).delete() # 删除相应上报记录
+        obj.delete()
+        return Response()
\ No newline at end of file