feat: 设备返回full_name
This commit is contained in:
parent
ecea592a2b
commit
eb4238b1ae
|
@ -89,7 +89,7 @@ class Equipment(CommonBModel):
|
||||||
verbose_name_plural = verbose_name
|
verbose_name_plural = verbose_name
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.number + '-' + self.name
|
return f'{self.number}|{self.name}|{self.model}'
|
||||||
|
|
||||||
|
|
||||||
class EcheckRecord(CommonADModel):
|
class EcheckRecord(CommonADModel):
|
||||||
|
|
|
@ -13,6 +13,7 @@ class EquipmentSerializer(CustomModelSerializer):
|
||||||
belong_dept_name = serializers.CharField(
|
belong_dept_name = serializers.CharField(
|
||||||
source='belong_dept.name', read_only=True)
|
source='belong_dept.name', read_only=True)
|
||||||
mgroup_name = serializers.CharField(source='mgroup.name', read_only=True)
|
mgroup_name = serializers.CharField(source='mgroup.name', read_only=True)
|
||||||
|
full_name = serializers.SerializerMethodField()
|
||||||
|
|
||||||
def validate(self, attrs):
|
def validate(self, attrs):
|
||||||
mgroup = attrs.get('mgroup', None)
|
mgroup = attrs.get('mgroup', None)
|
||||||
|
@ -20,6 +21,9 @@ class EquipmentSerializer(CustomModelSerializer):
|
||||||
attrs['belong_dept'] = mgroup.belong_dept
|
attrs['belong_dept'] = mgroup.belong_dept
|
||||||
return super().validate(attrs)
|
return super().validate(attrs)
|
||||||
|
|
||||||
|
def get_full_name(self, obj):
|
||||||
|
return f'{obj.number}|{obj.name}|{obj.model}'
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Equipment
|
model = Equipment
|
||||||
fields = '__all__'
|
fields = '__all__'
|
||||||
|
|
Loading…
Reference in New Issue