refactor(产品/原材料): 重构产品及原材料信息展示与存储方式

移除BOM相关依赖，将材质、表面处理等属性直接存储在实体中
优化信息展示格式，统一使用方括号表示规格
调整表单字段，简化查询条件

klp-ui/src/views/wms/product/index.vue

@@ -2,20 +2,10 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="产品编号" prop="productCode">
-        <el-input
-          v-model="queryParams.productCode"
-          placeholder="请输入产品编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.productCode" placeholder="请输入产品编号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="产品名称" prop="productName">
-        <el-input
-          v-model="queryParams.productName"
-          placeholder="请输入产品名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.productName" placeholder="请输入产品名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="负责人" prop="salesManager">
         <el-input v-model="queryParams.owner" :multiple="false" placeholder="请填写负责人" />
@@ -23,28 +13,18 @@
       <el-form-item label="规格" prop="specification">
         <el-input v-model="queryParams.specification" placeholder="请输入规格" clearable />
       </el-form-item>
-      <!-- <el-form-item label="基础材质" prop="baseMaterialId">
-        <CategorySelect v-model="queryParams.baseMaterialId" categoryType="base_material" placeholder="请选择基础材质分类" clearable />
+      <el-form-item label="材质" prop="material">
+        <el-input v-model="queryParams.material" placeholder="请输入材质" clearable />
       </el-form-item>
-      <el-form-item label="表面处理" prop="surfaceTreatmentId">
-        <CategorySelect v-model="queryParams.surfaceTreatmentId" categoryType="surface_treatment" placeholder="请选择表面处理分类" clearable />
+      <el-form-item label="厂家" prop="manufacturer">
+        <el-input v-model="queryParams.manufacturer" placeholder="请输入厂家" clearable />
       </el-form-item>
-      <el-form-item label="客户需求" prop="customerReqId">
-        <CategorySelect v-model="queryParams.customerReqId" categoryType="customer_req" placeholder="请选择客户需求分类" clearable />
+      <el-form-item label="表面处理" prop="surfaceTreatmentDesc">
+        <el-input v-model="queryParams.surfaceTreatmentDesc" placeholder="请输入表面处理" clearable />
       </el-form-item>
-      <el-form-item label="包装方式" prop="packagingId">
-        <CategorySelect v-model="queryParams.packagingId" categoryType="spec_packaging" placeholder="请选择包装分类" clearable />
+      <el-form-item label="锌层" prop="zincLayer">
+        <el-input v-model="queryParams.zincLayer" placeholder="请输入锌层" clearable />
       </el-form-item>
-      <el-form-item label="是否启用" prop="isEnabled">
-        <el-select v-model="queryParams.isEnabled" placeholder="请选择是否启用" clearable>
-          <el-option
-            v-for="dict in dict.type.common_swicth"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -53,43 +33,18 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"  
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
+          @click="handleUpdate">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete" 
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+          @click="handleDelete">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"   
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -100,163 +55,72 @@
       <el-table-column label="产品类型名称" align="center" prop="productName" />
       <el-table-column label="负责人" align="center" prop="owner" />
       <el-table-column label="规格" align="center" prop="specification" />
-      <!-- <el-table-column label="基础材质" align="center">
-        <template slot-scope="scope">
-          <CategoryRenderer :category-id="scope.row.baseMaterialId" />
-        </template>
-      </el-table-column>
-      <el-table-column label="表面处理" align="center">
-        <template slot-scope="scope">
-          <CategoryRenderer :category-id="scope.row.surfaceTreatmentId" />
-        </template>
-      </el-table-column>
-      <el-table-column label="客户需求" align="center">
-        <template slot-scope="scope">
-          <CategoryRenderer :category-id="scope.row.customerReqId" />
-        </template>
-      </el-table-column>
-      <el-table-column label="包装方式" align="center">
-        <template slot-scope="scope">
-          <CategoryRenderer :category-id="scope.row.packagingId" />
-        </template>
-      </el-table-column>
-      <el-table-column label="厚度" align="center" prop="thickness" />
-      <el-table-column label="宽度" align="center" prop="width" />
-      <el-table-column label="内径" align="center" prop="innerDiameter" /> -->
+      <el-table-column label="材质" align="center" prop="material" />
+      <el-table-column label="厂家" align="center" prop="manufacturer" />
+      <el-table-column label="表面处理" align="center" prop="surfaceTreatmentDesc" />
+      <el-table-column label="锌层" align="center" prop="zincLayer" />
       <el-table-column label="计量单位" align="center" prop="unit" />
       <el-table-column label="是否启用" align="center" prop="isEnabled">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.common_swicth" :value="scope.row.isEnabled"/>
+          <dict-tag :options="dict.type.common_swicth" :value="scope.row.isEnabled" />
         </template>
       </el-table-column>
-      <el-table-column label="参数" align="center">
+      <!-- <el-table-column label="参数" align="center">
         <template slot-scope="scope">
           <BomInfoMini :bomId="scope.row.bomId" />
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="操作" align="center">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-          <!-- <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-document"
-            @click="goLedger(scope.row)"
-          >台账</el-button> -->
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-data-analysis"
-            @click="handleBom(scope.row)"
-          >参数</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+          <!-- <el-button size="mini" type="text" icon="el-icon-data-analysis" @click="handleBom(scope.row)">参数</el-button> -->
         </template>
       </el-table-column>
     </KLPTable>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改产品对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="400px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <!-- <el-divider>基础信息</el-divider> -->
-        <!-- <el-row :gutter="20">
-          <el-col :span="12"> -->
-            <el-form-item label="产品编号" prop="productCode">
-              <el-input v-model="form.productCode" placeholder="请输入产品编号" />
-            </el-form-item>
-          <!-- </el-col>
-          <el-col :span="12"> -->
-            <el-form-item label="产品名称" prop="productName">
-              <el-input v-model="form.productName" placeholder="请输入产品名称" />
-            </el-form-item>
-          <!-- </el-col>
-          <el-col :span="12"> -->
-            <el-form-item label="负责人" prop="owner">
-              <el-input v-model="form.owner" :multiple="false" placeholder="请填写负责人" />
-            </el-form-item>
-          <!-- </el-col>
-          <el-col :span="12"> -->
-            <el-form-item label="计量单位" prop="unit">
-              <el-input v-model="form.unit" placeholder="请输入计量单位" />
-            </el-form-item>
+        <el-form-item label="产品编号" prop="productCode">
+          <el-input v-model="form.productCode" placeholder="请输入产品编号" />
+        </el-form-item>
 
-            <el-form-item label="规格" prop="specification">
-              <el-input v-model="form.specification" placeholder="请输入规格" />
-            </el-form-item>
-          <!-- </el-col>
-        </el-row> -->
+        <el-form-item label="产品名称" prop="productName">
+          <el-input v-model="form.productName" placeholder="请输入产品名称" />
+        </el-form-item>
 
-        <!-- <el-divider>分类信息</el-divider>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="基础材质" prop="baseMaterialId">
-              <CategorySelect v-model="form.baseMaterialId" categoryType="base_material" placeholder="请选择基础材质分类" clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="表面处理" prop="surfaceTreatmentId">
-              <CategorySelect v-model="form.surfaceTreatmentId" categoryType="surface_treatment" placeholder="请选择表面处理分类" clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="客户需求" prop="customerReqId">
-              <CategorySelect v-model="form.customerReqId" categoryType="customer_req" placeholder="请选择客户需求分类" clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="包装方式" prop="packagingId">
-              <CategorySelect v-model="form.packagingId" categoryType="spec_packaging" placeholder="请选择包装分类" clearable />
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <el-form-item label="负责人" prop="owner">
+          <el-input v-model="form.owner" :multiple="false" placeholder="请填写负责人" />
+        </el-form-item>
+
+        <el-form-item label="计量单位" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入计量单位" />
+        </el-form-item>
+
+        <el-form-item label="规格" prop="specification">
+          <el-input v-model="form.specification" placeholder="请输入规格" />
+        </el-form-item>
+
+        <el-form-item label="材质" prop="material">
+          <el-input v-model="form.material" placeholder="请输入材质" />
+        </el-form-item>
+
+        <el-form-item label="厂家" prop="manufacturer">
+          <el-input v-model="form.manufacturer" placeholder="请输入厂家" />
+        </el-form-item>
+
+        <el-form-item label="表面处理" prop="surfaceTreatmentDesc">
+          <el-input v-model="form.surfaceTreatmentDesc" placeholder="请输入表面处理" />
+        </el-form-item>
+
+        <el-form-item label="锌层" prop="zincLayer">
+          <el-input v-model="form.zincLayer" placeholder="请输入锌层" />
+        </el-form-item>
 
-        <el-divider>参数信息</el-divider>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="厚度" prop="thickness">
-              <el-input v-model="form.thickness" placeholder="请输入厚度" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="宽度" prop="width">
-              <el-input v-model="form.width" placeholder="请输入宽度" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="内径" prop="innerDiameter">
-              <el-input v-model="form.innerDiameter" placeholder="请输入内径" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="是否启用" prop="isEnabled">
-              <el-select v-model="form.isEnabled" placeholder="请选择是否启用" clearable>
-                <el-option
-                  v-for="dict in dict.type.common_swicth"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -264,9 +128,10 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="参数" @close="bomDialogVisible = false" :visible.sync="bomDialogVisible" width="600px" append-to-body>
+    <!-- <el-dialog title="参数" @close="bomDialogVisible = false" :visible.sync="bomDialogVisible" width="600px"
+      append-to-body>
       <BomPanel :id="bomId" type="product" @addBom="handleAddBom" :itemId="itemId" />
-    </el-dialog>
+    </el-dialog> -->
   </div>
 </template>
 
@@ -275,8 +140,8 @@ import { listProduct, getProduct, delProduct, addProduct, updateProduct, addProd
 import CategorySelect from '@/components/KLPService/CategorySelect';
 import CategoryRenderer from '@/components/KLPService/Renderer/CategoryRenderer.vue';
 import UserSelect from '@/components/KLPService/UserSelect';
-import BomPanel from '../bom/components/BomPanel.vue';
-import BomInfoMini from '@/components/KLPService/Renderer/BomInfoMini.vue';
+// import BomPanel from '../bom/components/BomPanel.vue';
+// import BomInfoMini from '@/components/KLPService/Renderer/BomInfoMini.vue';
 
 export default {
   name: "Product",
@@ -284,8 +149,8 @@ export default {
     CategorySelect,
     CategoryRenderer,
     UserSelect,
-    BomPanel,
-    BomInfoMini
+    // BomPanel,
+    // BomInfoMini
   },
   dicts: ['common_swicth'],
   data() {
@@ -327,6 +192,10 @@ export default {
         innerDiameter: undefined,
         specification: undefined,
         isEnabled: undefined,
+        material: undefined,
+        manufacturer: undefined,
+        surfaceTreatmentDesc: undefined,
+        zincLayer: undefined,
       },
       // 表单参数
       form: {},
@@ -392,6 +261,10 @@ export default {
         updateBy: undefined,
         type: undefined,
         specification: undefined,
+        material: undefined,
+        manufacturer: undefined,
+        surfaceTreatmentDesc: undefined,
+        zincLayer: undefined,
       };
       this.resetForm("form");
     },
@@ -422,7 +295,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.productId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */