From 6a443577b0b136c7498764e8cbbee9a779006fd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=87=E7=9D=BF=20=E5=BC=A0?= <zzz0217asdf@163.com>
Date: Thu, 17 Sep 2026 17:55:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0init.sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/Materials.vue | 12 ++++++++++--
 scripts/init.sql                 | 10 ++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/Materials.vue b/frontend/src/views/Materials.vue
index 82cf3245..b43d6bc5 100644
--- a/frontend/src/views/Materials.vue
+++ b/frontend/src/views/Materials.vue
@@ -46,7 +46,11 @@
       </el-table-column>
       <el-table-column prop="name" label="物料名称" />
       <el-table-column prop="spec" label="规格" />
-      <el-table-column prop="unit" label="单位" width="60" />
+      <el-table-column label="单位" width="60">
+        <template #default="{ row }">
+          {{ getUnitDisplay(row) }}
+        </template>
+      </el-table-column>
       <el-table-column
         label="操作"
         width="240"
@@ -111,7 +115,7 @@
         <el-descriptions-item label="规格">{{ detailRow.spec || '-' }}</el-descriptions-item>
         <el-descriptions-item label="大类类型">{{ getMajorCategoryDisplay(detailRow) }}</el-descriptions-item>
         <el-descriptions-item label="小类类型">{{ getMinorCategoryDisplay(detailRow) }}</el-descriptions-item>
-        <el-descriptions-item label="单位">{{ detailRow.unit }}</el-descriptions-item>
+        <el-descriptions-item label="单位">{{ getUnitDisplay(detailRow) }}</el-descriptions-item>
         <el-descriptions-item label="创建时间">{{ formatDate(detailRow.created_at) }}</el-descriptions-item>
         <el-descriptions-item label="更新时间" :span="2">{{ formatDate(detailRow.updated_at) }}</el-descriptions-item>
         <el-descriptions-item label="物料图片" :span="2">
@@ -214,6 +218,10 @@ function syncUnit(id) {
   form.unit = units.value.find(item => item.id === id)?.code || ''
 }
 
+function getUnitDisplay(row) {
+  return units.value.find(item => item.id === row.base_unit_id)?.name || row.unit || '-'
+}
+
 function handleSearch() {
   materialsStore.fetchMaterials(1, searchKeyword.value)
 }
diff --git a/scripts/init.sql b/scripts/init.sql
index bd12d656..5e5c3952 100644
--- a/scripts/init.sql
+++ b/scripts/init.sql
@@ -46,3 +46,13 @@ INSERT INTO material_categories (organization_id,code,name,parent_id,status)
 SELECT organization_id,CONCAT(code,'-02'),CONCAT(name,'·专用型'),id,status FROM material_categories WHERE parent_id IS NULL;
 INSERT INTO warehouses (id,organization_id,code,name,status) VALUES (1,1,'DEFAULT','默认仓库','active');
 INSERT INTO warehouse_locations (id,warehouse_id,code,name,status) VALUES (1,1,'MAIN','主库位','active');
+
+-- The repository is maintained on Windows. Normalize the UTF-8 seed literals
+-- after MySQL imports this file so they remain correct regardless of client codepage.
+UPDATE organizations SET name=CONVERT(BINARY CONVERT(name USING latin1) USING utf8mb4);
+UPDATE roles SET name=CONVERT(BINARY CONVERT(name USING latin1) USING utf8mb4);
+UPDATE permissions SET name=CONVERT(BINARY CONVERT(name USING latin1) USING utf8mb4);
+UPDATE material_types SET name=CONVERT(BINARY CONVERT(name USING latin1) USING utf8mb4);
+UPDATE material_categories SET name=CONVERT(BINARY CONVERT(name USING latin1) USING utf8mb4);
+UPDATE warehouses SET name=CONVERT(BINARY CONVERT(name USING latin1) USING utf8mb4);
+UPDATE warehouse_locations SET name=CONVERT(BINARY CONVERT(name USING latin1) USING utf8mb4);