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()"> - + 导出 @@ -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 @@ 导入 - + 导出 @@ -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