|
@@ -94,16 +94,27 @@
|
|
|
:loading="loading"
|
|
|
@change="handleTableChange"
|
|
|
>
|
|
|
- <span slot="ocpxActionType" slot-scope="text">
|
|
|
- <div v-if="text">
|
|
|
- <span v-for="(item, index) of JSON.parse(text)" :key="index"
|
|
|
- >{{ item | ocpxActionType }}{{ index == JSON.parse(text).length - 1 ? '' : ',' }}</span
|
|
|
- >
|
|
|
- </div>
|
|
|
- <div v-else>-</div>
|
|
|
+ <span slot="maxBid" slot-scope="text,record">{{ record.maxBid == 0? '-': record.maxBid / 1000 }}</span>
|
|
|
+ <span slot="ocpxActionType" slot-scope="text,record">
|
|
|
+ <div v-if="!!record.ocpxActionTypeArray&&record.ocpxActionTypeArray.length>0">
|
|
|
+ <span v-for="(item, index) in record.ocpxActionTypeArray" :key="index"
|
|
|
+ >{{item.ocpxName}}({{(item.maxValue / 1000).toFixed(2)}})<br></span
|
|
|
+ >
|
|
|
+ </div>
|
|
|
+ <div v-else>-</div>
|
|
|
|
|
|
- <!-- {{ text | ocpxActionType }} -->
|
|
|
- </span>
|
|
|
+ <!-- {{ text | ocpxActionType }} -->
|
|
|
+ </span>
|
|
|
+ <span slot="deepConversionType" slot-scope="text,record">
|
|
|
+ <div v-if="!!record.deepConversionTypeArray&&record.deepConversionTypeArray.length != 0">
|
|
|
+ <span v-for="(item, index) in record.deepConversionTypeArray" :key="index"
|
|
|
+ >{{item.deepName}}({{(item.deepValue / 1000).toFixed(2)}})<br></span
|
|
|
+ >
|
|
|
+ </div>
|
|
|
+ <div v-else>-</div>
|
|
|
+
|
|
|
+ <!-- {{ text | ocpxActionType }} -->
|
|
|
+ </span>
|
|
|
<span slot="bidType" slot-scope="text">
|
|
|
<div v-if="text && JSON.parse(text).length > 0">
|
|
|
<span v-for="(item, index) of JSON.parse(text)" :key="index"
|
|
@@ -137,8 +148,8 @@
|
|
|
<a>删除</a>
|
|
|
</a-popconfirm>
|
|
|
</span>
|
|
|
- <span slot="maxBid" slot-scope="text">{{ text / 1000 }}</span>
|
|
|
- <span slot="maxDeepCpaBid" slot-scope="text">{{ text / 1000 }}</span>
|
|
|
+ <!-- <span slot="maxBid" slot-scope="text">{{ text / 1000 }}</span> -->
|
|
|
+ <!-- <span slot="maxDeepCpaBid" slot-scope="text">{{ text / 1000 }}</span> -->
|
|
|
<a slot="name" slot-scope="text, record" @click="toProduct(record, 'product')">{{ text }}</a>
|
|
|
<a slot="productName" slot-scope="text, record" @click="toProduct(record, 'project')">{{ text }}</a>
|
|
|
</a-table>
|
|
@@ -257,21 +268,21 @@ const projectColumns = [
|
|
|
dataIndex: 'advertiserId_dictText',
|
|
|
},
|
|
|
{
|
|
|
- title: '最高出价',
|
|
|
+ title: '最高出价(元)',
|
|
|
align: 'center',
|
|
|
dataIndex: 'maxBid',
|
|
|
scopedSlots: {
|
|
|
customRender: 'maxBid',
|
|
|
},
|
|
|
},
|
|
|
- {
|
|
|
- title: '最高转化出价',
|
|
|
- align: 'center',
|
|
|
- dataIndex: 'maxDeepCpaBid',
|
|
|
- scopedSlots: {
|
|
|
- customRender: 'maxDeepCpaBid',
|
|
|
- },
|
|
|
- },
|
|
|
+ // {
|
|
|
+ // title: '最高转化出价',
|
|
|
+ // align: 'center',
|
|
|
+ // dataIndex: 'maxDeepCpaBid',
|
|
|
+ // scopedSlots: {
|
|
|
+ // customRender: 'maxDeepCpaBid',
|
|
|
+ // },
|
|
|
+ // },
|
|
|
{
|
|
|
title: '优化目标',
|
|
|
align: 'center',
|
|
@@ -281,13 +292,22 @@ const projectColumns = [
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
- title: '转化目标',
|
|
|
+ title: '转化目标(出价/元)',
|
|
|
align: 'center',
|
|
|
dataIndex: 'ocpxActionType',
|
|
|
+ width: 150,
|
|
|
scopedSlots: {
|
|
|
customRender: 'ocpxActionType',
|
|
|
},
|
|
|
- },
|
|
|
+ },{
|
|
|
+ title: '深度转化目标(出价)',
|
|
|
+ align: 'center',
|
|
|
+ dataIndex: 'deepConversionType',
|
|
|
+ width: 150,
|
|
|
+ scopedSlots: {
|
|
|
+ customRender: 'deepConversionType',
|
|
|
+ },
|
|
|
+ },
|
|
|
{
|
|
|
title: '供应商',
|
|
|
align: 'center',
|
|
@@ -312,6 +332,7 @@ const projectColumns = [
|
|
|
title: '操作',
|
|
|
dataIndex: 'actionProject',
|
|
|
align: 'center',
|
|
|
+ width:100,
|
|
|
scopedSlots: {
|
|
|
customRender: 'actionProject',
|
|
|
},
|
|
@@ -426,12 +447,14 @@ export default {
|
|
|
clear(type) {
|
|
|
this.queryParam.name = null
|
|
|
this.queryParam.advertiserId = null
|
|
|
+ this.advertiserId = null
|
|
|
this.queryParam.productId = null
|
|
|
this.queryParam.id = null
|
|
|
this.queryParam.productName = null
|
|
|
this.queryParam.projectName = null
|
|
|
this.allIdUser = {}
|
|
|
this.loadData(1)
|
|
|
+
|
|
|
},
|
|
|
addNew() {
|
|
|
if (this.active == 'advertiser') {
|
|
@@ -448,11 +471,7 @@ export default {
|
|
|
this.$refs.modalFormTwo.disableSubmit = false
|
|
|
} else if (this.active == 'project') {
|
|
|
this.$refs.modalFormThree.add({
|
|
|
- advertiserId: this.queryParam.advertiserId
|
|
|
- ? this.queryParam.advertiserId
|
|
|
- : this.advertiserId
|
|
|
- ? this.advertiserId
|
|
|
- : undefined,
|
|
|
+ advertiserId: this.queryParam.advertiserId ? this.queryParam.advertiserId : this.advertiserId ? this.advertiserId : undefined,
|
|
|
productId: this.queryParam.productId ? this.queryParam.productId : undefined,
|
|
|
})
|
|
|
this.$refs.modalFormThree.title = '新增'
|