From 55087bd0d09b48b7f942338e10381683648ca953 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Sat, 10 Jun 2023 12:23:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E5=9C=B0=EF=BC=8C?=
 =?UTF-8?q?=E5=95=86=E5=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basicdata/brand/basicBrand.vue      | 48 +++++++++++--------
 src/views/basicdata/brand/basicClient.vue     |  2 +
 .../basicdata/brand/basicdataCustomerBase.vue |  4 +-
 .../brand/basicdataCustomerStore.vue          |  2 +
 4 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/src/views/basicdata/brand/basicBrand.vue b/src/views/basicdata/brand/basicBrand.vue
index 454d5790..6d6aa301 100644
--- a/src/views/basicdata/brand/basicBrand.vue
+++ b/src/views/basicdata/brand/basicBrand.vue
@@ -62,27 +62,34 @@
           <template v-for="(item,index) in option.column">
 
             <!-- table字段 -->
-            <el-table-column v-if="item.hide!==true && item.prop !='brandIcon'"
+            <el-table-column v-if="item.hide!==true "
                              :prop="item.prop"
                              :label="item.label"
                              :width="item.width"
                              :key="index" align="center">
-            </el-table-column>
-            <el-table-column v-if="item.hide!==true && item.prop =='brandIcon'"
-                             :prop="item.prop"
-                             :label="item.label"
-                             :width="item.width"
-                             :key="index" align="center">
-              <el-image
-                style="width: 40px; height: 40px;border-radius: 20px"
-                :src="item.label"
-                :zoom-rate="1.2"
-                :initial-index="4"
-                fit="cover"
-              />
-            </el-table-column>
-
+              <template #default="{row,$index}" v-if="item.hide!==true && item.prop =='brandIcon'">
+<!--                    {{$index}}-->
+                <div class="demo-image__preview">
+                  <el-image v-if="row.brandIcon !== undefined"
+                            lazy
+                            style="width: 140px; height: 45px;"
+                            :src="row.brandIcon"
+                            :preview-src-list="srcList"
+                            :initial-index="$index"
+                            fit="cover"
+                  />
+                </div>
 
+              </template>
+            </el-table-column>
+<!--            <el-table-column v-if="item.hide!==true && item.prop =='brandIcon'"-->
+<!--                             :prop="item.prop"-->
+<!--                             :label="item.label"-->
+<!--                             :width="item.width"-->
+<!--                             :key="index" align="center">-->
+<!--            -->
+<!--              -->
+<!--            </el-table-column>-->
           </template>
           <!-- 操作栏模块 -->
           <el-table-column prop="menu" label="操作" :width="300" align="center">
@@ -184,6 +191,7 @@ export default {
   data () {
     return {
       height: 0,
+      srcList : [],
       dataShi:'', //时间
       // 主键
       basicBrandId: '',
@@ -463,10 +471,12 @@ export default {
         this.query.postSetTime =  this.dataShi[1];
       }
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        console.log("res.data.data",res.data.data.records);
+        // console.log("res.data.data",res.data.data.records);
+        this.srcList = [];
         res.data.data.records.forEach( i => {
-          let a =  getFile(i.brandIcon);
-          console.log("QQQQQQQQQQQ",a);
+          this.srcList.push(i.brandIcon);
+          // let a =  getFile(i.brandIcon);
+          console.log("QQQQQQQQQQQ",i.brandIcon);
         })
         const data = res.data.data;
         this.page.total = data.total;
diff --git a/src/views/basicdata/brand/basicClient.vue b/src/views/basicdata/brand/basicClient.vue
index 9c5e2ea7..92c83a96 100644
--- a/src/views/basicdata/brand/basicClient.vue
+++ b/src/views/basicdata/brand/basicClient.vue
@@ -303,6 +303,7 @@ import { getDictionaryBiz } from '@/api/system/dict'
 import { getSelect,getLazyTree,getLazyList,getLazyTreeAll } from '@/api/base/region';
 import { getToken } from '@/utils/auth';
 import globalc from '@/api/basicdata/globalc';
+import { Base64 } from 'js-base64';
 
 
 export default {
@@ -456,6 +457,7 @@ export default {
     //打开文件
     downloadLink(row){
       console.log(">>>>>",row);
+      window.open('http://192.168.2.100:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(row.leaseAccessories)));
     },
     //控制控货
     makeCargo(row){
diff --git a/src/views/basicdata/brand/basicdataCustomerBase.vue b/src/views/basicdata/brand/basicdataCustomerBase.vue
index b577e90e..2e295d18 100644
--- a/src/views/basicdata/brand/basicdataCustomerBase.vue
+++ b/src/views/basicdata/brand/basicdataCustomerBase.vue
@@ -85,6 +85,7 @@
     },
     methods: {
       rowSave(row, done, loading) {
+        row.clientId = this.$route.query.id;
         add(row).then(() => {
           this.onLoad(this.page);
           this.$message({
@@ -98,6 +99,7 @@
         });
       },
       rowUpdate(row, index, done, loading) {
+
         update(row).then(() => {
           this.onLoad(this.page);
           this.$message({
@@ -217,7 +219,7 @@
             baseName_: baseName,
             baseCode_: baseCode,
         };
-
+        values.clientId = this.$route.query.id;
         getList(page.currentPage, page.pageSize, values).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
diff --git a/src/views/basicdata/brand/basicdataCustomerStore.vue b/src/views/basicdata/brand/basicdataCustomerStore.vue
index 71004ee8..01112ecc 100644
--- a/src/views/basicdata/brand/basicdataCustomerStore.vue
+++ b/src/views/basicdata/brand/basicdataCustomerStore.vue
@@ -84,6 +84,7 @@
     },
     methods: {
       rowSave(row, done, loading) {
+        row.clientId = this.$route.query.id;
         add(row).then(() => {
           this.onLoad(this.page);
           this.$message({
@@ -220,6 +221,7 @@
             storeCode_: storeCode,
             clientId_: clientId,
         };
+        values.clientId = this.$route.query.id;
 
         getList(page.currentPage, page.pageSize, values).then(res => {
           const data = res.data.data;