From d45b1acc21c57a83fd4be605896977237c89d86f Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Fri, 1 Dec 2023 13:49:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=B9=E5=8F=91=E4=BB=B7,?=
 =?UTF-8?q?=E5=A4=9A=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/productList/index.vue | 39 ++++++++++++++++++-------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/views/product/productList/index.vue b/src/views/product/productList/index.vue
index 0eb6fa3..cf12b6b 100644
--- a/src/views/product/productList/index.vue
+++ b/src/views/product/productList/index.vue
@@ -261,13 +261,30 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="store_name" label="商品名称" min-width="200" />
+        <el-table-column prop="store_name" label="商品名称" min-width="200">
+          <template slot-scope="scope">
+            <div v-if="scope.row.attrValue && scope.row.attrValue.length > 1">
+              <span style="color: #fe8c51; font-size: 10px; margin-right: 4px"
+                >[多规格]</span
+              >{{ scope.row.store_name }}
+            </div>
+            <span v-else>{{ scope.row.store_name }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="price" label="商品售价" min-width="90" />
-        <el-table-column prop="svip_price" label="会员价" min-width="90">
+        <el-table-column prop="price" label="批发价" min-width="90">
+          <template slot-scope="scope">
+            <span v-if="scope.row.attrValue[0]">
+              {{ scope.row.attrValue[0].procure_price || "-" }}</span
+            >
+            <span v-else>-</span>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column prop="svip_price" label="会员价" min-width="90">
           <template slot-scope="scope">
             <span>{{ scope.row.svip_price || "-" }}</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="sales" label="销量" min-width="90" />
         <el-table-column prop="stock" label="库存" min-width="70" />
         <!-- <el-table-column prop="integral_total" label="积分抵扣" min-width="70" />
@@ -828,14 +845,14 @@ export default {
   mounted () {
     this.merchantType = this.$store.state.user.merchantType;
     let typeName = this.merchantType.type_name;
-      if (typeName !== "市级供应链") {
-        this.product = 0;
-        this.tableFrom.product_type = ''
-      } else {
-        this.product = 98;
-        this.tableFrom.product_type = 98
-      }
-      console.log(this.product);
+    if (typeName !== "市级供应链") {
+      this.product = 0;
+      this.tableFrom.product_type = ''
+    } else {
+      this.product = 98;
+      this.tableFrom.product_type = 98
+    }
+    console.log(this.product);
     this.getLstFilterApi();
     this.getCategorySelect();
     this.getCategoryList();