Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

shuishen

2021-04-02 b62d491b5cde9253d59dd229e8bb658c9b76e45f

 src/views/parcel/parcelKind.vue

@@ -11,6 +11,7 @@
               @row-update="rowUpdate"
               @row-save="rowSave"
               @row-del="rowDel"
               @row-click="rowClick"
               @search-change="searchChange"
               @search-reset="searchReset"
               @selection-change="selectionChange"
@@ -18,7 +19,7 @@
               @size-change="sizeChange"
               @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 != ''"
          icon="el-icon-view"
@@ -27,16 +28,10 @@
          @click.stop="handleParcelPic(row)"
          >查看包裹图片
        </el-button>
      </template>
      </template> -->
    </avue-crud>
    <template>
      <div>
        <!-- style="display:none" -->
        <!-- <el-image 
        ref="preview"
        :src="'data:image/png;base64,'+imgUrl"
        :preview-src-list="['data:image/png;base64,'+imgUrl]"
        z-index=9999></el-image> -->
        <el-image-viewer 
                     class="img"
                     v-if="showViewer" 
@@ -76,6 +71,7 @@
        },
        selectionList: [],
        option: {
          menu:false,
          height:'auto',
          calcHeight: 30,
          tip: false,
@@ -221,6 +217,13 @@
        this.selectionList = [];
        this.$refs.crud.toggleSelection();
      },
      rowClick(row){
        var that=this;
        getParcelPic(row.imgUrl).then(res => {
            that.imgUrl = res.data.data.imgBase64;
            this.showViewer = true
          });
      },
      currentChange(currentPage){
        this.page.currentPage = currentPage;
      },
@@ -287,14 +290,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() {