From b8ddd204ac4cc8df50dfa6797f6df0e1e849456e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=80=A1=E8=93=89?= <377046077@qq.com>
Date: Fri, 17 Oct 2025 14:51:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bas/BasProduct/domain/BasProduct.java     |  88 +--
 .../service/impl/BasProductServiceImpl.java   |   8 +
 ruoyi-ui/src/views/bas/basProduct/index.vue   | 567 ++++--------------
 3 files changed, 166 insertions(+), 497 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java
index 44f87b2..a472695 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java
@@ -31,47 +31,47 @@ public class BasProduct extends BaseEntity
     private String productId;
 
     /** 产品分类 */
-    @Excel(name = "产品分类")
+    @Excel(name = "常用编码")
     private String parentId;
 
     /** 品号描述 */
-    @Excel(name = "品号描述")
+    @Excel(name = "单价")
     private String price;
 
     /** 英文描述 */
-    @Excel(name = "英文描述")
+    @Excel(name = "图号")
     private String cargoNo;
 
     /** 图号 */
-    @Excel(name = "图号")
+    @Excel(name = "单位")
     private String unit;
 
     /** 规格 */
-    @Excel(name = "规格")
+    @Excel(name = "规格型号")
     private String spec;
 
     /** 型号 */
-    @Excel(name = "型号")
+    @Excel(name = "物料状态")
     private String spare1;
 
     /** 单件净重 */
-    @Excel(name = "单件净重")
+    @Excel(name = "是否系统项",dictType = "sys_yes_no")
     private String spare2;
 
     /** 颜色 */
-    @Excel(name = "颜色")
+    @Excel(name = "创建时间")
     private String spare3;
 
     /** 序列号 */
-    @Excel(name = "序列号")
+    @Excel(name = "创建用户")
     private String spare4;
 
     /** 电压 */
-    @Excel(name = "电压")
+    @Excel(name = "库存上限")
     private String spare5;
 
     /** 功率 */
-    @Excel(name = "功率")
+    @Excel(name = "库存下限")
     private String spare6;
 
     /** 物料名称 */
@@ -79,135 +79,135 @@ public class BasProduct extends BaseEntity
     private String productName;
 
     /** 相位 */
-    @Excel(name = "相位")
+    @Excel(name = "启用标识",dictType = "sys_yes_no")
     private String spare7;
 
     /** 毛重 */
-    @Excel(name = "毛重")
+//    @Excel(name = "毛重")
     private String spare8;
 
     /** NC号 */
-    @Excel(name = "NC号")
+//    @Excel(name = "NC号")
     private String spare9;
 
     /** 电源线 */
-    @Excel(name = "电源线")
+//    @Excel(name = "电源线")
     private String spare10;
 
     /** 插头 */
-    @Excel(name = "插头")
+//    @Excel(name = "插头")
     private String spare11;
 
     /** 接嘴 */
-    @Excel(name = "接嘴")
+//    @Excel(name = "接嘴")
     private String spare12;
 
     /** 快捷码 */
-    @Excel(name = "快捷码")
+//    @Excel(name = "快捷码")
     private String spare13;
 
     /** 库存单位编号 */
-    @Excel(name = "库存单位编号")
+//    @Excel(name = "库存单位编号")
     private String spare14;
 
     /** 库存单位名称 */
-    @Excel(name = "库存单位名称")
+//    @Excel(name = "库存单位名称")
     private String spare15;
 
     /** 品号群组 */
-    @Excel(name = "品号群组")
+//    @Excel(name = "品号群组")
     private String spare16;
 
     /** 归类品 */
-    @Excel(name = "归类品")
+//    @Excel(name = "归类品")
     private String spare17;
 
     /** 计量体系 */
-    @Excel(name = "计量体系")
+//    @Excel(name = "计量体系")
     private String spare18;
 
     /** 群组名称 */
-    @Excel(name = "群组名称")
+//    @Excel(name = "群组名称")
     private String spare19;
 
     /** 批号管理 */
-    @Excel(name = "批号管理")
+//    @Excel(name = "批号管理")
     private String spare20;
 
     /** 状态 */
-    @Excel(name = "状态")
+//    @Excel(name = "状态")
     private String spare21;
 
     /** 产品大类 */
-    @Excel(name = "产品大类")
+//    @Excel(name = "产品大类")
     private String spare22;
 
     /** 产品二类 */
-    @Excel(name = "产品二类")
+//    @Excel(name = "产品二类")
     private String spare23;
 
     /** 产品线/产品系列（组码） */
-    @Excel(name = "产品线/产品系列", readConverterExp = "组=码")
+//    @Excel(name = "产品线/产品系列", readConverterExp = "组=码")
     private String spare24;
 
     /** BOM状态（组码） */
-    @Excel(name = "BOM状态", readConverterExp = "组=码")
+//    @Excel(name = "BOM状态", readConverterExp = "组=码")
     private String spare25;
 
     /** 产品定位（组码） */
-    @Excel(name = "产品定位", readConverterExp = "组=码")
+//    @Excel(name = "产品定位", readConverterExp = "组=码")
     private String spare26;
 
     /** 电脑板型号（组码） */
-    @Excel(name = "电脑板型号", readConverterExp = "组=码")
+//    @Excel(name = "电脑板型号", readConverterExp = "组=码")
     private String spare27;
 
     /** 非标要求 */
-    @Excel(name = "非标要求")
+//    @Excel(name = "非标要求")
     private String spare28;
 
     /** 品牌（组码） */
-    @Excel(name = "品牌", readConverterExp = "组=码")
+//    @Excel(name = "品牌", readConverterExp = "组=码")
     private String spare29;
 
     /** 非标颜色 */
-    @Excel(name = "非标颜色")
+//    @Excel(name = "非标颜色")
     private String spare30;
 
     /** 主颜色 */
-    @Excel(name = "主颜色")
+//    @Excel(name = "主颜色")
     private String spare31;
 
     /** 辅助颜色 */
-    @Excel(name = "辅助颜色")
+//    @Excel(name = "辅助颜色")
     private String spare32;
 
     /** 是否标准款（组码） */
-    @Excel(name = "是否标准款", readConverterExp = "组=码")
+//    @Excel(name = "是否标准款", readConverterExp = "组=码")
     private String spare33;
 
     /** 包装方式 */
-    @Excel(name = "包装方式")
+//    @Excel(name = "包装方式")
     private String spare34;
 
     /** 主要包装方式 */
-    @Excel(name = "主要包装方式")
+//    @Excel(name = "主要包装方式")
     private String spare35;
 
     /** 长 */
-    @Excel(name = "长")
+//    @Excel(name = "长")
     private String spare36;
 
     /** 宽 */
-    @Excel(name = "宽")
+//    @Excel(name = "宽")
     private String spare37;
 
     /** 高 */
-    @Excel(name = "高")
+//    @Excel(name = "高")
     private String spare38;
 
     /** 包装材积 */
-    @Excel(name = "包装材积")
+//    @Excel(name = "包装材积")
     private String spare39;
 
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/service/impl/BasProductServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/service/impl/BasProductServiceImpl.java
index 83b91d8..a96606b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/service/impl/BasProductServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/service/impl/BasProductServiceImpl.java
@@ -1,6 +1,10 @@
 package com.ruoyi.bas.BasProduct.service.impl;
 
+import java.util.Date;
 import java.util.List;
+
+import cn.hutool.core.date.DateUtil;
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.bas.BasProduct.mapper.BasProductMapper;
@@ -65,6 +69,10 @@ public class BasProductServiceImpl implements IBasProductService
     public int insertBasProduct(BasProduct basProduct)
     {
         basProduct.setProductGuid(basProduct.getProductId());
+        basProduct.setSpare3(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+        //获取当前系统登录用户名
+        String username = SecurityUtils.getUsername();
+        basProduct.setSpare4(username);
         return basProductMapper.insertBasProduct(basProduct);
     }
 
diff --git a/ruoyi-ui/src/views/bas/basProduct/index.vue b/ruoyi-ui/src/views/bas/basProduct/index.vue
index a5516fc..ff87d4d 100644
--- a/ruoyi-ui/src/views/bas/basProduct/index.vue
+++ b/ruoyi-ui/src/views/bas/basProduct/index.vue
@@ -9,6 +9,14 @@
           @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-form-item>
 <!--      <el-form-item label="产品分类" prop="parentId">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.parentId"-->
@@ -25,30 +33,30 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item label="英文描述" prop="cargoNo">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.cargoNo"-->
-<!--          placeholder="请输入英文描述"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="图号" prop="unit">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.unit"-->
-<!--          placeholder="请输入图号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="规格" prop="spec">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spec"-->
-<!--          placeholder="请输入规格"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <el-form-item label="图号" prop="cargoNo">
+        <el-input
+          v-model="queryParams.cargoNo"
+          placeholder="请输入图号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单位" prop="unit">
+        <el-input
+          v-model="queryParams.unit"
+          placeholder="请输入单位"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="规格" prop="spec">
+        <el-input
+          v-model="queryParams.spec"
+          placeholder="请输入规格"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 <!--      <el-form-item label="型号" prop="spare1">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.spare1"-->
@@ -97,14 +105,7 @@
 <!--          @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-form-item>
+
 <!--      <el-form-item label="相位" prop="spare7">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.spare7"-->
@@ -121,254 +122,7 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item label="NC号" prop="spare9">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare9"-->
-<!--          placeholder="请输入NC号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="电源线" prop="spare10">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare10"-->
-<!--          placeholder="请输入电源线"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="插头" prop="spare11">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare11"-->
-<!--          placeholder="请输入插头"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="接嘴" prop="spare12">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare12"-->
-<!--          placeholder="请输入接嘴"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="快捷码" prop="spare13">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare13"-->
-<!--          placeholder="请输入快捷码"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="库存单位编号" prop="spare14">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare14"-->
-<!--          placeholder="请输入库存单位编号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="库存单位名称" prop="spare15">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare15"-->
-<!--          placeholder="请输入库存单位名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="品号群组" prop="spare16">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare16"-->
-<!--          placeholder="请输入品号群组"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="归类品" prop="spare17">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare17"-->
-<!--          placeholder="请输入归类品"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="计量体系" prop="spare18">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare18"-->
-<!--          placeholder="请输入计量体系"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="群组名称" prop="spare19">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare19"-->
-<!--          placeholder="请输入群组名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="批号管理" prop="spare20">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare20"-->
-<!--          placeholder="请输入批号管理"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="状态" prop="spare21">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare21"-->
-<!--          placeholder="请输入状态"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品大类" prop="spare22">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare22"-->
-<!--          placeholder="请输入产品大类"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品二类" prop="spare23">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare23"-->
-<!--          placeholder="请输入产品二类"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品线/产品系列" prop="spare24">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare24"-->
-<!--          placeholder="请输入产品线/产品系列"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="BOM状态" prop="spare25">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare25"-->
-<!--          placeholder="请输入BOM状态"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品定位" prop="spare26">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare26"-->
-<!--          placeholder="请输入产品定位"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="电脑板型号" prop="spare27">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare27"-->
-<!--          placeholder="请输入电脑板型号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="非标要求" prop="spare28">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare28"-->
-<!--          placeholder="请输入非标要求"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="品牌" prop="spare29">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare29"-->
-<!--          placeholder="请输入品牌"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="非标颜色" prop="spare30">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare30"-->
-<!--          placeholder="请输入非标颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="主颜色" prop="spare31">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare31"-->
-<!--          placeholder="请输入主颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="辅助颜色" prop="spare32">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare32"-->
-<!--          placeholder="请输入辅助颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="是否标准款" prop="spare33">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare33"-->
-<!--          placeholder="请输入是否标准款"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="包装方式" prop="spare34">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare34"-->
-<!--          placeholder="请输入包装方式"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="主要包装方式" prop="spare35">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare35"-->
-<!--          placeholder="请输入主要包装方式"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="长" prop="spare36">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare36"-->
-<!--          placeholder="请输入长"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="宽" prop="spare37">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare37"-->
-<!--          placeholder="请输入宽"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="高" prop="spare38">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare38"-->
-<!--          placeholder="请输入高"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="包装材积" prop="spare39">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare39"-->
-<!--          placeholder="请输入包装材积"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </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>
@@ -424,54 +178,29 @@
     <el-table v-loading="loading" :data="BasProductList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="主键" align="center" prop="productGuid" />-->
-      <el-table-column label="品号" align="center" prop="productId" />
-      <el-table-column label="NC号" align="center" prop="spare9" />
-      <el-table-column label="品名" align="center" prop="productName" />
-      <el-table-column label="规格" align="center" prop="spec" />
-      <el-table-column label="品号描述" align="center" prop="price" />
-      <el-table-column label="英文描述" align="center" prop="cargoNo" />
-      <el-table-column label="图号" align="center" prop="unit" />
-      <el-table-column label="电压" align="center" prop="spare5" />
-      <el-table-column label="电源线" align="center" prop="spare10" />
-      <el-table-column label="插头" align="center" prop="spare11" />
-      <el-table-column label="接嘴" align="center" prop="spare12" />
-      <el-table-column label="快捷码" align="center" prop="spare13" />
-      <el-table-column label="库存单位编号" align="center" prop="spare14" />
-      <el-table-column label="库存单位名称" align="center" prop="spare15" />
-      <el-table-column label="品号群组" align="center" prop="spare16" />
-      <el-table-column label="归类品" align="center" prop="spare17" />
-      <el-table-column label="计量体系" align="center" prop="spare18" />
-      <el-table-column label="群组名称" align="center" prop="spare19" />
-      <el-table-column label="批号管理" align="center" prop="spare20" />
-      <el-table-column label="状态" align="center" prop="spare21" />
-      <el-table-column label="产品大类" align="center" prop="spare22" />
-      <el-table-column label="产品二类" align="center" prop="spare23" />
-      <el-table-column label="产品线/产品系列" align="center" prop="spare24" />
-      <el-table-column label="BOM状态" align="center" prop="spare25" />
-      <el-table-column label="产品定位" align="center" prop="spare26" />
-      <el-table-column label="电脑板型号" align="center" prop="spare27" />
-      <el-table-column label="非标要求" align="center" prop="spare28" />
-      <el-table-column label="品牌" align="center" prop="spare29" />
-      <el-table-column label="非标颜色" align="center" prop="spare30" />
-      <el-table-column label="主颜色" align="center" prop="spare31" />
-      <el-table-column label="辅助颜色" align="center" prop="spare32" />
-      <el-table-column label="是否标准款" align="center" prop="spare33" />
-      <el-table-column label="包装方式" align="center" prop="spare34" />
-      <el-table-column label="主要包装方式" align="center" prop="spare35" />
-      <el-table-column label="描述" align="center" prop="remark" />
-      <el-table-column label="长" align="center" prop="spare36" />
-      <el-table-column label="宽" align="center" prop="spare37" />
-      <el-table-column label="高" align="center" prop="spare38" />
-      <el-table-column label="包装材积" align="center" prop="spare39" />
-<!--      <el-table-column label="产品分类" align="center" prop="parentId" />-->
-<!--      <el-table-column label="型号" align="center" prop="spare1" />-->
-<!--      <el-table-column label="单件净重" align="center" prop="spare2" />-->
-<!--      <el-table-column label="颜色" align="center" prop="spare3" />-->
-<!--      <el-table-column label="序列号" align="center" prop="spare4" />-->
-<!--      <el-table-column label="功率" align="center" prop="spare6" />-->
-<!--      <el-table-column label="相位" align="center" prop="spare7" />-->
-<!--      <el-table-column label="毛重" align="center" prop="spare8" />-->
-
+      <el-table-column label="物料编码" align="center" prop="productId" />
+      <el-table-column label="物料名称" align="center" prop="productName" />
+      <el-table-column label="规格型号" align="center" prop="spec" />
+      <el-table-column label="图号" align="center" prop="cargoNo" />
+      <el-table-column label="常用编码" align="center" prop="parentId" />
+      <el-table-column label="物料状态" align="center" prop="spare1" />
+      <el-table-column label="单位" align="center" prop="unit" />
+      <el-table-column label="启用标识" align="center" prop="spare7" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.spare7"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否系统项" align="center" prop="spare2" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.spare2"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="spare3" />
+      <el-table-column label="创建用户" align="center" prop="spare4" />
+      <el-table-column label="库存上限" align="center" prop="spare5" />
+      <el-table-column label="库存下限" align="center" prop="spare6" />
+      <el-table-column label="单价" align="center" prop="price" />
+      <el-table-column label="备注" align="center" prop="remak" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -509,142 +238,62 @@
         <el-form-item label="物料名称" prop="productName">
           <el-input v-model="form.productName" placeholder="请输入物料名称" />
         </el-form-item>
-<!--        <el-form-item label="产品分类" prop="parentId">-->
-<!--          <el-input v-model="form.parentId" placeholder="请输入产品分类" />-->
-<!--        </el-form-item>-->
-        <el-form-item label="品号描述" prop="price">
-          <el-input v-model="form.price" placeholder="请输入品号描述" />
+        <el-form-item label="常用编码" prop="parentId">
+          <el-input v-model="form.parentId" placeholder="请输入常用编码" />
         </el-form-item>
-        <el-form-item label="英文描述" prop="cargoNo">
-          <el-input v-model="form.cargoNo" placeholder="请输入英文描述" />
+        <el-form-item label="单价" prop="price">
+          <el-input v-model="form.price" placeholder="请输入单价" />
         </el-form-item>
-        <el-form-item label="图号" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入图号" />
+        <el-form-item label="图号" prop="cargoNo">
+          <el-input v-model="form.cargoNo" placeholder="请输入图号" />
         </el-form-item>
-        <el-form-item label="规格" prop="spec">
-          <el-input v-model="form.spec" placeholder="请输入规格" />
+        <el-form-item label="单位" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入单位" />
         </el-form-item>
-        <el-form-item label="描述" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入描述" />
+        <el-form-item label="规格型号" prop="spec">
+          <el-input v-model="form.spec" placeholder="请输入规格型号" />
         </el-form-item>
-<!--        <el-form-item label="型号" prop="spare1">-->
-<!--          <el-input v-model="form.spare1" placeholder="请输入型号" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="单件净重" prop="spare2">-->
-<!--          <el-input v-model="form.spare2" placeholder="请输入单件净重" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="颜色" prop="spare3">-->
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+        <el-form-item label="物料状态" prop="spare1">
+          <el-input v-model="form.spare1" placeholder="请输入物料状态" />
+        </el-form-item>
+        <el-form-item label="是否系统项" prop="spare2">
+          <el-select v-model="form.spare2" placeholder="请选择是否系统项">
+            <el-option
+              v-for="dict in dict.type.sys_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+<!--        <el-form-item label="创建时间" prop="spare3">-->
 <!--          <el-input v-model="form.spare3" placeholder="请输入颜色" />-->
 <!--        </el-form-item>-->
-<!--        <el-form-item label="序列号" prop="spare4">-->
-<!--          <el-input v-model="form.spare4" placeholder="请输入序列号" />-->
+<!--        <el-form-item label="创建用户" prop="spare4">-->
+<!--          <el-input v-model="form.spare4" placeholder="请输入创建用户" />-->
 <!--        </el-form-item>-->
-        <el-form-item label="电压" prop="spare5">
-          <el-input v-model="form.spare5" placeholder="请输入电压" />
+        <el-form-item label="库存上限" prop="spare5">
+          <el-input v-model="form.spare5" placeholder="请输入库存上限" />
+        </el-form-item>
+        <el-form-item label="库存下限" prop="spare6">
+          <el-input v-model="form.spare6" placeholder="请输入库存下限" />
         </el-form-item>
-<!--        <el-form-item label="功率" prop="spare6">-->
-<!--          <el-input v-model="form.spare6" placeholder="请输入功率" />-->
-<!--        </el-form-item>-->
 
-<!--        <el-form-item label="相位" prop="spare7">-->
-<!--          <el-input v-model="form.spare7" placeholder="请输入相位" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="毛重" prop="spare8">-->
-<!--          <el-input v-model="form.spare8" placeholder="请输入毛重" />-->
-<!--        </el-form-item>-->
-        <el-form-item label="NC号" prop="spare9">
-          <el-input v-model="form.spare9" placeholder="请输入NC号" />
-        </el-form-item>
-        <el-form-item label="电源线" prop="spare10">
-          <el-input v-model="form.spare10" placeholder="请输入电源线" />
-        </el-form-item>
-        <el-form-item label="插头" prop="spare11">
-          <el-input v-model="form.spare11" placeholder="请输入插头" />
-        </el-form-item>
-        <el-form-item label="接嘴" prop="spare12">
-          <el-input v-model="form.spare12" placeholder="请输入接嘴" />
-        </el-form-item>
-        <el-form-item label="快捷码" prop="spare13">
-          <el-input v-model="form.spare13" placeholder="请输入快捷码" />
-        </el-form-item>
-        <el-form-item label="库存单位编号" prop="spare14">
-          <el-input v-model="form.spare14" placeholder="请输入库存单位编号" />
-        </el-form-item>
-        <el-form-item label="库存单位名称" prop="spare15">
-          <el-input v-model="form.spare15" placeholder="请输入库存单位名称" />
-        </el-form-item>
-        <el-form-item label="品号群组" prop="spare16">
-          <el-input v-model="form.spare16" placeholder="请输入品号群组" />
-        </el-form-item>
-        <el-form-item label="归类品" prop="spare17">
-          <el-input v-model="form.spare17" placeholder="请输入归类品" />
-        </el-form-item>
-        <el-form-item label="计量体系" prop="spare18">
-          <el-input v-model="form.spare18" placeholder="请输入计量体系" />
-        </el-form-item>
-        <el-form-item label="群组名称" prop="spare19">
-          <el-input v-model="form.spare19" placeholder="请输入群组名称" />
-        </el-form-item>
-        <el-form-item label="批号管理" prop="spare20">
-          <el-input v-model="form.spare20" placeholder="请输入批号管理" />
-        </el-form-item>
-        <el-form-item label="状态" prop="spare21">
-          <el-input v-model="form.spare21" placeholder="请输入状态" />
-        </el-form-item>
-        <el-form-item label="产品大类" prop="spare22">
-          <el-input v-model="form.spare22" placeholder="请输入产品大类" />
-        </el-form-item>
-        <el-form-item label="产品二类" prop="spare23">
-          <el-input v-model="form.spare23" placeholder="请输入产品二类" />
-        </el-form-item>
-        <el-form-item label="产品线/产品系列" prop="spare24">
-          <el-input v-model="form.spare24" placeholder="请输入产品线/产品系列" />
-        </el-form-item>
-        <el-form-item label="BOM状态" prop="spare25">
-          <el-input v-model="form.spare25" placeholder="请输入BOM状态" />
-        </el-form-item>
-        <el-form-item label="产品定位" prop="spare26">
-          <el-input v-model="form.spare26" placeholder="请输入产品定位" />
-        </el-form-item>
-        <el-form-item label="电脑板型号" prop="spare27">
-          <el-input v-model="form.spare27" placeholder="请输入电脑板型号" />
-        </el-form-item>
-        <el-form-item label="非标要求" prop="spare28">
-          <el-input v-model="form.spare28" placeholder="请输入非标要求" />
-        </el-form-item>
-        <el-form-item label="品牌" prop="spare29">
-          <el-input v-model="form.spare29" placeholder="请输入品牌" />
-        </el-form-item>
-        <el-form-item label="非标颜色" prop="spare30">
-          <el-input v-model="form.spare30" placeholder="请输入非标颜色" />
-        </el-form-item>
-        <el-form-item label="主颜色" prop="spare31">
-          <el-input v-model="form.spare31" placeholder="请输入主颜色" />
-        </el-form-item>
-        <el-form-item label="辅助颜色" prop="spare32">
-          <el-input v-model="form.spare32" placeholder="请输入辅助颜色" />
-        </el-form-item>
-        <el-form-item label="是否标准款" prop="spare33">
-          <el-input v-model="form.spare33" placeholder="请输入是否标准款" />
-        </el-form-item>
-        <el-form-item label="包装方式" prop="spare34">
-          <el-input v-model="form.spare34" placeholder="请输入包装方式" />
-        </el-form-item>
-        <el-form-item label="主要包装方式" prop="spare35">
-          <el-input v-model="form.spare35" placeholder="请输入主要包装方式" />
-        </el-form-item>
-        <el-form-item label="长" prop="spare36">
-          <el-input v-model="form.spare36" placeholder="请输入长" />
-        </el-form-item>
-        <el-form-item label="宽" prop="spare37">
-          <el-input v-model="form.spare37" placeholder="请输入宽" />
-        </el-form-item>
-        <el-form-item label="高" prop="spare38">
-          <el-input v-model="form.spare38" placeholder="请输入高" />
-        </el-form-item>
-        <el-form-item label="包装材积" prop="spare39">
-          <el-input v-model="form.spare39" placeholder="请输入包装材积" />
+        <el-form-item label="启用标识" prop="spare7">
+          <el-select v-model="form.spare7" placeholder="请选择启用标识">
+            <el-option
+              v-for="dict in dict.type.sys_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
+
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -659,6 +308,7 @@ import { listBasProduct, getBasProduct, delBasProduct, addBasProduct, updateBasP
 
 export default {
   name: "BasProduct",
+  dicts:['sys_yes_no'],
   data() {
     return {
       // 遮罩层
@@ -740,6 +390,17 @@ export default {
         productName: [
           { required: true, message: "物料名称不能为空", trigger: "blur" }
         ],
+        spare5: [
+          { required: true, message: "库存上限不能为空", trigger: "blur" },
+          { pattern: /^([0-9]*[.])?[0-9]+$/, message: "请输入有效数字", trigger: "blur" }
+        ],
+        spare6: [
+          { required: true, message: "库存下限不能为空", trigger: "blur" },
+          { pattern: /^([0-9]*[.])?[0-9]+$/, message: "请输入有效数字", trigger: "blur" }
+        ],
+        price: [
+          { pattern: /^([0-9]*[.])?[0-9]+$/, message: "请输入有效数字", trigger: "blur" }
+        ]
       }
     }
   },