From c80b486a00eb9a06a16ffd5160fed82d04958818 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 22 Dec 2023 10:19:25 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20equipment=5Fname=20=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E2=80=94=E7=9A=84=E4=B8=BA=5F=5Fstr=5F=5F=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/em/serializers.py | 6 ++---- apps/wpm/serializers.py | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/apps/em/serializers.py b/apps/em/serializers.py index 932c73a0..467bdb86 100644 --- a/apps/em/serializers.py +++ b/apps/em/serializers.py @@ -32,8 +32,7 @@ class EquipmentSerializer(CustomModelSerializer): class EcheckRecordSerializer(CustomModelSerializer): - equipment_name = serializers.CharField( - source='equipment.name', read_only=True) + equipment_name = serializers.StringRelatedField(source='equipment', read_only=True) class Meta: model = EcheckRecord @@ -48,8 +47,7 @@ class EcheckRecordSerializer(CustomModelSerializer): class EInspectSerializer(CustomModelSerializer): - equipment_name = serializers.CharField( - source='equipment.name', read_only=True) + equipment_name = serializers.StringRelatedField(source='equipment', read_only=True) inspect_user_name = serializers.CharField( source='inspect_user.name', read_only=True) diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py index 524be6dd..2e32adab 100644 --- a/apps/wpm/serializers.py +++ b/apps/wpm/serializers.py @@ -192,10 +192,8 @@ class MlogSerializer(CustomModelSerializer): source='handle_user_2.name', read_only=True) handle_leader_name = serializers.CharField( source='handle_leader.name', read_only=True) - equipment_name = serializers.CharField( - source='equipment.name', read_only=True) - equipment_2_name = serializers.CharField( - source='equipment_2.name', read_only=True) + equipment_name = serializers.StringRelatedField(source='equipment', read_only=True) + equipment_2_name = serializers.StringRelatedField(source='equipment_2', read_only=True) shift = serializers.PrimaryKeyRelatedField( label='班次ID', queryset=Shift.objects.all(), required=True) mgroup = serializers.PrimaryKeyRelatedField(