From c57b88b9a879d6e68678e7102ab727ff302b907e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=AB=E7=8C=ABguowen?=
 <9290821+guowen-the-cat@user.noreply.gitee.com>
Date: Wed, 17 Sep 2025 15:17:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/bas/basProduct/index.vue | 77 +++++++++++----------
 1 file changed, 39 insertions(+), 38 deletions(-)

diff --git a/ruoyi-ui/src/views/bas/basProduct/index.vue b/ruoyi-ui/src/views/bas/basProduct/index.vue
index e57051f..574706b 100644
--- a/ruoyi-ui/src/views/bas/basProduct/index.vue
+++ b/ruoyi-ui/src/views/bas/basProduct/index.vue
@@ -423,24 +423,15 @@
 
     <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="产品分类" align="center" prop="parentId" />
+<!--      <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="spec" />
-      <el-table-column label="描述" align="center" prop="remark" />
-      <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="spare5" />
-      <el-table-column label="功率" align="center" prop="spare6" />
-      <el-table-column label="物料名称" align="center" prop="productName" />
-      <el-table-column label="相位" align="center" prop="spare7" />
-      <el-table-column label="毛重" align="center" prop="spare8" />
-      <el-table-column label="NC号" align="center" prop="spare9" />
       <el-table-column label="电源线" align="center" prop="spare10" />
       <el-table-column label="插头" align="center" prop="spare11" />
       <el-table-column label="接嘴" align="center" prop="spare12" />
@@ -467,10 +458,20 @@
       <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" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -505,9 +506,9 @@
         <el-form-item label="物料编码" prop="productId">
           <el-input v-model="form.productId" 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="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>
@@ -523,33 +524,33 @@
         <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-input v-model="form.spare2" placeholder="请输入单件净重" />
-        </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>
+<!--        <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-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>-->
         <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="productName">
           <el-input v-model="form.productName" 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="相位" 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>