diff --git a/src/views/record/ChargeRecordView.vue b/src/views/record/ChargeRecordView.vue index dde4374..30e1755 100644 --- a/src/views/record/ChargeRecordView.vue +++ b/src/views/record/ChargeRecordView.vue @@ -53,7 +53,7 @@
- +
@@ -90,6 +90,7 @@ export default { format: "yyyy-mm-dd hh:ii:00", autoclose: true, }); + $('#table').bootstrapTable('destroy'); // 初始化表格,但不设置 `ajax` 方法,也不绑定 `url`,只提供列配置 $("#table").bootstrapTable({ @@ -177,6 +178,67 @@ export default { sidePagination: "server", queryParamsType: "undefined", data: [], // 初始化为空数据 + queryParams: function queryParams(params) { + //设置查询参数 + var param = { + pageNumber: params.pageNumber, + pageSize: params.pageSize, + erbanNo: $("#qErbanNo").val(), + channel: $("#qChannel").val(), + startTime: $("#qStartTime").val(), + endTime: $("#qEndTime").val(), + status: $("#qStatus").val(), + newUser: $("#qNewUser").val(), + appChannel: $("#qAppChannel").val(), + regionId: $("#regionId").val(), + }; + return param; + }, + uniqueId: 'id', + toolbar: "#toolbar", + url: "/admin/chargeRecord/list", + onLoadSuccess: function (res) { + console.log('load success'); + $("#table").bootstrapTable("load", { + rows: res.data.rows, + total: res.data.total, + }); + + $("#mapObjHtml span").remove(); + const totalMap = res.data.totalMap; + let str = ""; + const sortedKeys = Object.keys(totalMap).sort((keyA, keyB) => { + return keyA === "总充值{USD}" + ? -1 + : keyB === "总充值{USD}" + ? 1 + : 0; + }); + console.log(sortedKeys, '-------sortedKeys'); + // for (const key of sortedKeys) { + // str += ` + // ${key}: ${totalMap[key]}, + // `; + // } + // 处理第二项和最后一项 + sortedKeys.forEach((key, index) => { + let value = totalMap[key]; + if (index === 1) { + key = `包括(${key}`; + } + if (index === sortedKeys.length - 1) { + value = `${value})`; + } + str += ` + ${key}: ${value} + `; + }); + $("#mapObjHtml").append(str); + }, + onLoadError: function (err) { + console.log('load fail'); + serverError(err); + } }); // 查询刷新 @@ -218,14 +280,14 @@ export default { ? 1 : 0; }); - console.log(sortedKeys,'-------sortedKeys'); - // for (const key of sortedKeys) { - // str += ` - // ${key}: ${totalMap[key]}, - // `; - // } - // 处理第二项和最后一项 - sortedKeys.forEach((key, index) => { + console.log(sortedKeys, '-------sortedKeys'); + // for (const key of sortedKeys) { + // str += ` + // ${key}: ${totalMap[key]}, + // `; + // } + // 处理第二项和最后一项 + sortedKeys.forEach((key, index) => { let value = totalMap[key]; if (index === 1) { key = `包括(${key}`; @@ -277,19 +339,19 @@ export default { }, initRegionInfoList() { regionInfoList().then(res => { - let data = res.data; - buildSelectOption( - "#regionId", - null, - data.map((v) => { - return { - value: v.id, - text: v.regionDesc, - }; - }) - ); - }); - }, + let data = res.data; + buildSelectOption( + "#regionId", + null, + data.map((v) => { + return { + value: v.id, + text: v.regionDesc, + }; + }) + ); + }); + }, }, };