diff --git a/backend/apps/authentication/models.py b/backend/apps/authentication/models.py index a829c02..176f364 100644 --- a/backend/apps/authentication/models.py +++ b/backend/apps/authentication/models.py @@ -19,6 +19,7 @@ class User(AbstractUser): verbose_name = '用户' verbose_name_plural = '用户' db_table = 'auth_user' + ordering = ['id'] def __str__(self): return f"{self.username} ({self.get_role_display()})" diff --git a/backend/apps/dictionary/models.py b/backend/apps/dictionary/models.py index c079d9a..01b4266 100644 --- a/backend/apps/dictionary/models.py +++ b/backend/apps/dictionary/models.py @@ -15,6 +15,7 @@ class Dictionary(models.Model): verbose_name_plural = '数据字典' db_table = 'dictionary' unique_together = ('type', 'value') + ordering = ['id'] def __str__(self): return f"{self.type} - {self.name}" diff --git a/backend/apps/factory/migrations/0002_make_dealer_name_optional.py b/backend/apps/factory/migrations/0002_make_dealer_name_optional.py new file mode 100644 index 0000000..362518f --- /dev/null +++ b/backend/apps/factory/migrations/0002_make_dealer_name_optional.py @@ -0,0 +1,22 @@ +# Generated by Django 4.2.7 on 2026-03-13 01:27 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('factory', '0001_initial'), + ] + + operations = [ + migrations.AlterModelOptions( + name='factory', + options={'ordering': ['id'], 'verbose_name': '工厂', 'verbose_name_plural': '工厂'}, + ), + migrations.AlterField( + model_name='factory', + name='dealer_name', + field=models.CharField(blank=True, max_length=255, null=True, verbose_name='经销商名称'), + ), + ] diff --git a/backend/apps/factory/models.py b/backend/apps/factory/models.py index 9d3a3a6..180bd41 100644 --- a/backend/apps/factory/models.py +++ b/backend/apps/factory/models.py @@ -4,7 +4,7 @@ class Factory(models.Model): """ 工厂模型 """ - dealer_name = models.CharField(max_length=255, verbose_name='经销商名称') + dealer_name = models.CharField(max_length=255, blank=True, null=True, verbose_name='经销商名称') product_category = models.CharField(max_length=255, blank=True, null=True, verbose_name='产品分类') factory_name = models.CharField(max_length=255, verbose_name='生产工厂全称') factory_short_name = models.CharField(max_length=100, verbose_name='工厂简称') @@ -20,6 +20,7 @@ class Factory(models.Model): verbose_name = '工厂' verbose_name_plural = '工厂' db_table = 'factory' + ordering = ['id'] def __str__(self): return self.factory_name diff --git a/backend/apps/factory/serializers.py b/backend/apps/factory/serializers.py index 9bf55e3..0052a70 100644 --- a/backend/apps/factory/serializers.py +++ b/backend/apps/factory/serializers.py @@ -28,4 +28,4 @@ class FactoryListSerializer(serializers.ModelSerializer): """ class Meta: model = Factory - fields = ['id', 'factory_name', 'factory_short_name', 'province', 'city'] + fields = ['id', 'factory_name', 'factory_short_name', 'province', 'city', 'dealer_name'] diff --git a/backend/apps/material/models.py b/backend/apps/material/models.py index 2deb703..f76683b 100644 --- a/backend/apps/material/models.py +++ b/backend/apps/material/models.py @@ -73,6 +73,7 @@ class Material(models.Model): verbose_name = '材料' verbose_name_plural = '材料' db_table = 'material' + ordering = ['id'] def __str__(self): return self.name @@ -91,6 +92,7 @@ class MaterialCategory(models.Model): verbose_name = '材料分类' verbose_name_plural = '材料分类' db_table = 'material_category' + ordering = ['id'] def __str__(self): return self.name @@ -110,6 +112,7 @@ class MaterialSubcategory(models.Model): verbose_name = '材料子分类' verbose_name_plural = '材料子分类' db_table = 'material_subcategory' + ordering = ['id'] def __str__(self): return self.name diff --git a/backend/apps/material/views.py b/backend/apps/material/views.py index 34304b1..37f2d91 100644 --- a/backend/apps/material/views.py +++ b/backend/apps/material/views.py @@ -202,7 +202,7 @@ class MaterialCategoryViewSet(ModelViewSet): """ 材料分类视图集 """ - queryset = MaterialCategory.objects.all().order_by('id') + queryset = MaterialCategory.objects.all() serializer_class = MaterialCategorySerializer permission_classes = [IsAuthenticated] @@ -226,7 +226,7 @@ class MaterialSubcategoryViewSet(ModelViewSet): """ 材料子分类视图集 """ - queryset = MaterialSubcategory.objects.select_related('category').all().order_by('id') + queryset = MaterialSubcategory.objects.select_related('category').all() serializer_class = MaterialSubcategorySerializer permission_classes = [IsAuthenticated] diff --git a/frontend/src/views/FactoryManage.vue b/frontend/src/views/FactoryManage.vue index abecbde..a4bab00 100644 --- a/frontend/src/views/FactoryManage.vue +++ b/frontend/src/views/FactoryManage.vue @@ -1,4 +1,4 @@ -