From 3cfd346873f15577d27e489c280a68b0bdb48084 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 31 Mar 2021 16:50:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=BD=E5=8A=A0=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1?=
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 | 42 ++++++++++++++++++++++---
 server/apps/supervision/views.py        | 32 +++++++++++++++++++
 3 files changed, 76 insertions(+), 5 deletions(-)

diff --git a/client/src/api/task.js b/client/src/api/task.js
index bf39389..3fdae9e 100644
--- a/client/src/api/task.js
+++ b/client/src/api/task.js
@@ -48,6 +48,13 @@ export function inittask(id, data) {
   })
 }
 
+export function appendtask(id, data) {
+  return request({
+    url: `/supervision/task/${id}/append/`,
+    method: 'post',
+    data
+  })
+}
 
 export function gettaskcontents(id) {
   return request({
diff --git a/client/src/views/supervision/taskdo.vue b/client/src/views/supervision/taskdo.vue
index 28fb215..5589964 100644
--- a/client/src/views/supervision/taskdo.vue
+++ b/client/src/views/supervision/taskdo.vue
@@ -74,6 +74,13 @@
             size="small"
             >初始化任务</el-button
           >
+          <el-button
+            type="primary"
+            @click="append()"
+            v-if="task.state == '执行中'"
+            size="small"
+            >追加任务</el-button
+          >
           <el-button
             type="primary"
             @click="starttask()"
@@ -258,11 +265,11 @@
     </el-card>
     <el-dialog
       :visible.sync="dialogVisible"
-      title="初始化任务"
+      :title="dgaction.name"
       :close-on-click-modal="false"
       width="70%"
     >
-      <taskinit ref="taskinit" @handleChose="chooseComplete"></taskinit>
+      <taskinit ref="taskinit" @handleChose="chooseComplete" ></taskinit>
     </el-dialog>
     <el-drawer
       title="记录"
@@ -298,7 +305,7 @@
 }
 </style>
 <script>
-import { gettask, inittask, gettaskdeptall, starttask } from "@/api/task";
+import { gettask, inittask, gettaskdeptall, starttask, appendtask } from "@/api/task";
 import { getRecordList, updateRecords } from "@/api/record";
 import Pagination from "@/components/Pagination";
 import taskinit from "@/views/supervision/taskinit";
@@ -322,7 +329,11 @@ export default {
       data: {},
       taskdeptall: [],
       listQuery:{},
-      selectRecords:[]
+      selectRecords:[],
+      dgaction:{
+        action:'init',
+        name:'初始化任务'
+      }
     };
   },
   created() {
@@ -352,16 +363,37 @@ export default {
         });
     },
     init() {
+      this.dgaction ={
+        action:'init',
+        name:'初始化任务'
+      }
+      this.dialogVisible = true;
+    },
+    append() {
+      this.dgaction ={
+        action:'append',
+        name:'追加任务'
+      }
       this.dialogVisible = true;
     },
     chooseComplete(data) {
       this.dialogVisible = false;
+      if(this.dgaction.action == 'init'){
       const rLoading = this.openLoading("正在初始化任务,请稍等...");
       inittask(this.task.id, data).then((res) => {
         rLoading.close();
         this.$message.success("成功");
         this.$router.go(0);
-      });
+      }).catch(e=>{rLoading.close();});
+      }else if(this.dgaction.action == 'append'){
+        const rLoading = this.openLoading("正在追加任务,请稍等...");
+      appendtask(this.task.id, data).then((res) => {
+        rLoading.close();
+        this.$message.success("成功");
+        this.$router.go(0);
+      }).catch(e=>{rLoading.close();});
+      }
+      
     },
     starttask() {
       this.$confirm("确认发布任务吗?", "提示")
diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py
index 845d96f..14e2a28 100644
--- a/server/apps/supervision/views.py
+++ b/server/apps/supervision/views.py
@@ -91,6 +91,38 @@ class TaskViewSet(CreateUpdateCustomMixin, ModelViewSet):
             return Response(status=status.HTTP_200_OK)
         return Response('单位或清单不能为空', status=status.HTTP_400_BAD_REQUEST)
     
+    @action(methods=['post'], detail=True, perms_map = {'post':'task_append'})
+    def append(self, request, *args, **kwargs):
+        """
+        追加任务,生成记录
+        """
+        obj = self.get_object()
+        depts = request.data['depts']
+        contents = request.data['contents']
+        if obj.state !='执行中':
+            return Response('任务状态错误', status=status.HTTP_400_BAD_REQUEST)
+        if depts and contents:
+            for m in depts:
+                m = Organization.objects.get(pk=m)
+                TaskDept.objects.get_or_create(task=obj, dept=m, defaults={'task':obj, 'dept':m})
+                for n in contents:
+                    n = Content.objects.get(pk=n)
+                    if not Record.objects.filter(belong_dept=m, content=n, task=obj).exists():
+                        r = Record()
+                        r.content = n
+                        r.content_name = n.name
+                        r.content_desc = n.desc
+                        r.belong_dept = m
+                        r.task = obj
+                        r.end_date = obj.end_date
+                        r.create_by = request.user
+                        r.state = '待上报'
+                        r.save()
+            obj.save()
+            return Response(status=status.HTTP_200_OK)
+        return Response('单位或清单不能为空', status=status.HTTP_400_BAD_REQUEST)
+
+
     @action(methods=['get'], detail=True, perms_map = {'get':'*'})
     def contents(self, request, *args, **kwargs):
         """