diff --git a/src/api/refund/refund.js b/src/api/refund/refund.js index f5dd644..7234333 100644 --- a/src/api/refund/refund.js +++ b/src/api/refund/refund.js @@ -31,4 +31,18 @@ export const refundList = query => { export const refundExport = query => { window.location.href = `/admin/chargeRecord/refundExport?${genQueryParam(query)}`; return; +}; +// ======================================金币钻石操作记录================================== +// 列表 +export const goldcoinRecordAll = query => { + return request({ + url: '/admin/goldcoin/recordAll', + method: 'get', + params: query + }); +}; +// 导出 +export const recordAllExport = query => { + window.location.href = `/admin/goldcoin/recordAllExport?${genQueryParam(query)}`; + return; }; \ No newline at end of file diff --git a/src/api/relAgency/relAgency.js b/src/api/relAgency/relAgency.js index e7e7a40..a91c426 100644 --- a/src/api/relAgency/relAgency.js +++ b/src/api/relAgency/relAgency.js @@ -13,6 +13,12 @@ export const listPartitionInfo = query => { }); }; +// 充值代理列表导出 +export const chargeAgentExport = query => { + window.location.href = `/anchorSalaryBill/chargeAgent/export?${genQueryParam(query)}`; + return; +}; + // 获取 周期列表 export const getDateCycleList = query => { return request({ diff --git a/src/views/guildOperationManagement/agentSendSalary.vue b/src/views/guildOperationManagement/agentSendSalary.vue index 7ad8b93..2e32e4d 100644 --- a/src/views/guildOperationManagement/agentSendSalary.vue +++ b/src/views/guildOperationManagement/agentSendSalary.vue @@ -54,6 +54,9 @@ 搜索 重置搜索 + 导出 @@ -127,6 +130,7 @@ import { chargeAgentList, chargeAgentSum, listPartitionInfo, + chargeAgentExport, } from "@/api/relAgency/relAgency.js"; import TablePagination from "@/components/common/TablePagination"; import { formatDate, formatDateYMD } from "@/utils/relDate"; @@ -192,7 +196,7 @@ export default { // this.getData(); listPartitionInfo().then((res) => { this.partitionArr = res.data; - this.searchForm.partitionId=this.partitionArr[0].id; + this.searchForm.partitionId = this.partitionArr[0].id; }); }, methods: { @@ -246,6 +250,32 @@ export default { } }); }, + // 导出 + chargeAgentExportFun() { + + let { pageParams, searchForm } = this; + console.log(searchForm); + searchForm.startTime = searchForm.startTime + ? dateFormat(searchForm.startTime, "yyyy-MM-dd hh:mm:ss") + : null; + searchForm.endTime = searchForm.endTime + ? dateFormat(searchForm.endTime, "yyyy-MM-dd hh:mm:ss") + : null; + searchForm = JSON.parse(JSON.stringify(searchForm)); + pageParams = JSON.parse(JSON.stringify(pageParams)); + Object.keys(searchForm).forEach((item) => { + if ( + !searchForm[item] || + (searchForm[item] !== undefined && searchForm[item] === "") + ) { + delete searchForm[item]; + } + }); + Object.assign(pageParams, searchForm); + console.log(pageParams); + + chargeAgentExport(pageParams).then((res) => {}); + }, // 点击搜索 handSearch() { this.$refs["searchForm"].validate((valid) => { @@ -270,7 +300,7 @@ export default { }, handlePageChange(val) { // this.$set(this.pageParams, 'pageNo', val); - this.pageParams.pageSize = val; + this.pageParams.pageNo = val; this.getData(); }, headerCopy(column, e) { diff --git a/src/views/refund/goldDiamondOperationRecord.vue b/src/views/refund/goldDiamondOperationRecord.vue index d7ff072..c9c11d6 100644 --- a/src/views/refund/goldDiamondOperationRecord.vue +++ b/src/views/refund/goldDiamondOperationRecord.vue @@ -51,7 +51,7 @@ 时间 - + + - - - - + + + + + + + - - - - - - + + + import { listPartitionInfo, - refundList, - regionInfoList, - refundExport, + goldcoinRecordAll, + recordAllExport, } from "@/api/refund/refund"; // @ts-ignore import { dateFormat } from "@/utils/system-helper"; @@ -135,16 +142,6 @@ import { dateFormat } from "@/utils/system-helper"; import { ElMessage } from "element-plus"; export default { name: "goldDiamondOperationRecord", - computed: { - sortedMapObj() { - const entries = Object.entries(this.mapObj); - // 将 "总充值{USD}" 的键排到第一位 - entries.sort(([keyA], [keyB]) => - keyA === "总充值{USD}" ? -1 : keyB === "总充值{USD}" ? 1 : 0 - ); - return Object.fromEntries(entries); - }, - }, data() { return { loading: false, @@ -177,16 +174,24 @@ export default { pageSize: 10, //条数 }; }, + computed: { + sortedMapObj() { + const entries = Object.entries(this.mapObj); + // 将 "总充值{USD}" 的键排到第一位 + entries.sort(([keyA], [keyB]) => + keyA === "总充值{USD}" ? -1 : keyB === "总充值{USD}" ? 1 : 0 + ); + return Object.fromEntries(entries); + }, + }, created() { listPartitionInfo().then((res) => { this.inquire.partitionArr = res.data; this.inquire.partitionId = this.inquire.partitionArr[0].id; }); - regionInfoList().then((res) => { - this.inquire.countryArr = res.data; - }); }, methods: { + dateFormat, // 查询接口 getData() { this.loading = true; @@ -194,17 +199,12 @@ export default { let startTime = ""; let endTime = ""; if (time && time.length > 0) { - startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd 00:00:00"); - endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd 23:59:59"); + startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss"); + endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss"); } - refundList({ + goldcoinRecordAll({ partitionId: this.inquire.partitionId, - channel: this.inquire.paymentChannels, - chargeRecordId: this.inquire.rechargeNumber, - pingxxChargeId: this.inquire.partyNumber, - refundStatus: this.inquire.status, - regionId: this.inquire.country, - os: this.inquire.platform, + type: this.inquire.platform, erbanNo: this.inquire.userId, pageNo: this.currentPage, pageSize: this.pageSize, @@ -236,14 +236,9 @@ export default { startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd 00:00:00"); endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd 23:59:59"); } - refundExport({ + recordAllExport({ partitionId: this.inquire.partitionId, - channel: this.inquire.paymentChannels, - chargeRecordId: this.inquire.rechargeNumber, - pingxxChargeId: this.inquire.partyNumber, - refundStatus: this.inquire.status, - regionId: this.inquire.country, - os: this.inquire.platform, + type: this.inquire.platform, erbanNo: this.inquire.userId, pageNo: this.currentPage, pageSize: this.pageSize,