|
@@ -29,13 +29,15 @@
|
|
|
bordered
|
|
|
:loading="loading"
|
|
|
size="middle"
|
|
|
- :scroll="{ x: 2300 }"
|
|
|
+ :scroll="{ x: 2500 }"
|
|
|
:pagination="ipagination"
|
|
|
@change="pageChange"
|
|
|
>
|
|
|
<!-- <span slot="isHasData" slot-scope="text">{{ text == 0 ? '否' : '是' }}</span> -->
|
|
|
- <span slot="fengmianClickRate" slot-scope="text">{{ text | getBo }}</span>
|
|
|
- <span slot="convertClickRate" slot-scope="text">{{ text | getBo }}</span>
|
|
|
+ <!-- <span slot="fengmianClickRate" slot-scope="text">{{ text | getBo }}</span>
|
|
|
+ <span slot="convertClickRate" slot-scope="text">{{ text | getBo }}</span> -->
|
|
|
+ <span slot="industry" slot-scope="text">{{ text ?text:'暂无数据' }}</span>
|
|
|
+ <span slot="secondIndustry" slot-scope="text">{{ text ?text:'暂无数据' }}</span>
|
|
|
</a-table>
|
|
|
</a-card>
|
|
|
</a-col>
|
|
@@ -108,9 +110,9 @@ const columns = [
|
|
|
align: 'center'
|
|
|
},
|
|
|
{
|
|
|
- title: '广告主创建时间',
|
|
|
- dataIndex: 'advertiserCreateTime',
|
|
|
- key: 'advertiserCreateTime',
|
|
|
+ title: '账户名称',
|
|
|
+ dataIndex: 'accountName',
|
|
|
+ key: 'accountName',
|
|
|
align: 'center'
|
|
|
},
|
|
|
{
|
|
@@ -118,84 +120,91 @@ const columns = [
|
|
|
dataIndex: 'costCampaignCount',
|
|
|
key: 'costCampaignCount',
|
|
|
align: 'center',
|
|
|
- sorter: (a, b) => a.costCampaignCount - b.costCampaignCount
|
|
|
+ // sorter: (a, b) => a.costCampaignCount - b.costCampaignCount
|
|
|
},
|
|
|
{
|
|
|
title: '总余额',
|
|
|
dataIndex: 'balance',
|
|
|
key: 'balance',
|
|
|
align: 'center',
|
|
|
- sorter: (a, b) => a.balance - b.balance
|
|
|
+ // sorter: (a, b) => a.balance - b.balance
|
|
|
},
|
|
|
{
|
|
|
title: '总消耗',
|
|
|
dataIndex: 'cost',
|
|
|
key: 'cost',
|
|
|
align: 'center',
|
|
|
- sorter: (a, b) => a.cost - b.cost
|
|
|
+ // sorter: (a, b) => a.cost - b.cost
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '消耗环比',
|
|
|
+ dataIndex: 'chargeDayOnDayPercent',
|
|
|
+ key: 'chargeDayOnDayPercent',
|
|
|
+ align: 'center',
|
|
|
+ // sorter: (a, b) => a.cost - b.cost
|
|
|
},
|
|
|
{
|
|
|
title: '现金消耗',
|
|
|
dataIndex: 'xianjinCost',
|
|
|
key: 'xianjinCost',
|
|
|
align: 'center',
|
|
|
- sorter: (a, b) => a.xianjinCost - b.xianjinCost
|
|
|
+ // sorter: (a, b) => a.xianjinCost - b.xianjinCost
|
|
|
},
|
|
|
{
|
|
|
- title: '后返消耗',
|
|
|
+ title: '返点消耗',
|
|
|
dataIndex: 'fandianCost',
|
|
|
key: 'fandianCost',
|
|
|
align: 'center',
|
|
|
- sorter: (a, b) => a.fandianCost - b.fandianCost
|
|
|
+ // sorter: (a, b) => a.fandianCost - b.fandianCost
|
|
|
},
|
|
|
{
|
|
|
title: '框返消耗',
|
|
|
dataIndex: 'kuangfanCost',
|
|
|
key: 'kuangfanCost',
|
|
|
align: 'center',
|
|
|
- sorter: (a, b) => a.kuangfanCost - b.kuangfanCost
|
|
|
+ // sorter: (a, b) => a.kuangfanCost - b.kuangfanCost
|
|
|
},
|
|
|
{
|
|
|
- title: '激励账户消耗',
|
|
|
+ title: '激励消耗',
|
|
|
dataIndex: 'jiliCost',
|
|
|
key: 'jiliCost',
|
|
|
align: 'center',
|
|
|
- sorter: (a, b) => a.jiliCost - b.jiliCost
|
|
|
+ // sorter: (a, b) => a.jiliCost - b.jiliCost
|
|
|
},
|
|
|
{
|
|
|
- title: '信⽤账户消耗',
|
|
|
+ title: '信⽤消耗',
|
|
|
dataIndex: 'xinyongCost',
|
|
|
key: 'xinyongCost',
|
|
|
align: 'center',
|
|
|
- sorter: (a, b) => a.xinyongCost - b.xinyongCostxinyongCost
|
|
|
+ // sorter: (a, b) => a.xinyongCost - b.xinyongCostxinyongCost
|
|
|
},
|
|
|
{
|
|
|
title: '封⾯曝光数',
|
|
|
dataIndex: 'fengmianShowCount',
|
|
|
key: 'fengmianShowCount',
|
|
|
align: 'center',
|
|
|
- sorter: (a, b) => a.fengmianShowCount - b.fengmianShowCount
|
|
|
+ // sorter: (a, b) => a.fengmianShowCount - b.fengmianShowCount
|
|
|
},
|
|
|
{
|
|
|
title: '封⾯点击数',
|
|
|
dataIndex: 'fengmianClickCount',
|
|
|
key: 'fengmianClickCount',
|
|
|
align: 'center',
|
|
|
- sorter: (a, b) => a.fengmianClickCount - b.fengmianClickCount
|
|
|
+ // sorter: (a, b) => a.fengmianClickCount - b.fengmianClickCount
|
|
|
},
|
|
|
{
|
|
|
title: '素材曝光数',
|
|
|
dataIndex: 'sucaiShowCount',
|
|
|
key: 'sucaiShowCount',
|
|
|
align: 'center',
|
|
|
- sorter: (a, b) => a.sucaiShowCount - b.sucaiShowCount
|
|
|
+ // sorter: (a, b) => a.sucaiShowCount - b.sucaiShowCount
|
|
|
},
|
|
|
{
|
|
|
title: '行为数',
|
|
|
dataIndex: 'convertCount',
|
|
|
key: 'convertCount',
|
|
|
align: 'center',
|
|
|
- sorter: (a, b) => a.convertCount - b.convertCount
|
|
|
+ // sorter: (a, b) => a.convertCount - b.convertCount
|
|
|
},
|
|
|
{
|
|
|
title: '封⾯点击率',
|
|
@@ -203,7 +212,7 @@ const columns = [
|
|
|
key: 'fengmianClickRate',
|
|
|
scopedSlots: { customRender: 'fengmianClickRate' },
|
|
|
align: 'center',
|
|
|
- sorter: (a, b) => a.fengmianClickRate - b.fengmianClickRate
|
|
|
+ // sorter: (a, b) => a.fengmianClickRate - b.fengmianClickRate
|
|
|
},
|
|
|
{
|
|
|
title: '转化点击率',
|
|
@@ -211,7 +220,23 @@ const columns = [
|
|
|
key: 'convertClickRate',
|
|
|
scopedSlots: { customRender: 'convertClickRate' },
|
|
|
align: 'center',
|
|
|
- sorter: (a, b) => a.convertClickRate - b.convertClickRate
|
|
|
+ // sorter: (a, b) => a.convertClickRate - b.convertClickRate
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '一级行业',
|
|
|
+ dataIndex: 'industry',
|
|
|
+ key: 'industry',
|
|
|
+ scopedSlots: { customRender: 'industry' },
|
|
|
+ align: 'center',
|
|
|
+
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '二级行业',
|
|
|
+ dataIndex: 'secondIndustry',
|
|
|
+ key: 'secondIndustry',
|
|
|
+ scopedSlots: { customRender: 'secondIndustry' },
|
|
|
+ align: 'center',
|
|
|
+
|
|
|
}
|
|
|
]
|
|
|
export default {
|
|
@@ -246,13 +271,14 @@ export default {
|
|
|
methods: {
|
|
|
...mapGetters(['nickname', 'avatar', 'userInfo']),
|
|
|
onChageLogin(e) {
|
|
|
- if (e.target.value == 1) {
|
|
|
- this.dataList = this.dataListAll
|
|
|
- } else {
|
|
|
- this.dataList = this.dataListAll.filter(item => {
|
|
|
- return item.isHasData == 1
|
|
|
- })
|
|
|
- }
|
|
|
+ // if (e.target.value == 1) {
|
|
|
+ // this.dataList = this.dataListAll
|
|
|
+ // } else {
|
|
|
+ // this.dataList = this.dataListAll.filter(item => {
|
|
|
+ // return item.isHasData == 1
|
|
|
+ // })
|
|
|
+ // }
|
|
|
+ this.searchQuery();
|
|
|
},
|
|
|
backStatistics() {
|
|
|
this.$router.replace({
|
|
@@ -264,7 +290,7 @@ export default {
|
|
|
var params = {}
|
|
|
params.date = weekDate
|
|
|
params.isExportNullData = this.isHasData
|
|
|
- downFilePost('/report/kuaishouReportDailyAgentSum/companyReportAccountDetailListExportExcel', params).then(
|
|
|
+ downFilePost('/agent/kuaiShouDailyAgent/companyReportAccountDetailListExportExcel', params).then(
|
|
|
res => {
|
|
|
let blob = new Blob([res], {
|
|
|
type: 'application/vnd.ms-excel'
|
|
@@ -289,19 +315,22 @@ export default {
|
|
|
var weekDate = localStorage.getItem('companyDate')
|
|
|
this.columns = columns
|
|
|
this.loading = true
|
|
|
- postAction('/report/kuaishouReportDailyAgentSum/companyReportAccountDetailList', {
|
|
|
+ postAction('/agent/kuaiShouDailyAgent/companyReportAccountDetailList', {
|
|
|
date: weekDate,
|
|
|
- advertiserName: this.advertiserName
|
|
|
+ advertiserName: this.advertiserName,
|
|
|
+ page:this.ipagination.current,
|
|
|
+ pageSize:10,
|
|
|
+ isExportNullData:this.isHasData
|
|
|
}).then(res => {
|
|
|
this.loading = false
|
|
|
if (res.success) {
|
|
|
- this.dataListAll = this.dataList = res.result.map((item, index) => {
|
|
|
+ this.dataListAll = this.dataList = res.result.list.map((item, index) => {
|
|
|
return {
|
|
|
...item,
|
|
|
key: index
|
|
|
}
|
|
|
});
|
|
|
- this.ipagination.total=res.total
|
|
|
+ this.ipagination.total=res.result.total
|
|
|
} else {
|
|
|
this.$message.error(res.message)
|
|
|
}
|
|
@@ -309,22 +338,28 @@ export default {
|
|
|
},
|
|
|
pageChange(pagination, filters, sorter, { currentDataSource }){
|
|
|
this.ipagination.current=pagination.current;
|
|
|
- this.getCompanyReport(this.active)
|
|
|
+ this.searchQuery()
|
|
|
},
|
|
|
},
|
|
|
- created() {
|
|
|
+ mounted() {
|
|
|
var weekDate = localStorage.getItem('companyDate')
|
|
|
this.columns = columns
|
|
|
this.loading = true
|
|
|
- postAction('/report/kuaishouReportDailyAgentSum/companyReportAccountDetailList', { date: weekDate }).then(res => {
|
|
|
+ postAction('/agent/kuaiShouDailyAgent/companyReportAccountDetailList', {
|
|
|
+ date: weekDate,
|
|
|
+ page:this.ipagination.current,
|
|
|
+ pageSize:10,
|
|
|
+ isExportNullData:this.isHasData
|
|
|
+ }).then(res => {
|
|
|
this.loading = false
|
|
|
if (res.success) {
|
|
|
- this.dataListAll = this.dataList = res.result.map((item, index) => {
|
|
|
+ this.dataListAll = this.dataList = res.result.list.map((item, index) => {
|
|
|
return {
|
|
|
...item,
|
|
|
key: index
|
|
|
}
|
|
|
})
|
|
|
+ this.ipagination.total=res.result.total
|
|
|
} else {
|
|
|
this.$message.error(res.message)
|
|
|
}
|