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

shuishen

2021-04-02 b9bc80def4e77e1bd2b224747a4dbf0b486e4c1d

 src/views/parcel/parcelKind.vue

@@ -1,5 +1,5 @@
<template>
  <basic-container>
    <basic-container>
    <avue-crud :option="option"
               :table-loading="loading"
               :data="data"
@@ -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,19 +19,50 @@
               @size-change="sizeChange"
               @refresh-change="refreshChange"
               @on-load="onLoad">
      <!-- <template slot-scope="{ type, size, row }" slot="menu">
        <el-button
          v-if="row.imgUrl != null || row.imgUrl != ''"
          icon="el-icon-view"
          :size="size"
          :type="type"
          @click.stop="handleParcelPic(row)"
          >查看包裹图片
        </el-button>
      </template> -->
    </avue-crud>
  </basic-container>
    <template>
      <div>
        <el-image-viewer 
                     class="img"
                     v-if="showViewer" 
                     :on-close="closeViewer" 
                     :url-list="['data:image/png;base64,'+imgUrl]" />
      </div>
    </template>
    </basic-container>

</template>


<script>
  import {getKindList, getDetail} from "@/api/parcel/parcel";
  import {getKindList, getParcelPic} from "@/api/parcel/parcel";
  import {mapGetters} from "vuex";
  import Vue from 'vue';
  import ElementUI from 'element-ui'
  import 'element-ui/lib/theme-chalk/index.css'
  import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
  Vue.use(ElementUI)


  export default {
    name:'index',
    components: { ElImageViewer },
    data() {
      return {
        form: {},
        query: {},
        showViewer: false, // 显示查看器
        imgUrl:'',
        loading: true,
        page: {
          pageSize: 10,
@@ -39,12 +71,13 @@
        },
        selectionList: [],
        option: {
          menu:false,
          height:'auto',
          calcHeight: 30,
          tip: false,
          searchShow: true,
          searchMenuSpan: 4,
          menuWidth:120,
          menuWidth:150,
          border: true,
          index: true,
          viewBtn: true,
@@ -67,10 +100,6 @@
              },
            },
            {
              label: "安检机名称",
              prop: "checkMachineName",
            },
            {
              label: "包裹ID",
              prop: "packageId",
            },
@@ -80,16 +109,17 @@
              hide:true
            },
            {
              label: "过机时间",
              prop: "samplingTime",
              label: "安检时间",
              prop: "createTime",
            },
            {
              label: "过机时间",
              label: "安检时间",
              prop: "dateTime",
              type: "datetime",
              format: "yyyy-MM-dd HH:mm:ss",
              valueFormat: "yyyy-MM-dd HH:mm:ss",
              searchRange: true,
              searchValue: [this.getStartTime(),this.getEndTime()],
              searchSpan: 8,
              hide: true,
              addDisplay: false,
@@ -104,25 +134,25 @@
                }
              ]
            },
            {
              label: "违禁类型",
              search: true,
              searchLabelWidth: 120,
              searchSpan: 4,
              hide: true,
              prop: "decisioDiagramResult",
              type: "select",
              dicData: [
                {
                  label: "是",
                  value: "contraband"
                },
                {
                  label: "否",
                  value: "normal"
                },
              ]
            },
            // {
            //   label: "违禁类型",
            //   search: true,
            //   searchLabelWidth: 120,
            //   searchSpan: 4,
            //   hide: true,
            //   prop: "decisioDiagramResult",
            //   type: "select",
            //   dicData: [
            //     {
            //       label: "是",
            //       value: "contraband"
            //     },
            //     {
            //       label: "否",
            //       value: "normal"
            //     },
            //   ]
            // },
            {
              label: '违禁品名称',
              prop: 'objName'
@@ -143,7 +173,8 @@
            }
          ]
        },
        data: []
        data: [],
        flag: false
      };
    },
    computed: {
@@ -151,7 +182,7 @@
      permissionList() {
        return {
          addBtn: this.vaildData(null, false),
          viewBtn: this.vaildData(this.permission.parcel_pic_view, true),
          viewBtn: this.vaildData(null, false),
          delBtn: this.vaildData(null, false),
          editBtn: this.vaildData(null, false)
        };
@@ -166,11 +197,7 @@
    },
    methods: {
      beforeOpen(done, type) {
        if (["edit", "view"].includes(type)) {
          getDetail(this.form.id).then(res => {
            this.form = res.data.data;
          });
        }
        
        done();
      },
      searchReset() {
@@ -190,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;
      },
@@ -198,6 +232,18 @@
      },
      refreshChange() {
        this.onLoad(this.page, this.query);
      },
      //获取开始时间返回搜索框
      getStartTime(){
           if (this.$route.query.startTime != undefined && this.$route.query.startTime != null && this.$route.query.startTime != "" ) {
             return this.$route.query.startTime
           }
      },
      //获取结束时间返回搜索框
      getEndTime(){
           if (this.$route.query.endTime != undefined && this.$route.query.endTime != null && this.$route.query.endTime != "" ) {
             return this.$route.query.endTime
           }
      },
      onLoad(page, params = {}) {
        const { dateTime } = this.query;
@@ -244,7 +290,18 @@
          this.loading = false;
          this.selectionClear();
        });
      },
      // 关闭查看器
      closeViewer() {
        this.showViewer = false
      }
    }
  };
</script>
<style lang="scss">
    .img {
      .el-icon-circle-close {
        color: white;
      }
    }
</style>