From 715abad8bdf0c33edc26dfb0b48b9469ff41c931 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Mon, 29 Jul 2024 09:41:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=93=81=E7=89=8C=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=9B=BE=E7=89=87=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tablecmt/tablecmt.vue     | 12 +++++++++++-
 src/views/basicdata/brand/basicBrand.vue |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue
index 3ac5c95b..764eebee 100644
--- a/src/components/tablecmt/tablecmt.vue
+++ b/src/components/tablecmt/tablecmt.vue
@@ -142,7 +142,7 @@
             >
               <slot :scope="scope"> </slot>
             </div>
-            <el-image
+            <!-- <el-image
               preview-teleported
               v-else-if="column.type == 7"
               style="width: 60px; height: 60px; margin-left: 10px"
@@ -151,6 +151,16 @@
               v-for="(item, index) in scope.row[column.prop].split(',')"
               :src="item"
               :preview-src-list="scope.row[column.prop].split(',')"
+            /> -->
+            <el-image
+              preview-teleported
+              v-else-if="column.type == 7"
+              style="width: 60px; height: 60px; margin-left: 10px"
+              :initial-index="index"
+              :z-index="100"
+              v-for="(item, index) in scope.row[column.prop]?.split(',')"
+              :src="item"
+              :preview-src-list="scope.row[column.prop]?.split(',')"
             />
           </template>
         </el-table-column>
diff --git a/src/views/basicdata/brand/basicBrand.vue b/src/views/basicdata/brand/basicBrand.vue
index 9c27ddba..414ba379 100644
--- a/src/views/basicdata/brand/basicBrand.vue
+++ b/src/views/basicdata/brand/basicBrand.vue
@@ -330,7 +330,7 @@ export default {
           // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
         ],
         brandCode: [{ required: true, message: '请输入品牌编号', trigger: 'change' }],
-        brandIcon: [{ required: true, message: '请上传图标', trigger: 'blur' }],
+        brandIcon: [{ required: false, message: '请上传图标', trigger: 'blur' }],
         acceptanceTime: [{ required: true, message: '请选择承接时间', trigger: 'blur' }],
       },
       loadingObj: {