From 6463b10c9802e9e5c30b12fecabec93d05d2d64b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 23 Mar 2021 17:10:45 +0800
Subject: [PATCH] 包裹，违禁品页面修改

---
 src/views/parcel/parcel.vue |   39 +++++++++++++--------------------------
 1 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/src/views/parcel/parcel.vue b/src/views/parcel/parcel.vue
index 2ed74d0..ed3411e 100644
--- a/src/views/parcel/parcel.vue
+++ b/src/views/parcel/parcel.vue
@@ -44,11 +44,13 @@
           tip: false,
           searchShow: true,
           searchMenuSpan: 6,
+          activeClass: 3,
           border: true,
           index: true,
           viewBtn: true,
           selection: true,
           labelWidth:120,
+          menuWidth:120,
           dialogClickModal: false,
           headerAlign: 'center',
           align: 'center',
@@ -58,7 +60,7 @@
               label: '坐标',
               prop: 'test',
               hide: true,
-              span: 24,
+              span: 50,
               component: "avueMap",
               clickChild: (obj) => {
                 this.form.jd = obj.latitude
@@ -76,6 +78,7 @@
             {
               label: "包裹图片KEY",
               prop: "imgUrl",
+              hide:true
             },
             {
               label: "过机时间",
@@ -139,22 +142,6 @@
               label: "违禁包裹物品",
               prop: "decisioDiagramResultDetails",
             }
-          ],
-          group: [
-            {
-              label: '违禁品信息',
-              prop: 'coordsDetailVoList',
-              column: [
-                {
-                  label: '违禁品名称',
-                  prop: 'objName'
-                },
-                {
-                  label: '违禁品编号',
-                  prop: 'objCode'
-                }
-              ]
-            }
           ]
         },
         data: []
@@ -214,28 +201,28 @@
         this.onLoad(this.page, this.query);
       },
       onLoad(page, params = {}) {
+        debugger;
         const { dateTime } = this.query;
         let values = {
           ...params,
         };
 
-        if (this.$route.query.type && this.$route.query != undefined && this.$route.query != null && this.$route.query != "" ) {
-            if (this.$route.query.status != undefined && this.$route.query.status != null && this.$route.query.status == "" ) {
-              this.activeClass = this.$route.query.type;
+        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;
               params = {
-                status:this.$route.query.status,
-                type:this.$route.query.type
+                startTime:this.$route.query.startTime,
+                endTime:this.$route.query.endTime,
+                decisioDiagramResult:this.$route.query.decisioDiagramResult
               }
             } else {
-              this.activeClass = 0;
               this.page.currentPage = 1;
               params = {
-                type:this.$route.query.type
+                decisioDiagramResult:this.$route.query.decisioDiagramResult
               };
             }
         }
-
         if (dateTime) {
           values = {
             ...params,
@@ -249,8 +236,8 @@
             ...params,
             ...this.query,
           };
-        }
 
+        }
         this.loading = true;
         getList(page.currentPage, page.pageSize,values).then(res => {
           const data = res.data.data;

--
Gitblit v1.9.3