zcdsj
/
cma_search
mirror of https://e.coding.net/ctcdevteam/cma_search.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

去除多余的leader字符按

This commit is contained in:
caoqianming 2021-04-12 15:50:53 +08:00
parent 1fe6226582
commit c98b57a19f
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/apps/quality/models.py
View File

@ -39,7 +39,6 @@ class SubInspectTask(CommonAModel):
""" """
name = models.CharField('子任务名', max_length=100) name = models.CharField('子任务名', max_length=100)
inspecttask = models.ForeignKey(InspectTask, on_delete=models.CASCADE, verbose_name='所属任务') inspecttask = models.ForeignKey(InspectTask, on_delete=models.CASCADE, verbose_name='所属任务')
leader = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name='组长')
class Meta: class Meta:
verbose_name = '巡查子任务' verbose_name = '巡查子任务'
@ -86,7 +85,7 @@ class InspectRecord(CommonAModel):
result = models.CharField('检查结果', max_length=50, choices=result_choices, null=True, blank=True) result = models.CharField('检查结果', max_length=50, choices=result_choices, null=True, blank=True)
note = models.TextField('检查说明', null=True, blank=True) note = models.TextField('检查说明', null=True, blank=True)
subtask = models.ForeignKey(SubInspectTask, on_delete=models.CASCADE, verbose_name='关联子任务') subtask = models.ForeignKey(SubInspectTask, on_delete=models.CASCADE, verbose_name='关联子任务')
class Meta: class Meta:
verbose_name = '巡查记录' verbose_name = '巡查记录'
verbose_name_plural = verbose_name verbose_name_plural = verbose_name

1
server/apps/quality/serializers.py
View File

@ -31,7 +31,6 @@ class InspectTaskSerializer(serializers.ModelSerializer):
return SubInspectTask.objects.filter(inspecttask=obj, is_deleted=True).count() return SubInspectTask.objects.filter(inspecttask=obj, is_deleted=True).count()
class SubtaskListSerializer(serializers.ModelSerializer): class SubtaskListSerializer(serializers.ModelSerializer):
leader_ = UserSimpleSerializer(source='leader', read_only=True)
class Meta: class Meta:
model = SubInspectTask model = SubInspectTask

1
server/apps/quality/views.py
View File

@ -59,7 +59,6 @@ class SubtaskViewSet(ModelViewSet):
obj = SubInspectTask() obj = SubInspectTask()
obj.inspecttask = InspectTask.objects.get(pk=request.data['inspecttask']) obj.inspecttask = InspectTask.objects.get(pk=request.data['inspecttask'])
obj.name = request.data['name'] obj.name = request.data['name']
obj.leader = User.objects.get(pk=request.data['leader'])
obj.save() obj.save()
InspectTeam.objects.create(member=User.objects.get(pk=request.data['leader']), type='组长', subtask=obj) 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): if request.data.get('members', False) and request.data.get('depts', False):