From 1a621aca344cb1c9f2496c5c75740c1f22bdc4e7 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 2 Jul 2025 16:41:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=94=9F=E4=BA=A7=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8F=90=E4=BA=A4=E4=BA=BA=E5=A7=93=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/serializers.py | 2 ++ apps/wpm/views.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py index a66ba32d..7a824ea6 100644 --- a/apps/wpm/serializers.py +++ b/apps/wpm/serializers.py @@ -277,6 +277,7 @@ class MlogListSerializer(CustomModelSerializer): test_user_name = serializers.CharField(source='test_user.name', read_only=True) handle_users_ = UserSimpleSerializer( source='handle_users', many=True, read_only=True) + submit_user_name = serializers.CharField(source='submit_user.name', read_only=True) class Meta: model = Mlog @@ -339,6 +340,7 @@ class MlogSerializer(CustomModelSerializer): source='handle_users', many=True, read_only=True) ticket_ = TicketSimpleSerializer(source='ticket', read_only=True) test_user_name = serializers.CharField(source='test_user.name', read_only=True) + submit_user_name = serializers.CharField(source='submit_user.name', read_only=True) mlogdefect = MlogbDefectSerializer(many=True, required=False) mlogindefect = MlogbDefectSerializer(many=True, label="前道不良", required=False) diff --git a/apps/wpm/views.py b/apps/wpm/views.py index 4e58d5ea..0b8c4ee1 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -173,7 +173,7 @@ class MlogViewSet(CustomModelViewSet): list_serializer_class = MlogListSerializer select_related_fields = ['create_by', 'update_by', 'mtask', 'mtaskb', 'handle_user', 'handle_user_2', 'equipment', 'mgroup__belong_dept', - 'equipment_2', 'material_in', 'material_out', 'route__routepack', + 'equipment_2', 'material_in', 'material_out', 'route__routepack', 'submit_user', 'supplier', 'ticket', 'mgroup__process', 'test_user', 'handle_leader', 'test_user', 'team'] prefetch_related_fields = ['handle_users', 'material_outs', 'b_mlog', 'equipments']