From b62d491b5cde9253d59dd229e8bb658c9b76e45f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 02 Apr 2021 11:57:29 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

---
 src/views/parcel/parcel.vue |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/views/parcel/parcel.vue b/src/views/parcel/parcel.vue
index 58e755a..6eb9cc3 100644
--- a/src/views/parcel/parcel.vue
+++ b/src/views/parcel/parcel.vue
@@ -12,6 +12,7 @@
                @row-update="rowUpdate"
                @row-save="rowSave"
                @row-del="rowDel"
+               @row-click="rowClick"
                @search-change="searchChange"
                @search-reset="searchReset"
                @selection-change="selectionChange"
@@ -20,7 +21,7 @@
                @refresh-change="refreshChange"
                @on-load="onLoad">
         
-      <template slot-scope="{ type, size, row }" slot="menu">
+      <!-- <template slot-scope="{ type, size, row }" slot="menu">
 
         <el-button
           v-if="row.imgUrl != null || row.imgUrl != ''"
@@ -30,7 +31,7 @@
           @click.stop="handleParcelPic(row)"
           >查看包裹图片
         </el-button>
-      </template>
+      </template> -->
       
     </avue-crud>
     <template>
@@ -68,6 +69,7 @@
         },
         selectionList: [],
         option: {
+          menu:false,
           height:'auto',
           calcHeight: 30,
           tip: false,
@@ -230,6 +232,13 @@
         this.onLoad(this.page, params);
         done();
       },
+      rowClick(row){
+        var that=this;
+        getParcelPic(row.imgUrl).then(res => {
+            that.imgUrl = res.data.data.imgBase64;
+            this.showViewer = true
+          });
+      },
       selectionChange(list) {
         this.selectionList = list;
       },
@@ -323,14 +332,6 @@
           this.loading = false;
           this.selectionClear();
         });
-      },
-      handleParcelPic(row) {
-        var that=this;
-        getParcelPic(row.imgUrl).then(res => {
-            that.imgUrl = res.data.data.imgBase64;
-            //that.$refs.preview.clickHandler();
-            this.showViewer = true
-          });
       },
       // 关闭查看器
       closeViewer() {

--
Gitblit v1.9.3