From 7e2fa8db8e1ee76fdf9b3c874094e7c976f640b7 Mon Sep 17 00:00:00 2001
From: dxc <duxingchen@iris-rs.cn>
Date: Tue, 24 Feb 2026 15:13:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=89=80=E5=B1=9E=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=EF=BC=8C=E5=90=8C=E6=97=B6=E4=BF=AE=E6=AD=A3=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB=E6=8E=92=E5=BA=8F=E4=BB=A5=E5=8F=8A=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E7=B1=BB=E5=88=AB=E9=80=89=E6=8B=A9=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inventory-backend/app/models/base.py          |   8 +-
 .../app/services/inbound/base_service.py      |  73 +++---
 inventory-web/src/App.vue                     |   2 +-
 inventory-web/src/views/material/list.vue     | 229 ++++++++++++++----
 4 files changed, 214 insertions(+), 98 deletions(-)

diff --git a/inventory-backend/app/models/base.py b/inventory-backend/app/models/base.py
index 20ea4fb..21e5210 100644
--- a/inventory-backend/app/models/base.py
+++ b/inventory-backend/app/models/base.py
@@ -12,6 +12,9 @@ class MaterialBase(db.Model):
 
     # 1. 基础字段
     id = db.Column(db.Integer, primary_key=True)
+    # [修改] 所属公司，去除了 default='IRIS'
+    company_name = db.Column(db.String(255), comment='所属公司')
+
     name = db.Column(db.String(255), nullable=False, comment='名称')
     common_name = db.Column(db.String(255), comment='俗名')
     category = db.Column(db.String(100), comment='类别')
@@ -42,8 +45,7 @@ class MaterialBase(db.Model):
     # 3. 关联成品库存 (StockProduct)
     stock_products = db.relationship('StockProduct', back_populates='base', lazy='dynamic')
 
-    # 4. 关联服务库存 (StockService) - [新增]
-    # 假设您的服务库存模型类名为 StockService，且有 base_id 外键
+    # 4. 关联服务库存 (StockService)
     stock_services = db.relationship('StockService', back_populates='base', lazy='dynamic')
 
     def to_dict(self):
@@ -65,6 +67,7 @@ class MaterialBase(db.Model):
 
         return {
             'id': self.id,
+            'companyName': self.company_name,
             'name': self.name,
             'commonName': self.common_name,
             'category': self.category,
@@ -72,7 +75,6 @@ class MaterialBase(db.Model):
             'spec': self.spec_model,
             'unit': self.unit,
             'visibilityLevel': self.visibility_level,
-            # 修改：解析为列表返回
             'generalManual': parse_list(self.manual_link),
             'generalImage': parse_list(self.product_image),
             'isEnabled': 1 if self.is_enabled else 0,
diff --git a/inventory-backend/app/services/inbound/base_service.py b/inventory-backend/app/services/inbound/base_service.py
index 12538b5..eecc8e2 100644
--- a/inventory-backend/app/services/inbound/base_service.py
+++ b/inventory-backend/app/services/inbound/base_service.py
@@ -4,7 +4,6 @@ from app.extensions import db
 from app.models.base import MaterialBase
 from app.models.inbound.buy import StockBuy
 from app.models.inbound.semi import StockSemi
-# 假设您有 StockProduct 和 StockService 的模型定义
 # from app.models.inbound.product import StockProduct
 # from app.models.inbound.service import StockService
 from sqlalchemy import or_
@@ -33,7 +32,9 @@ class MaterialBaseService:
                 or_(
                     MaterialBase.name.ilike(f'%{keyword}%'),
                     MaterialBase.common_name.ilike(f'%{keyword}%'),
-                    MaterialBase.spec_model.ilike(f'%{keyword}%')
+                    MaterialBase.spec_model.ilike(f'%{keyword}%'),
+                    # 支持搜索公司名
+                    MaterialBase.company_name.ilike(f'%{keyword}%')
                 )
             ).limit(20)
 
@@ -41,6 +42,7 @@ class MaterialBaseService:
             for item in query.all():
                 results.append({
                     'id': item.id,
+                    'companyName': item.company_name,
                     'name': item.name,
                     'commonName': item.common_name,
                     'spec': item.spec_model,
@@ -58,29 +60,21 @@ class MaterialBaseService:
     def _get_stock_counts(stock_query):
         """
         辅助函数：安全计算库存列表的总数量
-        修复逻辑：优先查找 'stock_quantity' (Buy/Semi/Product表中实际使用的字段)
         """
         total_inv = 0
         total_avail = 0
 
-        # 如果 stock_query 是动态加载的查询对象 (AppenderQuery)，需要迭代它
-        # 如果是列表，直接迭代
         try:
             items = list(stock_query)  # 触发查询
         except:
             items = []
 
         for x in items:
-            # 1. 获取库存数
-            # 【修复点】根据你提供的 Service 代码，Buy/Semi/Product 均使用 stock_quantity
-            # Service 使用 actual_quantity，这里做兼容查找
+            # 1. 获取库存数 (兼容不同字段名)
             q = getattr(x, 'stock_quantity', getattr(x, 'actual_quantity', getattr(x, 'quantity', 0)))
-
             # 2. 获取可用数
-            # 这里的字段名通常都是 available_quantity
             a = getattr(x, 'available_quantity', q)
 
-            # 累加 (转 float 防止 None 或 Decimal 计算报错)
             try:
                 total_inv += float(q if q is not None else 0)
                 total_avail += float(a if a is not None else 0)
@@ -93,13 +87,12 @@ class MaterialBaseService:
     def get_list(page, limit, filters=None):
         """
         获取基础信息列表 (带分页和筛选)
-        并聚合库存总数和可用总数
         """
         try:
             query = MaterialBase.query
 
             if filters:
-                # 1. 关键词模糊搜索 (名称 或 俗名 或 规格型号)
+                # 1. 关键词模糊搜索
                 if filters.get('keyword'):
                     kw = f"%{filters['keyword']}%"
                     query = query.filter(or_(
@@ -109,6 +102,10 @@ class MaterialBaseService:
                     ))
 
                 # 2. 精确筛选
+                # 公司筛选
+                if filters.get('company'):
+                    query = query.filter_by(company_name=filters['company'])
+
                 if filters.get('category'):
                     query = query.filter_by(category=filters['category'])
 
@@ -116,7 +113,6 @@ class MaterialBaseService:
                     query = query.filter_by(material_type=filters['type'])
 
                 if filters.get('isEnabled') is not None:
-                    # 前端传 1/0，转为 Boolean
                     is_active = bool(int(filters['isEnabled']))
                     query = query.filter_by(is_enabled=is_active)
 
@@ -125,25 +121,14 @@ class MaterialBaseService:
 
             items_list = []
             for item in pagination.items:
-                # 获取基础字典
                 item_dict = item.to_dict()
 
-                # [调用修复后的辅助函数]
-
-                # 1. 采购库存 (StockBuy)
+                # 聚合库存
                 buy_inv, buy_avail = MaterialBaseService._get_stock_counts(item.stock_buys)
-
-                # 2. 半成品库存 (StockSemi)
                 semi_inv, semi_avail = MaterialBaseService._get_stock_counts(item.stock_semis)
-
-                # 3. 成品库存 (StockProduct)
                 prod_inv, prod_avail = MaterialBaseService._get_stock_counts(item.stock_products)
-
-                # 4. 服务库存 (StockService)
-                # 使用 getattr 防止关联不存在时报错
                 serv_inv, serv_avail = MaterialBaseService._get_stock_counts(getattr(item, 'stock_services', []))
 
-                # 合并总数
                 item_dict['inventoryCount'] = buy_inv + semi_inv + prod_inv + serv_inv
                 item_dict['availableCount'] = buy_avail + semi_avail + prod_avail + serv_avail
 
@@ -159,37 +144,45 @@ class MaterialBaseService:
     @staticmethod
     def get_distinct_options():
         """
-        获取所有已存在的类别和类型 (去重)
-        用于前端下拉筛选
+        获取所有已存在的类别、类型、公司 (去重且排序)
         """
         try:
-            # 查询所有不为空的类别并去重
+            # 1. 类别 (获取后在内存或前端做层级处理，这里先按字母序返回扁平列表)
             categories = db.session.query(MaterialBase.category) \
                 .filter(MaterialBase.category != None, MaterialBase.category != '') \
                 .distinct().all()
 
-            # 查询所有不为空的类型并去重
+            # 对类别进行排序
+            sorted_categories = sorted([c[0] for c in categories])
+
+            # 2. 类型
             types = db.session.query(MaterialBase.material_type) \
                 .filter(MaterialBase.material_type != None, MaterialBase.material_type != '') \
                 .distinct().all()
+            sorted_types = sorted([t[0] for t in types])
+
+            # 3. 公司
+            companies = db.session.query(MaterialBase.company_name) \
+                .filter(MaterialBase.company_name != None, MaterialBase.company_name != '') \
+                .distinct().all()
+            sorted_companies = sorted([c[0] for c in companies])
 
             return {
-                "categories": [c[0] for c in categories],
-                "types": [t[0] for t in types]
+                "categories": sorted_categories,
+                "types": sorted_types,
+                "companies": sorted_companies
             }
         except Exception as e:
             traceback.print_exc()
-            return {"categories": [], "types": []}
+            return {"categories": [], "types": [], "companies": []}
 
     @staticmethod
     def create_material(data):
         """新增基础信息"""
         try:
-            # 0. 基础校验
             if not data.get('name') or not data.get('spec'):
                 raise ValueError("名称和规格型号不能为空")
 
-            # 1. 查重
             exist = MaterialBase.query.filter_by(
                 name=data['name'],
                 spec_model=data['spec']
@@ -197,8 +190,9 @@ class MaterialBaseService:
             if exist:
                 raise ValueError(f"已存在相同名称和规格的数据 (ID: {exist.id})")
 
-            # 2. 创建对象 (列表转JSON字符串)
             new_material = MaterialBase(
+                # [修改] 移除了 'IRIS' 默认值
+                company_name=data.get('companyName'),
                 name=data['name'],
                 common_name=data.get('commonName'),
                 spec_model=data['spec'],
@@ -206,7 +200,6 @@ class MaterialBaseService:
                 material_type=data.get('type'),
                 unit=data.get('unit'),
                 visibility_level=data.get('visibilityLevel'),
-                # 修改：将列表 dumps 为字符串
                 manual_link=json.dumps(data.get('generalManual', [])),
                 product_image=json.dumps(data.get('generalImage', [])),
                 is_enabled=True if data.get('isEnabled', 1) == 1 else False
@@ -229,6 +222,7 @@ class MaterialBaseService:
                 raise ValueError("数据不存在")
 
             # 更新字段
+            if 'companyName' in data: material.company_name = data['companyName']
             if 'name' in data: material.name = data['name']
             if 'commonName' in data: material.common_name = data['commonName']
             if 'spec' in data: material.spec_model = data['spec']
@@ -237,7 +231,6 @@ class MaterialBaseService:
             if 'unit' in data: material.unit = data['unit']
             if 'visibilityLevel' in data: material.visibility_level = data['visibilityLevel']
 
-            # 修改：将列表 dumps 为字符串
             if 'generalManual' in data:
                 material.manual_link = json.dumps(data['generalManual'])
             if 'generalImage' in data:
@@ -266,10 +259,6 @@ class MaterialBaseService:
             buy_usage_count = StockBuy.query.filter_by(base_id=m_id).count()
             semi_usage_count = StockSemi.query.filter_by(base_id=m_id).count()
 
-            # 如果需要检查成品和服务，可以解开注释
-            # from app.models.inbound.product import StockProduct
-            # prod_usage_count = StockProduct.query.filter_by(base_id=m_id).count()
-
             total_usage = buy_usage_count + semi_usage_count
 
             if total_usage > 0:
diff --git a/inventory-web/src/App.vue b/inventory-web/src/App.vue
index bf657bd..52c6f31 100644
--- a/inventory-web/src/App.vue
+++ b/inventory-web/src/App.vue
@@ -82,7 +82,7 @@ const handleLogout = () => {
     <footer v-if="!isLoginPage" class="app-footer">
       <span class="version-tag">
         <el-icon style="vertical-align: middle; margin-right: 4px"><InfoFilled /></el-icon>
-        当前版本: 1.1 Beta (测试版)
+        当前版本: 1.2 Beta (2.24修改版)
       </span>
     </footer>
   </div>
diff --git a/inventory-web/src/views/material/list.vue b/inventory-web/src/views/material/list.vue
index dae6349..025fddb 100644
--- a/inventory-web/src/views/material/list.vue
+++ b/inventory-web/src/views/material/list.vue
@@ -11,6 +11,18 @@
               @input="handleInputSearch"
           />
 
+          <el-select
+              v-model="queryParams.company"
+              placeholder="所属公司"
+              clearable
+              filterable
+              default-first-option
+              style="width: 120px; margin-right: 10px;"
+              @change="handleQuery"
+          >
+            <el-option v-for="item in companyOptions" :key="item" :label="item" :value="item" />
+          </el-select>
+
           <el-select
               v-model="queryParams.category"
               placeholder="类别"
@@ -81,6 +93,7 @@
                 列展示设置
               </div>
               <el-checkbox v-model="columns.id.visible" label="ID" />
+              <el-checkbox v-model="columns.companyName.visible" label="所属公司" />
               <el-checkbox v-model="columns.name.visible" label="名称" />
               <el-checkbox v-model="columns.commonName.visible" label="俗名" />
               <el-checkbox v-model="columns.category.visible" label="类别" />
@@ -105,6 +118,13 @@
           style="width: 100%; margin-top: 15px"
       >
         <el-table-column v-if="columns.id.visible" prop="id" label="ID" min-width="80" align="center" fixed="left" />
+
+        <el-table-column v-if="columns.companyName.visible" prop="companyName" label="所属公司" min-width="100" align="center" show-overflow-tooltip>
+          <template #default="scope">
+            <span>{{ scope.row.companyName || '-' }}</span>
+          </template>
+        </el-table-column>
+
         <el-table-column v-if="columns.name.visible" prop="name" label="名称" min-width="160" show-overflow-tooltip />
 
         <el-table-column v-if="columns.commonName.visible" prop="commonName" label="俗名" min-width="140" show-overflow-tooltip>
@@ -114,7 +134,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column v-if="columns.category.visible" prop="category" label="类别" min-width="120" align="center" show-overflow-tooltip>
+        <el-table-column v-if="columns.category.visible" prop="category" label="类别" min-width="140" show-overflow-tooltip>
           <template #default="scope">{{ scope.row.category || '-' }}</template>
         </el-table-column>
         <el-table-column v-if="columns.type.visible" prop="type" label="类型" min-width="120" align="center" show-overflow-tooltip>
@@ -196,19 +216,6 @@
         </el-table-column>
       </el-table>
 
-      <div style="margin-top: 20px; text-align: right;">
-        <el-pagination
-            background
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="total"
-            v-model:current-page="queryParams.pageNum"
-            v-model:page-size="queryParams.pageSize"
-            :page-sizes="[100, 200, 500, 1000]"
-            @size-change="getList"
-            @current-change="getList"
-        />
-      </div>
-
       <el-dialog
           v-model="dialog.visible"
           :title="dialog.title"
@@ -233,16 +240,44 @@
 
           <el-row>
             <el-col :span="12">
-              <el-form-item label="类别" prop="category">
+              <el-form-item label="所属公司" prop="companyName">
                 <el-autocomplete
-                    v-model="form.category"
-                    :fetch-suggestions="querySearchCategory"
-                    placeholder="可输入或选择"
+                    v-model="form.companyName"
+                    :fetch-suggestions="querySearchCompany"
+                    placeholder="请输入公司名称"
                     clearable
                     style="width: 100%"
                 />
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="类别" prop="category">
+                <div style="display: flex; width: 100%; align-items: center;">
+                  <el-cascader
+                      v-model="tempCategoryPrefix"
+                      :options="categoryTreeOptions"
+                      :props="{ expandTrigger: 'hover', checkStrictly: true, emitPath: true }"
+                      placeholder="选择前缀层级"
+                      filterable
+                      clearable
+                      style="width: 50%;"
+                  />
+                  <div style="padding: 0 8px; font-weight: bold; color: #909399;">/</div>
+                  <el-input
+                      v-model="tempCategorySuffix"
+                      placeholder="填写具体名称"
+                      clearable
+                      style="width: 50%;"
+                  />
+                </div>
+                <div style="font-size: 12px; color: #E6A23C; margin-top: 4px; line-height: 1.2;">
+                  * 必须构成4层结构 
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
             <el-col :span="12">
               <el-form-item label="类型" prop="type">
                 <el-autocomplete
@@ -254,26 +289,27 @@
                 />
               </el-form-item>
             </el-col>
-          </el-row>
-
-          <el-row>
             <el-col :span="12">
               <el-form-item label="规格型号" prop="spec">
                 <el-input v-model="form.spec" placeholder="请输入规格型号" />
               </el-form-item>
             </el-col>
+          </el-row>
+
+          <el-row>
             <el-col :span="12">
               <el-form-item label="计量单位" prop="unit">
                 <el-input v-model="form.unit" placeholder="如: 个, 台, 米" />
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="可见等级" prop="visibilityLevel">
+                <el-input-number v-model="form.visibilityLevel" :min="0" :max="9" label="等级" />
+                <span style="margin-left: 10px; color: #999; font-size: 12px;">(0低-9高)</span>
+              </el-form-item>
+            </el-col>
           </el-row>
 
-          <el-form-item label="可见等级" prop="visibilityLevel">
-            <el-input-number v-model="form.visibilityLevel" :min="0" :max="9" label="等级" />
-            <span style="margin-left: 10px; color: #999; font-size: 12px;">(0为最低，9为最高)</span>
-          </el-form-item>
-
           <el-form-item label="产品图" prop="generalImage">
             <div class="upload-container">
               <el-upload
@@ -361,9 +397,8 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, onMounted, nextTick } from 'vue';
+import { ref, reactive, onMounted, nextTick, computed } from 'vue';
 import { Plus, Picture, Document, Refresh, Setting, Rank, Camera, Link } from '@element-plus/icons-vue';
-// 修复：引入 ElLoading
 import { ElMessage, ElMessageBox, ElLoading } from 'element-plus';
 import type { FormInstance, FormRules } from 'element-plus';
 
@@ -372,7 +407,7 @@ import {
   addMaterialBase,
   updateMaterialBase,
   delMaterialBase,
-  getMaterialBaseOptions // 新增引入
+  getMaterialBaseOptions
 } from '@/api/material_base';
 import { uploadFile, deleteFile } from '@/api/common/upload';
 import WebRtcCamera from '@/components/Camera/WebRtcCamera.vue';
@@ -380,6 +415,7 @@ import WebRtcCamera from '@/components/Camera/WebRtcCamera.vue';
 // --- 类型定义 ---
 interface MaterialBaseVO {
   id: number;
+  companyName: string;
   name: string;
   commonName?: string;
   category: string;
@@ -391,7 +427,6 @@ interface MaterialBaseVO {
   generalImage: string[];
   isEnabled: number;
   statusLoading?: boolean;
-  // 新增字段
   inventoryCount?: number;
   availableCount?: number;
 }
@@ -402,9 +437,16 @@ interface QueryParams {
   keyword: string;
   category: string;
   type: string;
+  company: string;
   isEnabled?: number;
 }
 
+interface CascaderOption {
+  value: string;
+  label: string;
+  children?: CascaderOption[];
+}
+
 // --- 响应式数据 ---
 const loading = ref(false);
 const total = ref(0);
@@ -425,28 +467,35 @@ const currentCameraField = ref<'generalImage' | 'generalManual'>('generalImage')
 
 const columns = reactive({
   id: { visible: true },
+  companyName: { visible: true },
   name: { visible: true },
   commonName: { visible: true },
   category: { visible: true },
   type: { visible: true },
   spec: { visible: true },
   unit: { visible: true },
-  // visibilityLevel: { visible: false }, // 不再使用
-  inventory: { visible: true }, // 新增
-  available: { visible: true }, // 新增
+  inventory: { visible: true },
+  available: { visible: true },
   files: { visible: true },
   isEnabled: { visible: true }
 });
 
+const companyOptions = ref<string[]>([]);
 const categoryOptions = ref<string[]>([]);
 const typeOptions = ref<string[]>([]);
+const categoryTreeOptions = ref<CascaderOption[]>([]);
+
+// [修改] 将类别拆分为前后两部分进行绑定
+const tempCategoryPrefix = ref<string[]>([]); // 前缀部分 (Cascader)
+const tempCategorySuffix = ref<string>('');   // 后缀部分 (Input)
 
 const queryParams = reactive<QueryParams>({
   pageNum: 1,
-  pageSize: 100, // 修改默认显示条数为 100
+  pageSize: 100,
   keyword: '',
   category: '',
   type: '',
+  company: '',
   isEnabled: undefined
 });
 
@@ -460,6 +509,7 @@ const formRef = ref<FormInstance>();
 
 const initForm = {
   id: undefined,
+  companyName: '',
   name: '',
   commonName: '',
   category: '',
@@ -474,9 +524,40 @@ const initForm = {
 
 const form = ref({...initForm});
 
+// [新增] 自定义验证规则：确保拼合后的类别符合4层结构
+const validateCategoryLevel = (rule: any, value: any, callback: any) => {
+  // 实时计算拼合结果
+  const prefixStr = tempCategoryPrefix.value.join('/');
+  const suffixStr = tempCategorySuffix.value.trim();
+
+  // 如果两边都为空，报错
+  if (!prefixStr && !suffixStr) {
+    callback(new Error('请填写或选择类别'));
+    return;
+  }
+
+  // 拼合路径
+  let fullPath = '';
+  if (prefixStr && suffixStr) fullPath = prefixStr + '/' + suffixStr;
+  else if (prefixStr) fullPath = prefixStr;
+  else fullPath = suffixStr;
+
+  // 检查层级数量 (以 / 分割后的数组长度)
+  // 4层结构意味着有3个斜杠，例如 A/B/C/D => length 4
+  const levels = fullPath.split('/').filter(p => p.trim() !== '').length;
+
+  if (levels !== 4) {
+    callback(new Error(`必须严格满足4层结构，当前为 ${levels} 层`));
+  } else {
+    callback();
+  }
+};
+
 const rules = reactive<FormRules>({
   name: [{ required: true, message: '请输入基础信息名称', trigger: 'blur' }],
-  category: [{ required: true, message: '请选择或输入类别', trigger: 'change' }],
+  companyName: [{ required: true, message: '请输入公司名称', trigger: 'change' }],
+  // [修改] 使用自定义验证器
+  category: [{ required: true, validator: validateCategoryLevel, trigger: 'change' }],
   type: [{ required: true, message: '请选择或输入类型', trigger: 'change' }],
   spec: [{ required: true, message: '请输入规格型号', trigger: 'blur' }],
   unit: [{ required: true, message: '请输入单位', trigger: 'blur' }]
@@ -484,22 +565,46 @@ const rules = reactive<FormRules>({
 
 // --- 业务逻辑方法 ---
 
-// 获取所有选项（不再依赖当前页数据）
+const buildCategoryTree = (categories: string[]): CascaderOption[] => {
+  const root: CascaderOption[] = [];
+  categories.forEach(cat => {
+    if (!cat) return;
+    const parts = cat.split('/');
+    let currentLevel = root;
+    parts.forEach((part, index) => {
+      let existingNode = currentLevel.find(n => n.value === part);
+      if (!existingNode) {
+        existingNode = { value: part, label: part };
+        currentLevel.push(existingNode);
+      }
+      if (index < parts.length - 1) {
+        if (!existingNode.children) {
+          existingNode.children = [];
+        }
+        currentLevel = existingNode.children;
+      }
+    });
+  });
+  return root;
+};
+
 const getOptionsList = () => {
   getMaterialBaseOptions().then((res: any) => {
     if (res.code === 200) {
       categoryOptions.value = res.data.categories || [];
       typeOptions.value = res.data.types || [];
+      companyOptions.value = res.data.companies || [];
+      categoryTreeOptions.value = buildCategoryTree(categoryOptions.value);
     }
   }).catch(err => {
     console.error("获取筛选项失败", err);
   });
 };
 
-const querySearchCategory = (queryString: string, cb: any) => {
+const querySearchCompany = (queryString: string, cb: any) => {
   const results = queryString
-      ? categoryOptions.value.filter(item => item.toLowerCase().includes(queryString.toLowerCase()))
-      : categoryOptions.value;
+      ? companyOptions.value.filter(item => item.toLowerCase().includes(queryString.toLowerCase()))
+      : companyOptions.value;
   const formattedResults = results.map(item => ({ value: item }));
   cb(formattedResults);
 };
@@ -519,7 +624,6 @@ const getList = () => {
         if (response && response.data) {
           tableData.value = response.data.items;
           total.value = response.data.total;
-          // 移除 extractDynamicOptions 调用
         } else {
           tableData.value = [];
           total.value = 0;
@@ -552,6 +656,7 @@ const resetQuery = () => {
   queryParams.keyword = '';
   queryParams.category = '';
   queryParams.type = '';
+  queryParams.company = '';
   queryParams.isEnabled = undefined;
   handleQuery();
 };
@@ -572,17 +677,31 @@ const handleEdit = (row: MaterialBaseVO) => {
   dialog.visible = true;
 
   nextTick(() => {
-    // 基础字段赋值 - 深拷贝防止引用
-    Object.assign(form.value, JSON.parse(JSON.stringify(row)));
+    const data = JSON.parse(JSON.stringify(row));
+    Object.assign(form.value, data);
+
+    // [修改] 解析已有 category，拆分为 Prefix 和 Suffix
+    if (data.category) {
+      const parts = data.category.split('/');
+      if (parts.length > 0) {
+        // 取最后一部分作为 Suffix，其余作为 Prefix
+        tempCategorySuffix.value = parts.pop() || '';
+        tempCategoryPrefix.value = parts;
+      } else {
+        tempCategoryPrefix.value = [];
+        tempCategorySuffix.value = data.category;
+      }
+    } else {
+      tempCategoryPrefix.value = [];
+      tempCategorySuffix.value = '';
+    }
 
     // 初始化文件列表
     const images = row.generalImage || [];
     const manuals = row.generalManual || [];
 
-    // 分离图片文件和外部链接
     const imgFiles = images.filter(u => !isExternalLink(u));
     const imgLinks = images.filter(u => isExternalLink(u));
-
     const manualFiles = manuals.filter(u => !isExternalLink(u));
     const manualLinks = manuals.filter(u => isExternalLink(u));
 
@@ -619,23 +738,28 @@ const submitForm = async () => {
     if (valid) {
       submitLoading.value = true;
       try {
-        // 重复校验
         const isDuplicate = await checkDuplicate(form.value.name, form.value.spec);
         if (isDuplicate) {
           submitLoading.value = false;
           return;
         }
 
-        // 整理文件数据：本地上传的路径已经在 form.value 中
-        // 我们需要重新合并：已有的非外链 + 新的输入框外链
         const finalImageList = form.value.generalImage.filter(item => !isExternalLink(item));
         if (imageExternalUrl.value) finalImageList.push(imageExternalUrl.value);
 
         const finalManualList = form.value.generalManual.filter(item => !isExternalLink(item));
         if (manualExternalUrl.value) finalManualList.push(manualExternalUrl.value);
 
+        // [修改] 提交前组合字符串：Prefix + / + Suffix
+        const prefixStr = tempCategoryPrefix.value.join('/');
+        const suffixStr = tempCategorySuffix.value.trim();
+        let fullCategory = '';
+        if (prefixStr && suffixStr) fullCategory = prefixStr + '/' + suffixStr;
+        else fullCategory = prefixStr || suffixStr;
+
         const payload = {
           ...form.value,
+          category: fullCategory,
           generalImage: finalImageList,
           generalManual: finalManualList
         };
@@ -647,7 +771,6 @@ const submitForm = async () => {
         ElMessage.success(`${actionText}成功`);
         dialog.visible = false;
         getList();
-        // 提交成功后，刷新选项，以防有新的类别/类型被创建
         getOptionsList();
       } catch (error: any) {
         ElMessage.error(error.msg || '保存失败');
@@ -667,6 +790,11 @@ const resetForm = () => {
   form.value = JSON.parse(JSON.stringify(initForm));
   fileListImage.value = [];
   fileListManual.value = [];
+
+  // [修改] 重置前后缀
+  tempCategoryPrefix.value = [];
+  tempCategorySuffix.value = '';
+
   imageExternalUrl.value = '';
   manualExternalUrl.value = '';
   if (formRef.value) formRef.value.resetFields();
@@ -692,7 +820,6 @@ const handleDelete = (row: MaterialBaseVO) => {
       ElMessage.success("删除成功");
       if (tableData.value.length === 1 && queryParams.pageNum > 1) queryParams.pageNum--;
       getList();
-      // 删除后也刷新选项
       getOptionsList();
     });
   }).catch(() => {});
@@ -762,7 +889,6 @@ const triggerCamera = (field: 'generalImage' | 'generalManual') => {
 }
 
 const handleCameraConfirm = async (file: File) => {
-  console.log('✅ 父组件收到照片:', file.name)
   if (!beforeAvatarUpload(file)) {
     cameraDialogVisible.value = false;
     return;
@@ -770,7 +896,6 @@ const handleCameraConfirm = async (file: File) => {
   const formData = new FormData();
   formData.append('file', file);
 
-  // 修复点：使用 ElLoading
   const loadingInstance = ElLoading.service({ text: '照片上传中...', background: 'rgba(0, 0, 0, 0.7)' });
 
   try {
@@ -801,7 +926,7 @@ const handleCameraConfirm = async (file: File) => {
 
 onMounted(() => {
   getList();
-  getOptionsList(); // 初始化下拉选项
+  getOptionsList();
 });
 </script>