From a4e06ccd3cd976fbe4eef99e188d42ec9f3ad054 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 08 Apr 2021 09:32:05 +0800
Subject: [PATCH] 样式修改

---
 src/views/parcel/parcelKind.vue |   65 ++++++++++++++++++++------------
 1 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/src/views/parcel/parcelKind.vue b/src/views/parcel/parcelKind.vue
index e922997..29a7292 100644
--- a/src/views/parcel/parcelKind.vue
+++ b/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,19 +28,14 @@
           @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 
-                     v-if="showViewer" 
-                     :on-close="closeViewer" 
+        <el-image-viewer
+                     class="img"
+                     v-if="showViewer"
+                     :on-close="closeViewer"
                      :url-list="['data:image/png;base64,'+imgUrl]" />
       </div>
     </template>
@@ -75,13 +71,15 @@
         },
         selectionList: [],
         option: {
+          menu:false,
           height:'auto',
           calcHeight: 30,
           tip: false,
           searchShow: true,
           searchMenuSpan: 4,
           menuWidth:150,
-          border: true,
+          border: false,
+          stripe:true,
           index: true,
           viewBtn: true,
           selection: true,
@@ -122,6 +120,7 @@
               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,
@@ -199,7 +198,7 @@
     },
     methods: {
       beforeOpen(done, type) {
-        
+
         done();
       },
       searchReset() {
@@ -219,6 +218,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;
       },
@@ -227,6 +233,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;
@@ -274,18 +292,17 @@
           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() {
-          this.showViewer = false
-        }
+      closeViewer() {
+        this.showViewer = false
+      }
     }
   };
 </script>
+<style lang="scss">
+    .img {
+      .el-icon-circle-close {
+        color: white;
+      }
+    }
+</style>

--
Gitblit v1.9.3