From f3daa9fe9140802641ac5d1f1f45a0193a27b399 Mon Sep 17 00:00:00 2001 From: TianyangZhang Date: Tue, 18 Nov 2025 15:40:13 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20ofm=20=E4=BF=AE=E6=94=B9=E8=BD=A6?= =?UTF-8?q?=E8=BE=86model=20=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0002_remove_vehicleuse_vehiclereg.py | 17 +++++++++++++++++ apps/ofm/models.py | 1 - apps/ofm/serializers.py | 6 +++--- 3 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 apps/ofm/migrations/0002_remove_vehicleuse_vehiclereg.py diff --git a/apps/ofm/migrations/0002_remove_vehicleuse_vehiclereg.py b/apps/ofm/migrations/0002_remove_vehicleuse_vehiclereg.py new file mode 100644 index 00000000..553dc1d1 --- /dev/null +++ b/apps/ofm/migrations/0002_remove_vehicleuse_vehiclereg.py @@ -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', + ), + ] diff --git a/apps/ofm/models.py b/apps/ofm/models.py index 379f57bf..6d5881cc 100644 --- a/apps/ofm/models.py +++ b/apps/ofm/models.py @@ -55,7 +55,6 @@ class VehicleReg(CommonADModel): class VehicleUse(CommonBDModel): """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) via = models.CharField('途经地点', null=True, blank=True, max_length=100) destination = models.CharField('到达地点', null=True, blank=True, max_length=100) diff --git a/apps/ofm/serializers.py b/apps/ofm/serializers.py index fe6bfcfc..8152d876 100644 --- a/apps/ofm/serializers.py +++ b/apps/ofm/serializers.py @@ -71,7 +71,7 @@ class VehicleRecordSerializer(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="预订日期") slots = serializers.ListField(child=serializers.IntegerField(), write_only=True, label="时段索引") 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}} def create(self, validated_data): - vehreg = validated_data.pop('vehiclereg') + vehreg = validated_data.pop('vehreg') slots = validated_data.pop('slots') vdate = validated_data.pop('vdate') vehicle_use = super().create(validated_data) @@ -100,7 +100,7 @@ class VehicleUseSerializer(CustomModelSerializer): return vehicle_use def update(self, instance, validated_data): - vehreg = validated_data.pop('vehiclereg') + vehreg = validated_data.pop('vehreg') slots = validated_data.pop('slots') vdate = validated_data.pop('vdate') vehicle_use = super().update(instance, validated_data)