From 0ee89e6f50c2d394c7be1a649f8b94ffce76d4f3 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Sat, 16 Sep 2023 12:14:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/product/index.vue | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/views/wms/product/index.vue b/src/views/wms/product/index.vue
index 1efec00..bdef977 100644
--- a/src/views/wms/product/index.vue
+++ b/src/views/wms/product/index.vue
@@ -74,15 +74,17 @@
 			<el-table-column type="selection" width="55" align="center" />
 			<!-- <el-table-column label="主键ID" align="center" prop="productId" /> -->
 			<el-table-column label="产品编码" align="center" prop="productCode" width="200"/>
-			<el-table-column label="产品类别" align="center" prop="productGroup">
-			  <template slot-scope="scope">
-          {{ scope.row.productGroup == "material_type1" ? "产品类别1" : "产品类别2" }}
-        </template>
-      </el-table-column>
-			<!-- 中文描述也就是产品名称 -->
 			<el-table-column label="产品名称" align="center" prop="productDescZh" width="400"/>
-			<el-table-column label="产品型号" align="center" prop="productModel" />
+			<el-table-column label="产品组名称" align="center" prop="productGroupName" width="200"/>
+			<el-table-column label="产品组" align="center" prop="productGroup" />
+			<!-- 中文描述也就是产品名称 -->
 			<!-- <el-table-column label="英文描述" align="center" prop="productDescEn" />
+						<el-table-column label="产品类别" align="center" prop="productGroup">
+      			  <template slot-scope="scope">
+                {{ scope.row.productGroup == "material_type1" ? "产品类别1" : "产品类别2" }}
+              </template>
+            </el-table-column>
+      <el-table-column label="产品型号" align="center" prop="productModel" />
 			<el-table-column label="序列号规则代码" align="center" prop="ruleCode" />
 			<el-table-column label="旧产品号" align="center" prop="oldProductCode" />
 			<el-table-column label="散件产品号" align="center" prop="partsProductCode" />
@@ -95,14 +97,6 @@
 			<el-table-column label="皮重" align="center" prop="tareWeight" />
 			<el-table-column label="体积" align="center" prop="volume" />
 			<el-table-column label="单价" align="center" prop="unitPrice" />
-			<el-table-column label="产品组" align="center" prop="productGroup" />
-			<el-table-column label="${comment}" align="center" prop="productGroupName" />
-			<el-table-column label="用户自定义1" align="center" prop="userDefined1" />
-			<el-table-column label="用户自定义2" align="center" prop="userDefined2" />
-			<el-table-column label="用户自定义3" align="center" prop="userDefined3" />
-			<el-table-column label="${comment}" align="center" prop="userDefined4" />
-			<el-table-column label="${comment}" align="center" prop="userDefined5" />
-			<el-table-column label="${comment}" align="center" prop="userDefined6" />
 			<el-table-column label="工厂编码" align="center" prop="factoryCode" /> -->
 			<el-table-column label="是否启用" align="center" prop="activeFlag">
 			   <template slot-scope="scope">