From 45808debfe3b90260edf243f8716badfc83c5730 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 13 Jan 2022 14:54:29 +0800 Subject: [PATCH] record form field sort --- hb_server/apps/mtm/views.py | 2 +- hb_server/apps/wpm/serializers.py | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/hb_server/apps/mtm/views.py b/hb_server/apps/mtm/views.py index b7be795..04f3caa 100644 --- a/hb_server/apps/mtm/views.py +++ b/hb_server/apps/mtm/views.py @@ -186,7 +186,7 @@ class RecordFormFieldViewSet(OptimizationMixin, CreateUpdateModelAMixin, ModelVi queryset = RecordFormField.objects.all() filterset_fields = ['field_type', 'form'] search_fields = ['field_name', 'field_key'] - ordering = 'id' + ordering = 'sort' ordering_fields = ['sort', 'id'] def get_serializer_class(self): diff --git a/hb_server/apps/wpm/serializers.py b/hb_server/apps/wpm/serializers.py index 92048bd..01846d5 100644 --- a/hb_server/apps/wpm/serializers.py +++ b/hb_server/apps/wpm/serializers.py @@ -244,15 +244,20 @@ class OperationDetailSerializer(serializers.ModelSerializer): class OperationListSerializer(serializers.ModelSerializer): create_by_ = UserSimpleSerializer(source='create_by', read_only=True) step_ = StepSimpleSerializer(source='step', read_only=True) - wproduct_ = serializers.SerializerMethodField() + # wproduct_ = serializers.SerializerMethodField() + count_work = serializers.SerializerMethodField() equip_ = serializers.SerializerMethodField() record_ = serializers.SerializerMethodField() class Meta: model = Operation fields = '__all__' - def get_wproduct_(self, obj): - return WProduct.objects.filter(ow_wproduct__operation=obj).values('id', 'number') + # def get_wproduct_(self, obj): + # return WProduct.objects.filter(ow_wproduct__operation=obj).values('id', 'number') + + def get_count_work(self, obj): + count_work = 0 + return count_work def get_equip_(self, obj): return EquipmentSimpleSerializer(instance=Equipment.objects.filter(oe_equip__operation=obj), many=True).data