From 53601022365c0ad1bf53a89a03e9dc32a0b86a24 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 18 Oct 2022 16:40:15 +0800
Subject: [PATCH] bug

---
 .../AppBayonetRegistration/components/Detail.vue    |  2 ++
 .../apps/AppBayonetRegistration/components/List.vue | 13 +++++++++++--
 .../apps/AppDataComparison/components/List.vue      | 13 ++++++++++++-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue b/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
index 64ad28a7..87d94e38 100644
--- a/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
+++ b/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
@@ -195,6 +195,8 @@
             this.info = res.data
             this.info.riskDisposalList = res.data.riskDisposalList.filter(v => !v.communityHandleType)
             this.communityInfo = res.data.riskDisposalList.filter(v => v.communityHandleType).length ? res.data.riskDisposalList.filter(v => v.communityHandleType)[0] : {}
+            console.log(res.data.riskDisposalList.filter(v => v.communityHandleType))
+            console.log(this.communityInfo)
 
             this.info.travelTypeNames = res.data.travelType.split(',').map(v => {
               return this.dict.getLabel('EP_travelType', v)
diff --git a/project/pingchang/apps/AppBayonetRegistration/components/List.vue b/project/pingchang/apps/AppBayonetRegistration/components/List.vue
index 750dd70f..ba75e999 100644
--- a/project/pingchang/apps/AppBayonetRegistration/components/List.vue
+++ b/project/pingchang/apps/AppBayonetRegistration/components/List.vue
@@ -46,7 +46,7 @@
               placeholder="选择结束日期"
               @change="search.current = 1, getList()">
             </el-date-picker>
-            <ai-download :instance="instance" url="/app/appepidemicpreventionregisterinfo/export" :params="search" fileName="卡口登记" :disabled="tableData.length == 0">
+            <ai-download :instance="instance" url="/app/appepidemicpreventionregisterinfo/export" :params="params" fileName="卡口登记" :disabled="tableData.length == 0">
               <el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出</el-button>
             </ai-download>
           </template>
@@ -139,7 +139,16 @@
     },
 
     computed: {
-      ...mapState(['user'])
+      ...mapState(['user']),
+
+      params () {
+        return {
+          ...this.search,
+          arriveAreaId: this.search.arriveAreaId,
+          queryBeginTime: this.search.queryBeginTime ? this.search.queryBeginTime + ' 00:00:00' : '',
+          queryEndTime: this.search.queryEndTime ? this.search.queryEndTime + ' 23:59:59' : ''
+        }
+      }
     },
 
     created () {
diff --git a/project/pingchang/apps/AppDataComparison/components/List.vue b/project/pingchang/apps/AppDataComparison/components/List.vue
index 7de0f674..24bd8ed5 100644
--- a/project/pingchang/apps/AppDataComparison/components/List.vue
+++ b/project/pingchang/apps/AppDataComparison/components/List.vue
@@ -33,7 +33,7 @@
           <ai-import :instance="instance" :dict="dict" type="appepidemicpreventiondatamatch" name="数据比对" @success="getList()">
             <el-button icon="iconfont iconImport" type="primary">导入</el-button>
           </ai-import>
-          <ai-download :instance="instance" url="/app/appepidemicpreventiondatamatch/export" :params="search" fileName="数据比对" :disabled="tableData.length == 0">
+          <ai-download :instance="instance" url="/app/appepidemicpreventiondatamatch/export" :params="params" fileName="数据比对" :disabled="tableData.length == 0">
             <el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出</el-button>
           </ai-download>
         </template>
@@ -131,6 +131,17 @@
       }
     },
 
+    computed: {
+      params () {
+        return {
+          ...this.search,
+          arriveAreaId: this.search.arriveAreaId,
+          queryBeginTime: this.search.queryBeginTime ? this.search.queryBeginTime + ' 00:00:00' : '',
+          queryEndTime: this.search.queryEndTime ? this.search.queryEndTime + ' 23:59:59' : ''
+        }
+      }
+    },
+
     created () {
       this.loading = true