wushaodong 3 년 전
부모
커밋
c07db1e189
2개의 변경된 파일8개의 추가작업 그리고 6개의 파일을 삭제
  1. 6 2
      apps/order/serializers.py
  2. 2 4
      uis/views/order/index.html

+ 6 - 2
apps/order/serializers.py

@@ -9,13 +9,17 @@ from utils.booleancharfield import BooleanCharField
 
 class OrderSerializer(serializers.ModelSerializer):
     commodity_name = serializers.CharField(source='commodity.name', read_only=True)
-    student_name = serializers.CharField(source='student.name', read_only=True)
-    payment_name = serializers.CharField(source='get_payment_display', read_only=True)
+    student_text = serializers.CharField(source='student.name', read_only=True)
     create_user_text = serializers.CharField(source='create_user.username', read_only=True)
     status_text = serializers.CharField(source='get_status_display', read_only=True)
 
     total_amount = PriceShowCharField(read_only=True)
     actual_amount = PriceShowCharField(read_only=True)
+    class_text = serializers.SerializerMethodField()
+
+    def get_class_text(self, obj):
+        name = '{}-{}-{}'.format(obj.student.school.name, obj.student.classes.grade.name, obj.student.classes.name, )
+        return name
 
     class Meta:
         model = Order

+ 2 - 4
uis/views/order/index.html

@@ -134,10 +134,8 @@
                 , {field: 'notes', title: '备注', width: 150,}
                 , {field: 'create_time', title: '下单时间', width: 180,}
                 , {field: 'create_user_text', title: '下单人', width: 150,}
-                , {field: 'student_text', title: '学生姓名', width: 150,}
-                , {field: 'school_text', title: '学校', width: 150,}
-                , {field: 'grade_text', title: '年级', width: 100,}
-                , {field: 'class_text', title: '班级', width: 100,}
+                , {field: 'student_text', title: '学生姓名', width: 100,}
+                , {field: 'class_text', title: '学校班级', width: 240,}
             ]]
             , page: true
             , height: 'full-108'