diff --git a/backend/apps/material/importers.py b/backend/apps/material/importers.py index 8c0092f..c2b7770 100644 --- a/backend/apps/material/importers.py +++ b/backend/apps/material/importers.py @@ -25,7 +25,7 @@ HEADER_ALIASES = { "material_category": ("细分种类", "材料分类"), "material_subcategory": ("材料子类", "材料子分类"), "material_name": ("材料名称",), - "unit_name": ("材料单位名称", "所属工厂", "品牌"), + "unit_name": ("供应商", "材料单位名称", "所属工厂", "品牌"), "factory_name": ("工厂全称", "生产工厂全称"), "stage": ("阶段",), "importance_level": ("重要等级",), diff --git a/backend/apps/material/migrations/0009_alter_material_factory_verbose_name.py b/backend/apps/material/migrations/0009_alter_material_factory_verbose_name.py new file mode 100644 index 0000000..0538ec1 --- /dev/null +++ b/backend/apps/material/migrations/0009_alter_material_factory_verbose_name.py @@ -0,0 +1,24 @@ +# 修改 Material.factory 的 verbose_name:材料单位名称 → 供应商 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('factory', '0004_rename_brand_to_short_name'), + ('material', '0008_populate_brand'), + ] + + operations = [ + migrations.AlterField( + model_name='material', + name='factory', + field=models.ForeignKey( + on_delete=models.deletion.CASCADE, + related_name='materials', + to='factory.factory', + verbose_name='供应商', + ), + ), + ] diff --git a/backend/apps/material/models.py b/backend/apps/material/models.py index c7d79b8..0c81f8f 100644 --- a/backend/apps/material/models.py +++ b/backend/apps/material/models.py @@ -86,7 +86,7 @@ class Material(models.Model): connection_method = models.CharField(max_length=255, blank=True, null=True, verbose_name='连接方式') construction_method = models.CharField(max_length=255, blank=True, null=True, verbose_name='施工工艺') limit_condition = models.TextField(blank=True, null=True, verbose_name='限制条件') - factory = models.ForeignKey('factory.Factory', on_delete=models.CASCADE, related_name='materials', verbose_name='材料单位名称') + factory = models.ForeignKey('factory.Factory', on_delete=models.CASCADE, related_name='materials', verbose_name='供应商') brand = models.ForeignKey('brand.Brand', on_delete=models.PROTECT, null=True, blank=True, related_name='materials', verbose_name='品牌') status = models.CharField(max_length=20, choices=STATUS_CHOICES, default='draft', verbose_name='状态') created_at = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') diff --git a/backend/apps/material/views.py b/backend/apps/material/views.py index 3521147..905f94a 100644 --- a/backend/apps/material/views.py +++ b/backend/apps/material/views.py @@ -355,7 +355,7 @@ class MaterialViewSet(ModelViewSet): worksheet.title = "材料" headers = [ "材料名称","材料大类", "细分种类", "材料子类", "阶段", "重要等级", - "落地项目", "对接人", "对接人联系方式", "经办人", "材料单位名称", "工厂全称", "规格型号", + "落地项目", "对接人", "对接人联系方式", "经办人", "供应商", "工厂全称", "规格型号", "符合标准", "应用场景", "应用说明", "替代材料类型", "竞争优势", "优势说明", "成本对比(%)", "成本说明", "案例", "质量等级", "耐久等级", "环保等级", "低碳等级", "总评分", "连接方式", "施工工艺", "限制条件", "备注", diff --git a/frontend/src/views/MaterialManage.vue b/frontend/src/views/MaterialManage.vue index 23630cc..a1c079d 100644 --- a/frontend/src/views/MaterialManage.vue +++ b/frontend/src/views/MaterialManage.vue @@ -44,7 +44,7 @@ - + @@ -202,7 +202,7 @@ - +