|
@@ -61,7 +61,7 @@
|
|
@change="handleLaunchData"
|
|
@change="handleLaunchData"
|
|
/>
|
|
/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
- <a-form-item label="状态">
|
|
|
|
|
|
+ <a-form-item v-show="configForm.acountId || configForm.adConvertId" label="状态">
|
|
<a-select v-model="configForm.searchStatus" style="width: 100px">
|
|
<a-select v-model="configForm.searchStatus" style="width: 100px">
|
|
<a-select-option :value="2">不限</a-select-option>
|
|
<a-select-option :value="2">不限</a-select-option>
|
|
<a-select-option :value="0">已删除</a-select-option>
|
|
<a-select-option :value="0">已删除</a-select-option>
|
|
@@ -162,7 +162,7 @@
|
|
<div class="acount-title-left">广告账户</div>
|
|
<div class="acount-title-left">广告账户</div>
|
|
<div class="acount-title-right">
|
|
<div class="acount-title-right">
|
|
<div class="only-title-mater">
|
|
<div class="only-title-mater">
|
|
- <acount-search :appId.sync="advertisingAccount" request="1,3"></acount-search>
|
|
|
|
|
|
+ <acount-search :appId.sync="advertisingAccount" request="1,3" :disabled="copywritingType === 'edit'"></acount-search>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -185,7 +185,7 @@
|
|
<div class="acount-title-left">选择素材</div>
|
|
<div class="acount-title-left">选择素材</div>
|
|
<div class="acount-title-right">
|
|
<div class="acount-title-right">
|
|
<div class="only-title-mater">
|
|
<div class="only-title-mater">
|
|
- <div><a @click="handleSelectMaterial">选择素材</a></div>
|
|
|
|
|
|
+ <div v-if="copywritingType === 'add'"><a @click="handleSelectMaterial">选择素材</a></div>
|
|
<div class="title-mater-list">
|
|
<div class="title-mater-list">
|
|
<p
|
|
<p
|
|
class="mater-list-name"
|
|
class="mater-list-name"
|
|
@@ -193,7 +193,8 @@
|
|
:key="item.id"
|
|
:key="item.id"
|
|
>
|
|
>
|
|
<span class="mater-list-show">{{ item.materialName }}</span>
|
|
<span class="mater-list-show">{{ item.materialName }}</span>
|
|
- <span class="mater-list-icon" @click="handleDelAlone(item)"><a-icon type="close"/></span>
|
|
|
|
|
|
+ <span class="mater-list-show">123</span>
|
|
|
|
+ <span v-if="copywritingType === 'add'" class="mater-list-icon" @click="handleDelAlone(item)"><a-icon type="close"/></span>
|
|
</p>
|
|
</p>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -508,12 +509,12 @@ export default {
|
|
width: 200,
|
|
width: 200,
|
|
dataIndex: 'textCopywriter'
|
|
dataIndex: 'textCopywriter'
|
|
},
|
|
},
|
|
- {
|
|
|
|
- title: '状态',
|
|
|
|
- align: 'center',
|
|
|
|
- width: 150,
|
|
|
|
- dataIndex: 'status'
|
|
|
|
- },
|
|
|
|
|
|
+ // {
|
|
|
|
+ // title: '状态',
|
|
|
|
+ // align: 'center',
|
|
|
|
+ // width: 150,
|
|
|
|
+ // dataIndex: 'status'
|
|
|
|
+ // },
|
|
{
|
|
{
|
|
title: '相关创意',
|
|
title: '相关创意',
|
|
align: 'center',
|
|
align: 'center',
|
|
@@ -582,14 +583,6 @@ export default {
|
|
align: 'center',
|
|
align: 'center',
|
|
width: 150,
|
|
width: 150,
|
|
sorter: (a, b) => a.costConvert - b.costConvert
|
|
sorter: (a, b) => a.costConvert - b.costConvert
|
|
- },
|
|
|
|
- {
|
|
|
|
- title: '操作',
|
|
|
|
- dataIndex: 'currencyAction',
|
|
|
|
- align: 'center',
|
|
|
|
- width: 150,
|
|
|
|
- fixed: 'right',
|
|
|
|
- scopedSlots: {customRender: 'currencyAction'}
|
|
|
|
}
|
|
}
|
|
],
|
|
],
|
|
appointColumns: [
|
|
appointColumns: [
|
|
@@ -599,12 +592,12 @@ export default {
|
|
width: 200,
|
|
width: 200,
|
|
dataIndex: 'slogan'
|
|
dataIndex: 'slogan'
|
|
},
|
|
},
|
|
- {
|
|
|
|
- title: '状态',
|
|
|
|
- align: 'center',
|
|
|
|
- width: 150,
|
|
|
|
- dataIndex: 'status'
|
|
|
|
- },
|
|
|
|
|
|
+ // {
|
|
|
|
+ // title: '状态',
|
|
|
|
+ // align: 'center',
|
|
|
|
+ // width: 150,
|
|
|
|
+ // dataIndex: 'status'
|
|
|
|
+ // },
|
|
{
|
|
{
|
|
title: '相关创意',
|
|
title: '相关创意',
|
|
align: 'center',
|
|
align: 'center',
|
|
@@ -673,14 +666,6 @@ export default {
|
|
align: 'center',
|
|
align: 'center',
|
|
width: 150,
|
|
width: 150,
|
|
sorter: (a, b) => a.costConvert - b.costConvert
|
|
sorter: (a, b) => a.costConvert - b.costConvert
|
|
- },
|
|
|
|
- {
|
|
|
|
- title: '操作',
|
|
|
|
- dataIndex: 'appointAction',
|
|
|
|
- align: 'center',
|
|
|
|
- width: 150,
|
|
|
|
- fixed: 'right',
|
|
|
|
- scopedSlots: {customRender: 'appointAction'}
|
|
|
|
}
|
|
}
|
|
],
|
|
],
|
|
appointData: [],
|
|
appointData: [],
|
|
@@ -729,7 +714,7 @@ export default {
|
|
methods: {
|
|
methods: {
|
|
...mapGetters(['nickname', 'avatar', 'userInfo']),
|
|
...mapGetters(['nickname', 'avatar', 'userInfo']),
|
|
handleCurrencyEdit(data) {
|
|
handleCurrencyEdit(data) {
|
|
- console.log(data, this.controlTypeModel, 'data, --data');
|
|
|
|
|
|
+ console.log(data, this.controlTypeModel, this.modalSelectMaterial, 'data, --data');
|
|
const defaultData = data;
|
|
const defaultData = data;
|
|
defaultData.controlTypeModel = this.controlTypeModel;
|
|
defaultData.controlTypeModel = this.controlTypeModel;
|
|
if (this.controlTypeModel === '1') {
|
|
if (this.controlTypeModel === '1') {
|
|
@@ -887,6 +872,14 @@ export default {
|
|
launchDateRange: [],
|
|
launchDateRange: [],
|
|
searchStatus: 2
|
|
searchStatus: 2
|
|
};
|
|
};
|
|
|
|
+ if (this.currencyColumns[this.currencyColumns.length - 1].title === '操作') {
|
|
|
|
+ this.currencyColumns.pop();
|
|
|
|
+ this.currencyColumns.splice(1, 1);
|
|
|
|
+ }
|
|
|
|
+ if (this.appointColumns[this.appointColumns.length - 1].title === '操作') {
|
|
|
|
+ this.appointColumns.pop();
|
|
|
|
+ this.appointColumns.splice(1, 1);
|
|
|
|
+ }
|
|
if (e === '1') {
|
|
if (e === '1') {
|
|
this.handleGetCurrencyList();
|
|
this.handleGetCurrencyList();
|
|
}
|
|
}
|
|
@@ -1406,6 +1399,42 @@ export default {
|
|
};
|
|
};
|
|
this.currencyPag = page;
|
|
this.currencyPag = page;
|
|
this.appointPag = page;
|
|
this.appointPag = page;
|
|
|
|
+ if (this.configForm.acountId) {
|
|
|
|
+ if (this.currencyColumns[this.currencyColumns.length - 1].title !== '操作') {
|
|
|
|
+ this.currencyColumns.splice(1, 0, {
|
|
|
|
+ title: '状态',
|
|
|
|
+ align: 'center',
|
|
|
|
+ width: 150,
|
|
|
|
+ dataIndex: 'status'
|
|
|
|
+ });
|
|
|
|
+ this.currencyColumns.push({
|
|
|
|
+ title: '操作',
|
|
|
|
+ dataIndex: 'currencyAction',
|
|
|
|
+ align: 'center',
|
|
|
|
+ width: 150,
|
|
|
|
+ fixed: 'right',
|
|
|
|
+ scopedSlots: {customRender: 'currencyAction'}
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ if (this.configForm.adConvertId) {
|
|
|
|
+ if (this.appointColumns[this.appointColumns.length - 1].title !== '操作') {
|
|
|
|
+ this.appointColumns.splice(1, 0, {
|
|
|
|
+ title: '状态',
|
|
|
|
+ align: 'center',
|
|
|
|
+ width: 150,
|
|
|
|
+ dataIndex: 'status'
|
|
|
|
+ });
|
|
|
|
+ this.appointColumns.push({
|
|
|
|
+ title: '操作',
|
|
|
|
+ dataIndex: 'appointAction',
|
|
|
|
+ align: 'center',
|
|
|
|
+ width: 150,
|
|
|
|
+ fixed: 'right',
|
|
|
|
+ scopedSlots: {customRender: 'appointAction'}
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+ }
|
|
if (this.controlTypeModel === '1') {
|
|
if (this.controlTypeModel === '1') {
|
|
this.handleGetCurrencyList();
|
|
this.handleGetCurrencyList();
|
|
}
|
|
}
|
|
@@ -1427,6 +1456,14 @@ export default {
|
|
};
|
|
};
|
|
this.currencyPag = page;
|
|
this.currencyPag = page;
|
|
this.appointPag = page;
|
|
this.appointPag = page;
|
|
|
|
+ if (this.currencyColumns[this.currencyColumns.length - 1].title === '操作') {
|
|
|
|
+ this.currencyColumns.pop();
|
|
|
|
+ this.currencyColumns.splice(1, 1);
|
|
|
|
+ }
|
|
|
|
+ if (this.appointColumns[this.appointColumns.length - 1].title === '操作') {
|
|
|
|
+ this.appointColumns.pop();
|
|
|
|
+ this.appointColumns.splice(1, 1);
|
|
|
|
+ }
|
|
if (this.controlTypeModel === '1') {
|
|
if (this.controlTypeModel === '1') {
|
|
this.handleGetCurrencyList();
|
|
this.handleGetCurrencyList();
|
|
}
|
|
}
|