feat: ofm-service fix bug
This commit is contained in:
parent
f290138c40
commit
362497af37
|
|
@ -71,7 +71,7 @@ class VehicleRecordSerializer(CustomModelSerializer):
|
||||||
|
|
||||||
|
|
||||||
class VehicleUseSerializer(CustomModelSerializer):
|
class VehicleUseSerializer(CustomModelSerializer):
|
||||||
vehreg = serializers.PrimaryKeyRelatedField(queryset=VehicleReg.objects.all(), write_only=True, label="车辆信息")
|
vehiclereg = serializers.PrimaryKeyRelatedField(queryset=VehicleReg.objects.all(), write_only=True, label="车辆信息")
|
||||||
vdate = serializers.DateField(write_only=True, label="预订日期")
|
vdate = serializers.DateField(write_only=True, label="预订日期")
|
||||||
slots = serializers.ListField(child=serializers.IntegerField(), write_only=True, label="时段索引")
|
slots = serializers.ListField(child=serializers.IntegerField(), write_only=True, label="时段索引")
|
||||||
create_by_name = serializers.CharField(source='create_by.username', read_only=True)
|
create_by_name = serializers.CharField(source='create_by.username', read_only=True)
|
||||||
|
|
@ -85,7 +85,7 @@ class VehicleUseSerializer(CustomModelSerializer):
|
||||||
extra_kwargs = {'belong_dept': {'required': True}}
|
extra_kwargs = {'belong_dept': {'required': True}}
|
||||||
|
|
||||||
def create(self, validated_data):
|
def create(self, validated_data):
|
||||||
vehreg = validated_data.pop('vehreg')
|
vehreg = validated_data.pop('vehiclereg')
|
||||||
slots = validated_data.pop('slots')
|
slots = validated_data.pop('slots')
|
||||||
vdate = validated_data.pop('vdate')
|
vdate = validated_data.pop('vdate')
|
||||||
vehicle_use = super().create(validated_data)
|
vehicle_use = super().create(validated_data)
|
||||||
|
|
@ -100,7 +100,7 @@ class VehicleUseSerializer(CustomModelSerializer):
|
||||||
return vehicle_use
|
return vehicle_use
|
||||||
|
|
||||||
def update(self, instance, validated_data):
|
def update(self, instance, validated_data):
|
||||||
vehreg = validated_data.pop('vehreg')
|
vehreg = validated_data.pop('vehiclereg')
|
||||||
slots = validated_data.pop('slots')
|
slots = validated_data.pop('slots')
|
||||||
vdate = validated_data.pop('vdate')
|
vdate = validated_data.pop('vdate')
|
||||||
vehicle_use = super().update(instance, validated_data)
|
vehicle_use = super().update(instance, validated_data)
|
||||||
|
|
@ -114,7 +114,7 @@ class VehicleUseSerializer(CustomModelSerializer):
|
||||||
VehicleSlot.objects.create(vehicle_use=vehicle_use, slot=slot, vdate=vdate, vehreg=vehreg, is_inuse=True)
|
VehicleSlot.objects.create(vehicle_use=vehicle_use, slot=slot, vdate=vdate, vehreg=vehreg, is_inuse=True)
|
||||||
return vehicle_use
|
return vehicle_use
|
||||||
|
|
||||||
|
|
||||||
class VehSlotSerializer(CustomModelSerializer):
|
class VehSlotSerializer(CustomModelSerializer):
|
||||||
veh_name = serializers.CharField(source='vehreg.name', read_only=True)
|
veh_name = serializers.CharField(source='vehreg.name', read_only=True)
|
||||||
class Meta:
|
class Meta:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue