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 @@ > 上传文件 - 可上传pdf,word,ppt,excel,图片文件,大小不超过50M + 可上传多个pdf,word,ppt,excel,图片文件,单文件大小不超过50M 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 @@ 追加任务 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()