diff --git a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue index be41feb..0460315 100644 --- a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue +++ b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue @@ -102,6 +102,7 @@ import CommitteeMemberModule from '@views/dataNetworkDiskManagement/committee/mo import { getAction } from '@api/manage' import PageHeaderTitle from '@comp/layouts/PageHeaderTitle' import IconImg from '@/assets/imgs/icon/icon_committee.png' +import { downloadFile } from '../../../api/manage' export default { name: 'CommitteeMaintenance', @@ -123,7 +124,7 @@ export default { delete: '/payCaseCommittee/payCaseCommittee/delete', deleteMember: '/payCaseCommitteeSubitem/payCaseCommitteeSubitem/delete', deleteBatch: '/payCaseCommitteeSubitem/payCaseCommitteeSubitem/deleteBatch', - exportXlsUrl: '/payCaseCommittee/payCaseCommittee/exportXls' + exportXlsUrl: '/payCaseCommitteeSubitem/payCaseCommitteeSubitem/exportXls' }, // 父级表头 columns: [ @@ -204,6 +205,17 @@ export default { this.$refs.modalForm.title = '新增分标委' this.$refs.modalForm.disableSubmit = false }, + handleExportXls(fileName) { + if (!fileName || typeof fileName != 'string') { + fileName = '导出文件' + } + let param = this.getQueryParams() + if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { + param['ids'] = this.selectedRowKeys.join(',') + } + console.log('导出参数', param) + downloadFile(this.url.exportXlsUrl, fileName + '.xls', param) + }, /** * 新增成员 * @param record diff --git a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue index 67995be..dd8c58f 100644 --- a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue +++ b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue @@ -110,6 +110,7 @@ import { JeroListMixin } from '../../../mixins/JeroListMixin' import JYearDate from '../../../components/jero/JYearDate' import { getAction } from '@api/manage' import CompanySelect from '@comp/company/CompanySelect' +import { filterObj } from '../../../utils/util' export default { name: 'EnterprisePaymentStatisticsList', @@ -238,6 +239,26 @@ export default { true ) }, + getQueryParams() { + //获取查询条件 + let sqp = {} + if (this.superQueryParams) { + sqp['superQueryParams'] = encodeURI(this.superQueryParams) + sqp['superQueryMatchType'] = this.superQueryMatchType + } + // var param = Object.assign(sqp, this.queryParam, this.isorter ,this.filters); + let param = Object.assign(sqp, this.lastQueryParam, this.isorter, this.filters) + param.field = this.getQueryField() + param.pageNo = this.ipagination.current + param.pageSize = this.ipagination.pageSize + // 获取企业id作为查询参数 + if (param.chargeCompany && param.chargeCompany.hasOwnProperty.call(param.chargeCompany, 'id')) { + param.chargeCompanyId = param.chargeCompany.id + // 将企业信息对象从查询参数中去掉 + delete param.chargeCompany + } + return filterObj(param) + }, loadData(arg) { if (!this.url.list) { this.$message.error('请设置url.list属性!') @@ -248,11 +269,9 @@ export default { this.ipagination.current = 1 } let params = this.getQueryParams()//查询条件 - if (params.chargeCompany) { - params.chargeCompanyId = params.chargeCompany.id - } - // 将企业信息对象从查询参数中去掉 - delete params.chargeCompany + // if (params.chargeCompany) { + // params.chargeCompanyId = params.chargeCompany.id + // } console.log(params) this.loading = true getAction(this.url.list, params).then((res) => {