From f16bf417935618833a233355edafdd409738337b Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 2 Apr 2021 17:17:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=BE=85=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E5=92=8C=E6=89=A7=E8=A1=8C=E4=B8=AD=E5=8F=AF=E8=BF=BD=E5=8A=A0?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/views/supervision/recorddo.vue | 2 +-
 client/src/views/supervision/taskdo.vue   | 2 +-
 server/apps/supervision/views.py          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/src/views/supervision/recorddo.vue b/client/src/views/supervision/recorddo.vue
index 75b87e5..4c6c8c9 100644
--- a/client/src/views/supervision/recorddo.vue
+++ b/client/src/views/supervision/recorddo.vue
@@ -63,7 +63,7 @@
         >
           <el-button size="small" type="primary">上传文件</el-button>
             <span class="el-upload__tip">
-              可上传pdf,word,ppt,excel,图片文件,大小不超过50M
+              可上传多个pdf,word,ppt,excel,图片文件,单文件大小不超过50M
             </span>
         </el-upload>
       </el-form-item>
diff --git a/client/src/views/supervision/taskdo.vue b/client/src/views/supervision/taskdo.vue
index fd83e1d..68a3d1f 100644
--- a/client/src/views/supervision/taskdo.vue
+++ b/client/src/views/supervision/taskdo.vue
@@ -77,7 +77,7 @@
           <el-button
             type="primary"
             @click="append()"
-            v-if="task.state == '执行中'"
+            v-if="task.state == '执行中' || task.state == '待发布'"
             size="small"
             >追加任务</el-button
           >
diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py
index e1f20d3..ce54cea 100644
--- a/server/apps/supervision/views.py
+++ b/server/apps/supervision/views.py
@@ -99,7 +99,7 @@ class TaskViewSet(CreateUpdateCustomMixin, ModelViewSet):
         obj = self.get_object()
         depts = request.data['depts']
         contents = request.data['contents']
-        if obj.state !='执行中':
+        if obj.state in ['待发布', '执行中']:
             return Response('任务状态错误', status=status.HTTP_400_BAD_REQUEST)
         if depts and contents:
             for m in depts:
@@ -237,7 +237,7 @@ class RecordViewSet(PageOrNot, CreateUpdateCustomMixin, ModelViewSet):
         return Response(ret)
 
     def update(self, request, *args, **kwargs):
-        instance = self.get_object()
+        instance = Record.objects.get(pk=kwargs['pk'])
         instance.note = request.data.get('note', None)
         instance.update_by = request.user
         instance.save()