diff --git a/src/api/export.js b/src/api/export.js index 777ae1ab..12ccf939 100644 --- a/src/api/export.js +++ b/src/api/export.js @@ -325,3 +325,21 @@ export function getTrialSiteSurveyList_Export(data) { data }) } +// 导出中心设备 +export function getSiteSurveyEquipmentList_Export(data) { + return requestDownload({ + url: `/ExcelExport/getSiteSurveyEquipmentList_Export`, + responseType: 'blob', + method: 'post', + data + }) +} +// 导出中心调研基本信息 +export function getSiteSurveyInfoList_Export(data) { + return requestDownload({ + url: `/ExcelExport/getSiteSurveyInfoList_Export`, + responseType: 'blob', + method: 'post', + data + }) +} diff --git a/src/views/trials/trials-panel/attachments/site-research/components/Equipments.vue b/src/views/trials/trials-panel/attachments/site-research/components/Equipments.vue index c0006718..3300eb19 100644 --- a/src/views/trials/trials-panel/attachments/site-research/components/Equipments.vue +++ b/src/views/trials/trials-panel/attachments/site-research/components/Equipments.vue @@ -6,18 +6,28 @@ - + + + + + + + + + @@ -32,11 +42,7 @@ - + {{ $t('common:button:export') }} @@ -44,150 +50,162 @@ @@ -196,9 +214,11 @@ import { getTrialSiteSelect } from '@/api/trials' import { getSiteSurveyEquipmentList } from '@/api/research' import BaseContainer from '@/components/BaseContainer' import Pagination from '@/components/Pagination' +import { getSiteSurveyEquipmentList_Export } from '@/api/export' const searchDataDefault = () => { return { SortField: '', + State: "", Asc: true, PageIndex: 1, PageSize: 20, @@ -228,6 +248,9 @@ export default { this.getSite() }, methods: { + async handleExport() { + await getSiteSurveyEquipmentList_Export(this.searchData) + }, async getList() { try { this.loading = true @@ -242,20 +265,10 @@ export default { EquipmentControlFieldList.forEach(item => { this.equipmentControlFieldList.push(item.FiledName) }) + this.$nextTick(() => { + this.$refs.equipmentsList.doLayout() + }) } - } catch(e) { - console.log(e) - } finally { - this.loading = false - } - }, - // 导出 - async handleExport() { - try { - this.searchData.TrialId = this.trialId - this.loading = true - const { SortField, Asc, PageIndex, PageSize, ...param } = { ...this.searchData } - await trialSiteUserSummaryListExport({ ...param }) } catch (e) { console.log(e) } finally { diff --git a/src/views/trials/trials-panel/attachments/site-research/components/Questions.vue b/src/views/trials/trials-panel/attachments/site-research/components/Questions.vue index 742a23ee..35db4ecd 100644 --- a/src/views/trials/trials-panel/attachments/site-research/components/Questions.vue +++ b/src/views/trials/trials-panel/attachments/site-research/components/Questions.vue @@ -14,6 +14,20 @@ + + + + + + + + @@ -28,7 +42,7 @@ - + {{ $t('common:button:export') }} @@ -36,8 +50,8 @@