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

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

klp-ui/src/components/KLPService/ProductSelect/index.vue

@@ -147,39 +147,32 @@ export default {
     },
     getLabel(item) {
       // 产品名称[规格](参数)，如果有则写，没有则省略
-      if (!item.specification) {
+      const sku = this.getSku(item);
-        return `${item.productName}(${this.getSku(item)})`
+      let str = item.productName;
+      if (item.specification) {
+        str += `[${item.specification}]`
       }
-      return `${item.productName}[${item.specification}](${this.getSku(item)})`
+
+      if (sku) {
+        str += `(${sku})`
+      }
+      return str;
     },
     getSku(item) {
-      const boms = item.bomItems || [];
+      // 查询item的材质(material),表面处理(surfaceTreatmentDesc),厂家(manufacturer),锌层(zincLayer),如果有则添加到sku字符串中
-      console.log(boms, '产品参数');
-      if (!boms.length) {
-        return '暂无参数信息';
-      }
-      // 查找attrKey为'规格'的attrvalue
-      const specification = boms.find(p => p.attrKey === '规格');
-
-      // 查找attrKey为'表面处理'的attrvalue
-      const factory = boms.find(p => p.attrKey === '表面处理');
-
-      // 查找attrKey为'材质'的attrvalue
-      const material = boms.find(p => p.attrKey === '材质');
-
-
-      // 组合sku:
       let sku = '';
-      if (specification) {
+      if (item.material) {
-        sku += '规格：' + specification.attrValue + '；';
+        sku += '材质：' + item.material + '；';
       }
-      if (factory) {
+      if (item.surfaceTreatmentDesc) {
-        sku += '表面处理：' + factory.attrValue + '；';
+        sku += '表面处理：' + item.surfaceTreatmentDesc + '；';
       }
-      if (material) {
+      if (item.manufacturer) {
-        sku += '材质：' + material.attrValue + '；';
+        sku += '厂家：' + item.manufacturer + '；';
+      }
+      if (item.zincLayer) {
+        sku += '锌层：' + item.zincLayer + '；';
       }
-      console.log(sku, item, boms, '产品参数');
       return sku;
     },
     onChange(val) {

klp-ui/src/components/KLPService/RawMaterialSelect/index.vue

@@ -151,38 +151,34 @@ export default {
     },
     getLabel(item) {
       // 原材料名称[规格](参数)，如果有则写，没有则省略
-      if (!item.specification) {
+
-        return `${item.rawMaterialName}(${this.getSku(item)})`
+      // 如果有sku拼接(sku), 有规格则拼接[规格], 否则只拼接原材料名称
+      const sku = this.getSku(item);
+      let str = item.rawMaterialName;
+      if (item.specification) {
+        str += `[${item.specification}]`
       }
-      return `${item.rawMaterialName}[${item.specification}](${this.getSku(item)})`
+
+      if (sku) {
+        str += `(${sku})`
+      }
+      return str;
     },
     getSku(item) {
-      const boms = item.bomItems;
+      // 查询item的材质(material),表面处理(surfaceTreatmentDesc),厂家(manufacturer),锌层(zincLayer),如果有则添加到sku字符串中
-      if (!boms || boms.length === 0) {
-        return '暂无参数信息';
-      }
-      // 查找attrKey为'规格'的attrvalue
-      const specification = boms.find(p => p.attrKey === '规格');
-    
-      // 查找attrKey为'厂家'的attrvalue
-      const factory = boms.find(p => p.attrKey === '厂家');
-      
-      // 查找attrKey为'材质'的attrvalue
-      const material = boms.find(p => p.attrKey === '材质');
-      
-      console.log(boms, item, '查找bomItems');
-      // 组合sku:
       let sku = '';
-      if (specification) {
+      if (item.material) {
-        sku += '规格：' + specification.attrValue + '；';
+        sku += '材质：' + item.material + '；';
       }
-      if (factory) {
+      if (item.surfaceTreatmentDesc) {
-        sku += '厂家：' + factory.attrValue + '；';
+        sku += '表面处理：' + item.surfaceTreatmentDesc + '；';
       }
-      if (material) {
+      if (item.manufacturer) {
-        sku += '材质：' + material.attrValue;
+        sku += '厂家：' + item.manufacturer + '；';
+      }
+      if (item.zincLayer) {
+        sku += '锌层：' + item.zincLayer + '；';
       }
-      console.log(sku, '组合sku');
       return sku;
     },
     add() {

klp-ui/src/components/KLPService/Renderer/ProductInfo.vue

@@ -13,9 +13,9 @@
       append-to-body
     >
       <el-descriptions :column="1" border>
-        <el-descriptions-item label="产品ID">
+        <!-- <el-descriptions-item label="产品ID">
           {{ product.productId || '--' }}
-        </el-descriptions-item>
+        </el-descriptions-item> -->
         <el-descriptions-item label="产品名称">
           {{ product.productName || '--' }}
         </el-descriptions-item>
@@ -25,8 +25,23 @@
         <el-descriptions-item label="规格">
           {{ product.specification || '--' }}
         </el-descriptions-item>
+        <el-descriptions-item label="材质">
+          {{ product.material || '--' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="表面处理">
+          {{ product.surfaceTreatment || '--' }}
+        </el-descriptions-item>
+        <!-- 锌层 -->
+        <el-descriptions-item label="锌层">
+          {{ product.zincLayer || '--' }}
+        </el-descriptions-item>
+        <!-- 厂家 -->
+        <el-descriptions-item label="厂家">
+          {{ product.manufacturer || '--' }}
+        </el-descriptions-item>
+
       </el-descriptions>
-      <BomInfo :bomId="product.bomId" />
+      <!-- <BomInfo :bomId="product.bomId" /> -->
     </el-dialog>
   </div>
 </template>

klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue

@@ -13,8 +13,22 @@
         <el-descriptions-item label="原材料名称">{{ material.rawMaterialName }}</el-descriptions-item>
         <el-descriptions-item label="原材料编码">{{ material.rawMaterialCode }}</el-descriptions-item>
         <el-descriptions-item label="规格">{{ material.specification }}</el-descriptions-item>
+        <el-descriptions-item label="材质">
+          {{ material.material || '--' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="表面处理">
+          {{ material.surfaceTreatment || '--' }}
+        </el-descriptions-item>
+        <!-- 锌层 -->
+        <el-descriptions-item label="锌层">
+          {{ material.zincLayer || '--' }}
+        </el-descriptions-item>
+        <!-- 厂家 -->
+        <el-descriptions-item label="厂家">
+          {{ material.manufacturer || '--' }}
+        </el-descriptions-item>
       </el-descriptions>
-      <BomInfo :bomId="material.bomId" />
+      <!-- <BomInfo :bomId="material.bomId" /> -->
     </el-dialog>
   </div>
 </template>

klp-ui/src/store/modules/category.js

@@ -1,6 +1,6 @@
 import { listCategory } from '@/api/wms/category';
-import { listProductWithBom } from '@/api/wms/product';
+import { listProduct } from '@/api/wms/product';
-import { listRawMaterialWithBom } from '@/api/wms/rawMaterial';
+import { listRawMaterial } from '@/api/wms/rawMaterial';
 import { listBomItem } from '@/api/wms/bomItem';
 
 // 目前存在一个问题，当新增或删除，修改分类、产品、物料时，需要刷新整个页面，才能看到最新的数据
@@ -51,7 +51,7 @@ const actions = {
     if (Object.keys(state.productMap).length > 0) {
       return Promise.resolve(state.productMap);
     }
-    return listProductWithBom({ pageNum: 1, pageSize: 10000 }).then(res => {
+    return listProduct({ pageNum: 1, pageSize: 10000 }).then(res => {
       const map = {};
       res.rows.forEach(item => {
         map[item.productId] = item;
@@ -65,7 +65,7 @@ const actions = {
     if (Object.keys(state.rawMaterialMap).length > 0) {
       return Promise.resolve(state.rawMaterialMap);
     }
-    return listRawMaterialWithBom({ pageNum: 1, pageSize: 10000 }).then(res => {
+    return listRawMaterial({ pageNum: 1, pageSize: 10000 }).then(res => {
       const map = {};
       res.rows.forEach(item => {
         map[item.rawMaterialId] = item;

klp-ui/src/views/wms/coil/panels/base.vue

@@ -86,12 +86,12 @@
         <template slot-scope="scope">
           <ProductInfo v-if="scope.row.itemType == 'product'" :productId="scope.row.itemId">
             <template slot-scope="{ product }">
-              {{ product.productName }}({{ product.productCode }})
+              {{ product.productName }}[{{ product.specification }}]
             </template>
           </ProductInfo>
           <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :materialId="scope.row.itemId">
             <template slot-scope="{ material }">
-              {{ material.rawMaterialName }}({{ material.rawMaterialCode }})
+              {{ material.rawMaterialName }}[{{ material.specification }}]
             </template>
           </RawMaterialInfo>
         </template>
@@ -181,7 +181,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="入场钢卷号" prop="enterCoilNo">
-          <el-input v-model="form.enterCoilNo" placeholder="请输入入场钢卷号" disabled />
+          <el-input v-model="form.enterCoilNo" placeholder="请输入入场钢卷号" :disabled="form.coilId" />
         </el-form-item>
         <el-form-item label="当前钢卷号" prop="currentCoilNo">
           <el-input v-model="form.currentCoilNo" placeholder="请输入当前钢卷号" />
@@ -199,20 +199,20 @@
         <el-form-item label="班组" prop="team">
           <el-input v-model="form.team" placeholder="请输入班组" />
         </el-form-item>
-        <!-- <el-form-item label="材料类型" prop="materialType">
+        <el-form-item label="材料类型" prop="materialType" v-if="!form.coilId">
           <el-select v-model="form.materialType" placeholder="请选择材料类型" @change="handleMaterialTypeChange">
             <el-option label="成品" value="成品" />
             <el-option label="原料" value="原料" />
             <el-option label="废品" value="废品" />
           </el-select>
         </el-form-item>
-        <el-form-item :label="getItemLabel" prop="itemId">
+        <el-form-item :label="getItemLabel" prop="itemId" v-if="!form.coilId">
           <product-select v-if="form.itemType == 'product'" v-model="form.itemId" placeholder="请选择成品"
             style="width: 100%;" clearable />
           <raw-material-select v-else-if="form.itemType == 'raw_material'" v-model="form.itemId" placeholder="请选择原料"
             style="width: 100%;" clearable />
           <div v-else>请先选择材料类型</div>
-        </el-form-item> -->
+        </el-form-item>
         <el-form-item v-if="form.materialType === '成品'" label="质量状态" prop="qualityStatus">
           <el-input v-model="form.qualityStatus" placeholder="请输入质量状态"
             :disabled="readonly">

klp-ui/src/views/wms/coil/split.vue

@@ -120,25 +120,25 @@
                   </el-select>
                 </el-form-item>
 
-                <el-form-item v-if="updateForm.materialType === '成品'" label="质量状态" prop="qualityStatus">
+                <el-form-item v-if="item.materialType === '成品'" label="质量状态" prop="qualityStatus">
                   <el-input v-model="item.qualityStatus" placeholder="请输入质量状态"
                     :disabled="readonly">
                   </el-input>
                 </el-form-item>
 
-                <el-form-item v-if="updateForm.materialType === '成品'" label="切边要求" prop="trimmingRequirement">
+                <el-form-item v-if="item.materialType === '成品'" label="切边要求" prop="trimmingRequirement">
                   <el-input v-model="item.trimmingRequirement" placeholder="请输入切边要求"
                     :disabled="readonly">
                   </el-input>
                 </el-form-item>
 
-                <el-form-item v-if="updateForm.materialType === '成品'" label="打包状态" prop="packingStatus">
+                <el-form-item v-if="item.materialType === '成品'" label="打包状态" prop="packingStatus">
                   <el-input v-model="item.packingStatus" placeholder="请输入打包状态"
                     :disabled="readonly">
                   </el-input>
                 </el-form-item>
 
-                <el-form-item v-if="updateForm.materialType === '成品'" label="包装要求" prop="packagingRequirement">
+                <el-form-item v-if="item.materialType === '成品'" label="包装要求" prop="packagingRequirement">
                   <el-input v-model="item.packagingRequirement" placeholder="请输入包装要求"
                     :disabled="readonly">
                   </el-input>

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
+        <el-input v-model="queryParams.productCode" placeholder="请输入产品编号" clearable @keyup.enter.native="handleQuery" />
-          v-model="queryParams.productCode"
-          placeholder="请输入产品编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="产品名称" prop="productName">
-        <el-input
+        <el-input v-model="queryParams.productName" placeholder="请输入产品名称" clearable @keyup.enter.native="handleQuery" />
-          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">
+      <el-form-item label="材质" prop="material">
-        <CategorySelect v-model="queryParams.baseMaterialId" categoryType="base_material" placeholder="请选择基础材质分类" clearable />
+        <el-input v-model="queryParams.material" placeholder="请输入材质" clearable />
       </el-form-item>
-      <el-form-item label="表面处理" prop="surfaceTreatmentId">
+      <el-form-item label="厂家" prop="manufacturer">
-        <CategorySelect v-model="queryParams.surfaceTreatmentId" categoryType="surface_treatment" placeholder="请选择表面处理分类" clearable />
+        <el-input v-model="queryParams.manufacturer" placeholder="请输入厂家" clearable />
       </el-form-item>
-      <el-form-item label="客户需求" prop="customerReqId">
+      <el-form-item label="表面处理" prop="surfaceTreatmentDesc">
-        <CategorySelect v-model="queryParams.customerReqId" categoryType="customer_req" placeholder="请选择客户需求分类" clearable />
+        <el-input v-model="queryParams.surfaceTreatmentDesc" placeholder="请输入表面处理" clearable />
       </el-form-item>
-      <el-form-item label="包装方式" prop="packagingId">
+      <el-form-item label="锌层" prop="zincLayer">
-        <CategorySelect v-model="queryParams.packagingId" categoryType="spec_packaging" placeholder="请选择包装分类" clearable />
+        <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
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          
-        >新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
-          type="success"
+          @click="handleUpdate">修改</el-button>
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"  
-        >修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
-          type="danger"
+          @click="handleDelete">删除</el-button>
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete" 
-        >删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</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,99 +55,48 @@
       <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">
+      <el-table-column label="材质" align="center" prop="material" />
-        <template slot-scope="scope">
+      <el-table-column label="厂家" align="center" prop="manufacturer" />
-          <CategoryRenderer :category-id="scope.row.baseMaterialId" />
+      <el-table-column label="表面处理" align="center" prop="surfaceTreatmentDesc" />
-        </template>
+      <el-table-column label="锌层" align="center" prop="zincLayer" />
-      </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="unit" />
       <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">
         <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
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
-            size="mini"
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
-            type="text"
+          <!-- <el-button size="mini" type="text" icon="el-icon-data-analysis" @click="handleBom(scope.row)">参数</el-button> -->
-            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>
         </template>
       </el-table-column>
     </KLPTable>
 
-    <pagination
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      v-show="total>0"
+      @pagination="getList" />
-      :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>
@@ -200,63 +104,23 @@
         <el-form-item label="规格" prop="specification">
           <el-input v-model="form.specification" placeholder="请输入规格" />
         </el-form-item>
-          <!-- </el-col>
-        </el-row> -->
 
-        <!-- <el-divider>分类信息</el-divider>
+        <el-form-item label="材质" prop="material">
-        <el-row :gutter="20">
+          <el-input v-model="form.material" placeholder="请输入材质" />
-          <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-divider>参数信息</el-divider>
+        <el-form-item label="厂家" prop="manufacturer">
-        <el-row :gutter="20">
+          <el-input v-model="form.manufacturer" placeholder="请输入厂家" />
-          <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="surfaceTreatmentDesc">
-            <el-form-item label="宽度" prop="width">
+          <el-input v-model="form.surfaceTreatmentDesc" placeholder="请输入表面处理" />
-              <el-input v-model="form.width" placeholder="请输入宽度" />
         </el-form-item>
-          </el-col>
+
-          <el-col :span="12">
+        <el-form-item label="锌层" prop="zincLayer">
-            <el-form-item label="内径" prop="innerDiameter">
+          <el-input v-model="form.zincLayer" placeholder="请输入锌层" />
-              <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 BomPanel from '../bom/components/BomPanel.vue';
-import BomInfoMini from '@/components/KLPService/Renderer/BomInfoMini.vue';
+// import BomInfoMini from '@/components/KLPService/Renderer/BomInfoMini.vue';
 
 export default {
   name: "Product",
@@ -284,8 +149,8 @@ export default {
     CategorySelect,
     CategoryRenderer,
     UserSelect,
-    BomPanel,
+    // BomPanel,
-    BomInfoMini
+    // 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");
     },

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-form-item label="材质" prop="material">
-        <el-input
+        <el-input v-model="queryParams.material" placeholder="请输入材质" clearable />
-          v-model="queryParams.steelGrade"
-          placeholder="请输入钢种/牌号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
-      <el-form-item label="目标冷轧牌号" prop="targetColdGrade">
+      <el-form-item label="厂家" prop="manufacturer">
-        <el-input
+        <el-input v-model="queryParams.manufacturer" placeholder="请输入厂家" clearable />
-          v-model="queryParams.targetColdGrade"
-          placeholder="请输入目标冷轧牌号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
-      <el-form-item label="基础材质" prop="baseMaterialId">
+      <el-form-item label="表面处理" prop="surfaceTreatmentDesc">
-        <CategorySelect
+        <el-input v-model="queryParams.surfaceTreatmentDesc" placeholder="请输入表面处理" clearable />
-          v-model="queryParams.baseMaterialId"
-          category-type="base_material"
-          placeholder="请选择基础材质分类"
-          clearable
-        />
       </el-form-item>
-      <el-form-item label="表面处理" prop="surfaceTreatmentId">
+      <el-form-item label="锌层" prop="zincLayer">
-        <CategorySelect
+        <el-input v-model="queryParams.zincLayer" placeholder="请输入锌层" clearable />
-          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>
       <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="material" />
-      <!-- <el-table-column label="目标冷轧牌号" align="center" prop="targetColdGrade" />
+      <el-table-column label="厂家" align="center" prop="manufacturer" />
-      <el-table-column label="基础材质分类" align="center">
+      <el-table-column label="表面处理" align="center" prop="surfaceTreatmentDesc" />
-        <template slot-scope="scope">
+      <el-table-column label="锌层" align="center" prop="zincLayer" />
-          <CategoryRenderer :category-id="scope.row.baseMaterialId" />
+      <!-- <el-table-column label="参数" align="center">
-        </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">
         <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-form-item label="材质" prop="material">
-          <el-input v-model="form.steelGrade" placeholder="请输入钢种/牌号" />
+          <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-form-item label="厂家" prop="manufacturer">
-          <el-select v-model="form.isEnabled" placeholder="请选择是否启用" clearable>
+          <el-input v-model="form.manufacturer" placeholder="请输入厂家" />
-            <el-option
+        </el-form-item>
-              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-collapse>
+        <el-form-item label="表面处理" prop="surfaceTreatmentDesc">
-          <el-collapse-item title="详细参数">
+          <el-input v-model="form.surfaceTreatmentDesc" placeholder="请输入表面处理" />
-            <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="zincLayer">
-                <el-form-item label="厚度偏差" prop="thicknessDeviation">
+          <el-input v-model="form.zincLayer" placeholder="请输入锌层" />
-                  <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>
       <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-dialog title="参数" @close="bomDialogVisible = false" :visible.sync="bomDialogVisible" width="600px" append-to-body>
-      <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>
       <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 BomPanel from '@/views/wms/bom/components/BomPanel.vue';
-import BomInfoMini from '@/components/KLPService/Renderer/BomInfoMini.vue';
+// import BomInfoMini from '@/components/KLPService/Renderer/BomInfoMini.vue';
 
 export default {
   name: "RawMaterial",
   components: {
     CategorySelect,
     CategoryRenderer,
-    BomPanel,
+    // BomPanel,
-    BomInfoMini
+    // 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");
     },