From 379f1d5a24ea10eb6769a9d0292363140270da1e Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 31 Mar 2021 21:56:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E5=8A=A8=E6=8A=A5=E9=80=81bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/views/supervision/record.vue | 3 ++- server/apps/supervision/views.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/client/src/views/supervision/record.vue b/client/src/views/supervision/record.vue index 887475c..90e4a4d 100644 --- a/client/src/views/supervision/record.vue +++ b/client/src/views/supervision/record.vue @@ -400,7 +400,8 @@ export default { resetFilter() { this.listQuery = { page: 1, - page_size: 20 + page_size: 20, + only: this.listQuery.only }; this.getList(); }, diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py index 14e2a28..3dd5925 100644 --- a/server/apps/supervision/views.py +++ b/server/apps/supervision/views.py @@ -261,7 +261,8 @@ class RecordViewSet(RbacFilterSet, PageOrNot, CreateUpdateCustomMixin, ModelView contents = request.data['contents'] rlist = [] for i in contents: - data = {'content':Content.objects.get(pk=i), 'belong_dept':request.user.dept, 'is_self':True} + content = Content.objects.get(pk=i) + data = {'content':content, 'belong_dept':request.user.dept, 'is_self':True, 'content_name':content.name, 'content_desc':content.desc} rlist.append(Record(**data)) Record.objects.bulk_create(rlist) return Response(status=status.HTTP_200_OK)