zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: ofm 修改车辆model 字段

This commit is contained in:
TianyangZhang 2025-11-18 15:40:13 +08:00
parent 362497af37
commit f3daa9fe91
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/ofm/migrations/0002_remove_vehicleuse_vehiclereg.py Normal file
View File

@ -0,0 +1,17 @@
# Generated by Django 3.2.12 on 2025-11-18 07:39
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('ofm', '0001_initial'),
]
operations = [
migrations.RemoveField(
model_name='vehicleuse',
name='vehiclereg',
),
]

1
apps/ofm/models.py
View File

@ -55,7 +55,6 @@ class VehicleReg(CommonADModel):
class VehicleUse(CommonBDModel): class VehicleUse(CommonBDModel):
"""TN: 用车记录""" """TN: 用车记录"""
vehiclereg = models.ForeignKey(VehicleReg, on_delete=models.CASCADE, related_name="vehicle_record", null=True, blank=True)
location = models.CharField('出发地点', null=True, blank=True, max_length=100) location = models.CharField('出发地点', null=True, blank=True, max_length=100)
via = models.CharField('途经地点', null=True, blank=True, max_length=100) via = models.CharField('途经地点', null=True, blank=True, max_length=100)
destination = models.CharField('到达地点', null=True, blank=True, max_length=100) destination = models.CharField('到达地点', null=True, blank=True, max_length=100)

6
apps/ofm/serializers.py
View File

@ -71,7 +71,7 @@ class VehicleRecordSerializer(CustomModelSerializer):
class VehicleUseSerializer(CustomModelSerializer): class VehicleUseSerializer(CustomModelSerializer):
vehiclereg = serializers.PrimaryKeyRelatedField(queryset=VehicleReg.objects.all(), write_only=True, label="车辆信息") vehreg = 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('vehiclereg') vehreg = validated_data.pop('vehreg')
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('vehiclereg') vehreg = validated_data.pop('vehreg')
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)