From 33c4e059eeb71de6f186bc4ee22e05bfd3bd5aeb Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 24 Mar 2021 18:23:45 +0800
Subject: [PATCH] 问题修复

---
 src/views/parcel/parcel.vue |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/src/views/parcel/parcel.vue b/src/views/parcel/parcel.vue
index ed3411e..1385463 100644
--- a/src/views/parcel/parcel.vue
+++ b/src/views/parcel/parcel.vue
@@ -18,12 +18,33 @@
                @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>
+    <el-dialog class="parcel-dialog" title="包裹图片" :visible.sync="dialogTableVisible" :append-to-body="true" :close-on-click-modal="false"
+          @opened="parcelConversation = true" @close="(parcelConversation = false), (oldParcelSatart = false)" >
+          <div>
+            <img :src="'data:image/png;base64,'+imgUrl" >
+          </div>
+    </el-dialog>
   </basic-container>
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove} from "@/api/parcel/parcel";
+  import {getList, getDetail, getParcelPic} from "@/api/parcel/parcel";
   import {mapGetters} from "vuex";
 
   export default {
@@ -31,7 +52,11 @@
       return {
         form: {},
         query: {},
+        imgUrl:'',
         loading: true,
+        dialogTableVisible: false,
+        parcelConversation:false,
+        oldParcelSatart:false,
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -50,7 +75,7 @@
           viewBtn: true,
           selection: true,
           labelWidth:120,
-          menuWidth:120,
+          menuWidth:220,
           dialogClickModal: false,
           headerAlign: 'center',
           align: 'center',
@@ -81,11 +106,11 @@
               hide:true
             },
             {
-              label: "过机时间",
+              label: "安检时间",
               prop: "samplingTime",
             },
             {
-              label: "过机时间",
+              label: "安检时间",
               prop: "dateTime",
               type: "datetime",
               format: "yyyy-MM-dd HH:mm:ss",
@@ -152,7 +177,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)
         };
@@ -167,8 +192,9 @@
     },
     methods: {
       beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
+        console.log(type);
+        if (["view"].includes(type)) {
+          getDetail(this.form.imgUrl).then(res => {
             this.form = res.data.data;
           });
         }
@@ -207,7 +233,6 @@
           ...params,
         };
 
-        debugger;
         if (this.$route.query.decisioDiagramResult && this.$route.query!='' && this.$route.query!=null && this.$route.query!=undefined ) {
             if (this.$route.query.startTime != undefined && this.$route.query.startTime != null && this.$route.query.startTime != "" ) {
               this.page.currentPage = 1;
@@ -222,7 +247,17 @@
                 decisioDiagramResult:this.$route.query.decisioDiagramResult
               };
             }
+        }else{
+            if (this.$route.query.startTime != undefined && this.$route.query.startTime != null && this.$route.query.startTime != "" ) {
+              this.page.currentPage = 1;
+              params = {
+                startTime:this.$route.query.startTime,
+                endTime:this.$route.query.endTime
+              }
+            }
         }
+
+
         if (dateTime) {
           values = {
             ...params,
@@ -246,6 +281,13 @@
           this.loading = false;
           this.selectionClear();
         });
+      },
+      handleParcelPic(row) {
+        console.log(row.imgUrl);
+        getParcelPic(row.imgUrl).then(res => {
+            this.imgUrl = res.data.data.imgBase64;
+          });
+        this.dialogTableVisible = true;
       }
     }
   };

--
Gitblit v1.9.3