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

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

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

@@ -20,47 +20,17 @@
       <el-form-item label="规格" prop="specification">
         <el-input v-model="queryParams.specification" placeholder="请输入规格" clearable />
       </el-form-item>
-      <!-- <el-form-item label="钢种/牌号" prop="steelGrade">
-        <el-input
-          v-model="queryParams.steelGrade"
-          placeholder="请输入钢种/牌号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="材质" prop="material">
+        <el-input v-model="queryParams.material" placeholder="请输入材质" clearable />
       </el-form-item>
-      <el-form-item label="目标冷轧牌号" prop="targetColdGrade">
-        <el-input
-          v-model="queryParams.targetColdGrade"
-          placeholder="请输入目标冷轧牌号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="厂家" prop="manufacturer">
+        <el-input v-model="queryParams.manufacturer" placeholder="请输入厂家" clearable />
       </el-form-item>
-      <el-form-item label="基础材质" prop="baseMaterialId">
-        <CategorySelect
-          v-model="queryParams.baseMaterialId"
-          category-type="base_material"
-          placeholder="请选择基础材质分类"
-          clearable
-        />
+      <el-form-item label="表面处理" prop="surfaceTreatmentDesc">
+        <el-input v-model="queryParams.surfaceTreatmentDesc" placeholder="请输入表面处理" clearable />
       </el-form-item>
-      <el-form-item label="表面处理" prop="surfaceTreatmentId">
-        <CategorySelect
-          v-model="queryParams.surfaceTreatmentId"
-          category-type="surface_treatment"
-          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 label="锌层" prop="zincLayer">
+        <el-input v-model="queryParams.zincLayer" placeholder="请输入锌层" clearable />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -118,33 +88,19 @@
       <el-table-column label="原材料类型名称" align="center" prop="rawMaterialName" />
       <el-table-column label="规格" align="center" prop="specification" />
       <el-table-column label="计量单位" align="center" prop="unit" />
-      <!-- <el-table-column label="钢种/牌号" align="center" prop="steelGrade" /> -->
-      <!-- <el-table-column label="目标冷轧牌号" align="center" prop="targetColdGrade" />
-      <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" prop="isEnabled">
-        <template slot-scope="scope">
-          <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" 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">
         <template slot-scope="scope">
           <BomInfoMini :bomId="scope.row.bomId" />
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <!-- <el-button size="mini" type="text" icon="el-icon-info" @click="showParamDetail(scope.row)">参数详情</el-button> -->
-          <el-button size="mini" type="text" icon="el-icon-plus" @click="handleBom(scope.row)">参数</el-button>
+          <!-- <el-button size="mini" type="text" icon="el-icon-plus" @click="handleBom(scope.row)">参数</el-button> -->
           <el-button
             size="mini"
             type="text"
@@ -157,12 +113,6 @@
             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> -->
         </template>
       </el-table-column>
     </KLPTable>
@@ -190,92 +140,21 @@
         <el-form-item label="计量单位" prop="unit">
           <el-input v-model="form.unit" placeholder="请输入计量单位" />
         </el-form-item>
-        <!-- <el-form-item label="钢种/牌号" prop="steelGrade">
-          <el-input v-model="form.steelGrade" placeholder="请输入钢种/牌号" />
+          <el-form-item label="材质" prop="material">
+          <el-input v-model="form.material" placeholder="请输入材质" />
         </el-form-item>
-        <el-form-item label="目标冷轧牌号" prop="targetColdGrade">
-          <el-input v-model="form.targetColdGrade" placeholder="请输入目标冷轧牌号" />
-        </el-form-item> -->
-        <!-- 基础材质分类和表面处理分类同一行 -->
-        <!-- <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="基础材质分类" prop="baseMaterialId">
-              <CategorySelect v-model="form.baseMaterialId" category-type="base_material" placeholder="请选择基础材质分类" clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="表面处理分类" prop="surfaceTreatmentId">
-              <CategorySelect v-model="form.surfaceTreatmentId" category-type="surface_treatment" placeholder="请选择表面处理分类" clearable />
-            </el-form-item>
-          </el-col>
-        </el-row> -->
 
-        <!-- <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-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item> -->
+        <el-form-item label="厂家" prop="manufacturer">
+          <el-input v-model="form.manufacturer" placeholder="请输入厂家" />
+        </el-form-item>
 
-        <!-- <el-collapse>
-          <el-collapse-item title="详细参数">
-            <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="thicknessDeviation">
-                  <el-input v-model="form.thicknessDeviation" placeholder="请输入厚度偏差" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <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="targetColdWidth">
-                  <el-input v-model="form.targetColdWidth" placeholder="请输入目标冷轧宽度" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="目标冷轧厚度" prop="targetColdThickness">
-                  <el-input v-model="form.targetColdThickness" placeholder="请输入目标冷轧厚度" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="凸度" prop="crown">
-                  <el-input v-model="form.crown" placeholder="请输入凸度" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="卷重" prop="coilWeight">
-                  <el-input v-model="form.coilWeight" placeholder="请输入卷重" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="表面质量" prop="surfaceQuality">
-                  <el-input v-model="form.surfaceQuality" placeholder="请输入表面质量" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-collapse-item>
-        </el-collapse> -->
+        <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-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -283,23 +162,9 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="参数详情" :visible.sync="paramDialogVisible" width="400px">
-      <el-descriptions v-if="paramRow" :column="1" border>
-        <el-descriptions-item label="厚度">{{ paramRow.thickness || '--' }}</el-descriptions-item>
-        <el-descriptions-item label="厚度偏差">{{ paramRow.thicknessDeviation || '--' }}</el-descriptions-item>
-        <el-descriptions-item label="宽度">{{ paramRow.width || '--' }}</el-descriptions-item>
-        <el-descriptions-item label="目标冷轧宽度">{{ paramRow.targetColdWidth || '--' }}</el-descriptions-item>
-        <el-descriptions-item label="目标冷轧厚度">{{ paramRow.targetColdThickness || '--' }}</el-descriptions-item>
-        <el-descriptions-item label="凸度">{{ paramRow.crown || '--' }}</el-descriptions-item>
-        <el-descriptions-item label="卷重">{{ paramRow.coilWeight || '--' }}</el-descriptions-item>
-        <el-descriptions-item label="表面质量">{{ paramRow.surfaceQuality || '--' }}</el-descriptions-item>
-        <!-- 其它参数可继续追加 -->
-      </el-descriptions>
-    </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="raw_material" @addBom="handleAddBom" :itemId="itemId" />
-    </el-dialog>
+    </el-dialog> -->
   </div>
 </template>
 
@@ -307,16 +172,16 @@
 import { listRawMaterial, getRawMaterial, delRawMaterial, addRawMaterial, updateRawMaterial, addRawMaterialWithBom } from "@/api/wms/rawMaterial";
 import CategorySelect from "@/components/KLPService/CategorySelect/index.vue";
 import CategoryRenderer from '@/components/KLPService/Renderer/CategoryRenderer.vue';
-import BomPanel from '@/views/wms/bom/components/BomPanel.vue';
-import BomInfoMini from '@/components/KLPService/Renderer/BomInfoMini.vue';
+// import BomPanel from '@/views/wms/bom/components/BomPanel.vue';
+// import BomInfoMini from '@/components/KLPService/Renderer/BomInfoMini.vue';
 
 export default {
   name: "RawMaterial",
   components: {
     CategorySelect,
     CategoryRenderer,
-    BomPanel,
-    BomInfoMini
+    // BomPanel,
+    // BomInfoMini
   },
   dicts: ['common_swicth'],
   data() {
@@ -369,6 +234,10 @@ export default {
         isEnabled: undefined,
         unit: undefined,
         specification: undefined,
+        material: undefined,
+        manufacturer: undefined,
+        surfaceTreatmentDesc: undefined,
+        zincLayer: undefined,
       },
       // 表单参数
       form: {},
@@ -452,6 +321,10 @@ export default {
         updateBy: undefined,
         specification: undefined,
         unit: '卷',
+        material: undefined,
+        manufacturer: undefined,
+        surfaceTreatmentDesc: undefined,
+        zincLayer: undefined,
       };
       this.resetForm("form");
     },