diff --git a/src/assets/imgs/icon/xin.png b/src/assets/imgs/icon/xin.png new file mode 100644 index 0000000..95a8925 Binary files /dev/null and b/src/assets/imgs/icon/xin.png differ diff --git a/src/views/dataNetworkDiskManagement/dataDownloadRecord/DataDownloadRecord.vue b/src/views/dataNetworkDiskManagement/dataDownloadRecord/DataDownloadRecord.vue index 86e87b6..a237e12 100644 --- a/src/views/dataNetworkDiskManagement/dataDownloadRecord/DataDownloadRecord.vue +++ b/src/views/dataNetworkDiskManagement/dataDownloadRecord/DataDownloadRecord.vue @@ -5,22 +5,22 @@
- + - + - + - - - - - - + + + + + + - + @@ -54,7 +54,7 @@
- 导出 + 导出
@@ -127,7 +127,9 @@ import PageHeaderTitle from '@comp/layouts/PageHeaderTitle' import IconImg from '@/assets/imgs/icon/icon_committee.png' import { JeroListMixin } from '@/mixins/JeroListMixin' import { RangeDateMixin } from '@/mixins/RangeDateMixin' +import { downloadFile } from '@/api/manage' import JDate from '@comp/tools/JDate' +import { getAction } from '@/api/manage' export default { name: 'DataDownloadRecord', @@ -139,6 +141,10 @@ export default { visible: false, record: {}, confirmLoading: false, + dateKeyObj: { + beginKey: 'startTime', + endKey: 'endTime' + }, labelCol: { xl: { span: 6 }, xs: { span: 24 }, @@ -211,6 +217,10 @@ export default { } } ], + filters: { + column: '', + order: '' + }, url: { list: 'payFileDownloadRecord/payFileDownloadRecord/list', exportXlsUrl: 'payFileDownloadRecord/payFileDownloadRecord/exportXls', @@ -218,22 +228,56 @@ export default { } } }, + watch:{ + // format显示YYYY-MM-DD 后端传 YYYY-MM-DD HH:mm:ss + 'queryParam.startTime'() { + this.queryParam.startTime = this.queryParam.startTime ? (this.queryParam.startTime.indexOf('00:00:00') > -1 ? this.queryParam.startTime : this.queryParam.startTime + ' 00:00:00') : undefined + this.lastQueryParam = {...this.queryParam} + }, + 'queryParam.endTime'() { + this.queryParam.endTime = this.queryParam.endTime ? (this.queryParam.endTime.indexOf('23:59:59') > -1 ? this.queryParam.endTime : this.queryParam.endTime + ' 23:59:59') : undefined + this.lastQueryParam = {...this.queryParam} + } + }, methods: { download(record) { this.record = record this.visible = true }, handleOk() { - console.log(this.record.fileId) - + console.log(this.record) + this.confirmLoading = true + // 下载文件 + getAction(this.url.download, { fileId: this.record.fileId}).then(res=>{ + console.log(res) + this.close() + }).catch( err =>{ + this.$message.error(err.message) + this.confirmLoading = 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(',') + } + downloadFile(this.url.exportXlsUrl, fileName + '.xls', param) }, handleCancel() { this.visible = false + }, + close() { + this.visible = false + this.confirmLoading = false } } } \ No newline at end of file diff --git a/src/views/mailManagement/ContractMail.vue b/src/views/mailManagement/ContractMail.vue new file mode 100644 index 0000000..d7a77b0 --- /dev/null +++ b/src/views/mailManagement/ContractMail.vue @@ -0,0 +1,210 @@ + + + \ No newline at end of file diff --git a/src/views/mailManagement/modules/MailContractModal.vue b/src/views/mailManagement/modules/MailContractModal.vue new file mode 100644 index 0000000..08be1ce --- /dev/null +++ b/src/views/mailManagement/modules/MailContractModal.vue @@ -0,0 +1,158 @@ + + + \ No newline at end of file diff --git a/src/views/mailManagement/modules/MailModal.vue b/src/views/mailManagement/modules/MailModal.vue new file mode 100644 index 0000000..c072e8e --- /dev/null +++ b/src/views/mailManagement/modules/MailModal.vue @@ -0,0 +1,168 @@ + + + \ No newline at end of file