From e40cf39f6c3d6ab5711410802ff5edc8767df08d Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 1 Apr 2021 17:28:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95record=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/client/src/views/supervision/recorddo.vue b/client/src/views/supervision/recorddo.vue
index 9d29086..1bff1d5 100644
--- a/client/src/views/supervision/recorddo.vue
+++ b/client/src/views/supervision/recorddo.vue
@@ -101,7 +101,7 @@
     </div>
   </div>
 </template>
-<style>
+<style scoped>
 .ma {
   margin-bottom: 10px;
   font-size: 20px;
diff --git a/server/apps/supervision/serializers.py b/server/apps/supervision/serializers.py
index af36fdf..e822291 100644
--- a/server/apps/supervision/serializers.py
+++ b/server/apps/supervision/serializers.py
@@ -38,7 +38,7 @@ class TaskListSerializer(serializers.ModelSerializer):
         fields = ['name', 'end_date', 'note', 'state', 'id']
         
 class RecordSerializer(serializers.ModelSerializer):
-    task_ = TaskListSerializer(source='task')
+    task_ = TaskListSerializer(source='task', read_only=True)
     belong_dept_ = OrganizationSimpleSerializer(source='belong_dept', read_only=True)
     files_ = FileSimpleSerializer(source='files', many=True, read_only=True)
     up_user_ = UserSimpleSerializer(source='up_user', read_only = True)
diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py
index c381329..862d035 100644
--- a/server/apps/supervision/views.py
+++ b/server/apps/supervision/views.py
@@ -234,11 +234,12 @@ class RecordViewSet(RbacFilterSet, PageOrNot, CreateUpdateCustomMixin, ModelView
         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()
         return Response(status=status.HTTP_200_OK)
-    
+
     @action(methods=['put'], detail=False, perms_map = {'put':'record_update'})
     def updates(self, request, *args, **kwargs):
         ids = request.data.get('ids')