From c98b57a19f9f5e55dcadb31ccf4b20e405c92552 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 12 Apr 2021 15:50:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99=E7=9A=84le?= =?UTF-8?q?ader=E5=AD=97=E7=AC=A6=E6=8C=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/quality/models.py | 3 +-- server/apps/quality/serializers.py | 1 - server/apps/quality/views.py | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/server/apps/quality/models.py b/server/apps/quality/models.py index 39ce26b..97cba78 100644 --- a/server/apps/quality/models.py +++ b/server/apps/quality/models.py @@ -39,7 +39,6 @@ class SubInspectTask(CommonAModel): """ name = models.CharField('子任务名', max_length=100) inspecttask = models.ForeignKey(InspectTask, on_delete=models.CASCADE, verbose_name='所属任务') - leader = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name='组长') class Meta: verbose_name = '巡查子任务' @@ -86,7 +85,7 @@ class InspectRecord(CommonAModel): result = models.CharField('检查结果', max_length=50, choices=result_choices, null=True, blank=True) note = models.TextField('检查说明', null=True, blank=True) subtask = models.ForeignKey(SubInspectTask, on_delete=models.CASCADE, verbose_name='关联子任务') - + class Meta: verbose_name = '巡查记录' verbose_name_plural = verbose_name diff --git a/server/apps/quality/serializers.py b/server/apps/quality/serializers.py index 8dd697a..52cbdf4 100644 --- a/server/apps/quality/serializers.py +++ b/server/apps/quality/serializers.py @@ -31,7 +31,6 @@ class InspectTaskSerializer(serializers.ModelSerializer): return SubInspectTask.objects.filter(inspecttask=obj, is_deleted=True).count() class SubtaskListSerializer(serializers.ModelSerializer): - leader_ = UserSimpleSerializer(source='leader', read_only=True) class Meta: model = SubInspectTask diff --git a/server/apps/quality/views.py b/server/apps/quality/views.py index d2b568d..4e4753b 100644 --- a/server/apps/quality/views.py +++ b/server/apps/quality/views.py @@ -59,7 +59,6 @@ class SubtaskViewSet(ModelViewSet): obj = SubInspectTask() obj.inspecttask = InspectTask.objects.get(pk=request.data['inspecttask']) obj.name = request.data['name'] - obj.leader = User.objects.get(pk=request.data['leader']) obj.save() InspectTeam.objects.create(member=User.objects.get(pk=request.data['leader']), type='组长', subtask=obj) if request.data.get('members', False) and request.data.get('depts', False):