Merge branch 'develop' of 101.201.121.115:leo/LAPP_MY_WEBFRONT into feature_meiyuan

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' &&

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'
             )