From 25d63c0b274975b3903b00fa6c1d4e5639a17356 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 7 Mar 2025 11:00:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20fmlog=20update=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8F=AF=E7=94=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/models.py | 1 + apps/wpm/serializers.py | 2 +- apps/wpm/views.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/wpm/models.py b/apps/wpm/models.py index fd6273b2..984d85d2 100644 --- a/apps/wpm/models.py +++ b/apps/wpm/models.py @@ -156,6 +156,7 @@ class Fmlog(CommonADModel): mtask = models.ForeignKey(Mtask, verbose_name='任务', on_delete=models.CASCADE, related_name='fmlog_mtask') mgroup = models.ForeignKey(Mgroup, verbose_name='工段', on_delete=models.CASCADE, related_name='fmlog_mgroup') note = models.TextField('备注', default='', blank=True) + enabled = models.BooleanField("是否启用", default=True) class Mlog(CommonADModel): """ diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py index 86c991e8..ae07b803 100644 --- a/apps/wpm/serializers.py +++ b/apps/wpm/serializers.py @@ -1121,7 +1121,7 @@ class FmlogSerializer(CustomModelSerializer): class FmlogUpdateSerializer(CustomModelSerializer): class Meta: model = Fmlog - fields = ['id', 'note'] + fields = ['id', 'note', 'enabled'] class MlogTCreateSerializer(CustomModelSerializer): diff --git a/apps/wpm/views.py b/apps/wpm/views.py index 0efd2dc4..2b41791d 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -648,7 +648,7 @@ class FmlogViewSet(CustomModelViewSet): queryset = Fmlog.objects.all() serializer_class = FmlogSerializer update_serializer_class = FmlogUpdateSerializer - filterset_fields = ['mtask', 'mgroup', 'mtask__route'] + filterset_fields = ['mtask', 'mgroup', 'mtask__route', 'enabled'] select_related_fields = ['mtask', 'mgroup', 'mtask__route', 'mtask__route__routepack'] def destroy(self, request, *args, **kwargs):