From d29e532ae41721d78abfa93f59bf11d3488367eb Mon Sep 17 00:00:00 2001
From: wangxy <xinyao.wang@le-it.com.cn>
Date: Mon, 31 May 2021 11:08:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=BC=B4=E8=B4=B9=E3=80=81?=
 =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E5=8F=B0=E8=B4=A6=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/property/fixFee.vue      | 12 +++++++++++-
 src/views/reportform/financial.vue |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/views/property/fixFee.vue b/src/views/property/fixFee.vue
index fae9531..f23c9b6 100644
--- a/src/views/property/fixFee.vue
+++ b/src/views/property/fixFee.vue
@@ -162,7 +162,7 @@ export default {
                 item !== 'info' &&
                 item !== 'chargeway'
             )
-          } else if (this.queryHistoryParams.chargetype === 2) {
+          } else if (this.queryParams.chargetype === 2) {
             this.headers = Object.keys(this.dataList[0]).filter(
               (item) =>
                 item !== 'propertyid' &&
@@ -171,9 +171,19 @@ export default {
                 item !== 'info' &&
                 item !== 'chargeway'
             )
+          } else if (this.queryParams.chargetype === 3) {
+            this.headers = Object.keys(this.dataList[0]).filter(
+              (item) =>
+                item !== 'propertyid' &&
+                item !== 'accesscardid' &&
+                item !== 'chargenr' &&
+                item !== 'info' &&
+                item !== 'chargeway'
+            )
           } else {
             this.headers = Object.keys(this.dataList[0]).filter(
               (item) =>
+								item !== 'carportid' &&
                 item !== 'propertyid' &&
                 item !== 'accesscardid' &&
                 item !== 'chargenr' &&
diff --git a/src/views/reportform/financial.vue b/src/views/reportform/financial.vue
index 9c5a104..094ac47 100644
--- a/src/views/reportform/financial.vue
+++ b/src/views/reportform/financial.vue
@@ -282,11 +282,11 @@ export default {
             this.headers = Object.keys(this.dataList[0]).filter(
               (item) => item !== 'accesscardid' && item !== 'carportid'
             )
-          } else if (this.queryHistoryParams.chargetype === 2) {
+          } else if (this.queryParams.chargetype === 2) {
             this.headers = Object.keys(this.dataList[0]).filter(
               (item) => item !== 'propertyid' && item !== 'carportid'
             )
-          } else if (this.queryHistoryParams.chargetype === 3) {
+          } else if (this.queryParams.chargetype === 3) {
             this.headers = Object.keys(this.dataList[0]).filter(
               (item) => item !== 'propertyid' && item !== 'accesscardid'
             )