From 1245fb3da8d5c5323c1997466c02fb92f21f7d2b Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 23 Apr 2026 22:04:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9D=90=E6=96=99"=E6=9D=90=E6=96=99?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=90=8D=E7=A7=B0"=E6=96=87=E6=A1=88?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=94=B9=E4=B8=BA"=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 模型 verbose_name、Excel 导入别名（兼容历史表头）、导出表头、
  前端材料列表列和表单 label 一并同步

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 backend/apps/material/importers.py            |  2 +-
 ...009_alter_material_factory_verbose_name.py | 24 +++++++++++++++++++
 backend/apps/material/models.py               |  2 +-
 backend/apps/material/views.py                |  2 +-
 frontend/src/views/MaterialManage.vue         |  4 ++--
 5 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 backend/apps/material/migrations/0009_alter_material_factory_verbose_name.py

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 @@
       <el-table-column prop="contact_phone" label="对接人联系方式" width="130px"/>
       <el-table-column prop="handler" label="经办人" />
       <el-table-column prop="remark" label="备注" />
-      <el-table-column prop="factory_short_name" label="材料单位名称" />
+      <el-table-column prop="factory_short_name" label="供应商" />
       <el-table-column prop="brand_name" label="品牌" />
       <el-table-column prop="status_display" label="状态" width="120" />
       <el-table-column label="操作" width="320">
@@ -202,7 +202,7 @@
         <el-form-item label="限制条件">
           <el-input v-model="form.limit_condition" type="textarea" />
         </el-form-item>
-        <el-form-item label="材料单位名称" v-if="isAdmin">
+        <el-form-item label="供应商" v-if="isAdmin">
           <el-select v-model="form.factory">
             <el-option v-for="item in factories" :key="item.id" :label="item.short_name" :value="item.id" />
           </el-select>