|
@@ -7,7 +7,7 @@
|
|
<a-row :gutter="24">
|
|
<a-row :gutter="24">
|
|
<a-col :md="8" :sm="8" :xxl="6">
|
|
<a-col :md="8" :sm="8" :xxl="6">
|
|
<!-- <a-form-item label="项目名称"> -->
|
|
<!-- <a-form-item label="项目名称"> -->
|
|
- <selectTable :projectId.sync="projectId" ref="selectTable"></selectTable>
|
|
|
|
|
|
+ <selectTable :projectId.sync="projectId" ref="selectTable" :requireCheck="false"></selectTable>
|
|
</a-col>
|
|
</a-col>
|
|
|
|
|
|
<a-col :md="8" :sm="8" :xxl="6">
|
|
<a-col :md="8" :sm="8" :xxl="6">
|
|
@@ -175,6 +175,15 @@
|
|
>
|
|
>
|
|
<div>
|
|
<div>
|
|
<div class="cause-modal-table-class">
|
|
<div class="cause-modal-table-class">
|
|
|
|
+ <a-select
|
|
|
|
+ style="width:200px;margin-bottom:10px"
|
|
|
|
+ v-model="resultHistory"
|
|
|
|
+ placeholder="请选择"
|
|
|
|
+ allow-clear
|
|
|
|
+ >
|
|
|
|
+ <a-select-option :value="1">推送成功</a-select-option>
|
|
|
|
+ <a-select-option :value="0">推送失败</a-select-option>
|
|
|
|
+ </a-select>
|
|
<a-table :columns="causeColumns" :data-source="causeData" bordered :pagination="false">
|
|
<a-table :columns="causeColumns" :data-source="causeData" bordered :pagination="false">
|
|
<span slot="action" slot-scope="text, record">
|
|
<span slot="action" slot-scope="text, record">
|
|
<a-popconfirm
|
|
<a-popconfirm
|
|
@@ -215,7 +224,8 @@
|
|
</a-table>
|
|
</a-table>
|
|
</div>
|
|
</div>
|
|
<div v-else>
|
|
<div v-else>
|
|
- <a-table :columns="depColumns" :data-source="acountData" bordered>
|
|
|
|
|
|
+ <AcountSearch :appId.sync="unitAccountId" :multiple="false" request="2,4" ref="treeSelect" style="margin-bottom:8px;width:300px " />
|
|
|
|
+ <a-table :columns="depColumns" :data-source="acountData" bordered :pagination="accountIpagination">
|
|
</a-table>
|
|
</a-table>
|
|
</div>
|
|
</div>
|
|
</a-modal>
|
|
</a-modal>
|
|
@@ -359,6 +369,8 @@ export default {
|
|
excludeSelectedKeys: [],
|
|
excludeSelectedKeys: [],
|
|
excludeSelectedRowKeys: [],
|
|
excludeSelectedRowKeys: [],
|
|
//自定义人群参数结束
|
|
//自定义人群参数结束
|
|
|
|
+ resultHistory: null,
|
|
|
|
+ unitAccountId: "",
|
|
activeKey: "",
|
|
activeKey: "",
|
|
setPersonVisible: false,
|
|
setPersonVisible: false,
|
|
setPersonLoading: false,
|
|
setPersonLoading: false,
|
|
@@ -391,6 +403,7 @@ export default {
|
|
populationTypeTasks: AppMarketService.setPopulationTypeTasks(), // 人群包类型
|
|
populationTypeTasks: AppMarketService.setPopulationTypeTasks(), // 人群包类型
|
|
platform: AppMarketService.setPlatform(), // 状态枚举
|
|
platform: AppMarketService.setPlatform(), // 状态枚举
|
|
relaxStatus: '',
|
|
relaxStatus: '',
|
|
|
|
+ relaxData: null,
|
|
causeData: [], // 原因的table列表数据,
|
|
causeData: [], // 原因的table列表数据,
|
|
depData: [], // 相关项目的table列表数据,
|
|
depData: [], // 相关项目的table列表数据,
|
|
acountData: [], // 相关账户的table列表数据,
|
|
acountData: [], // 相关账户的table列表数据,
|
|
@@ -433,7 +446,7 @@ export default {
|
|
// 当在页面定义change事件时,切记要把此处的事件清除,因为这两个事件重叠了,可能到时候会导致一些莫名的bug
|
|
// 当在页面定义change事件时,切记要把此处的事件清除,因为这两个事件重叠了,可能到时候会导致一些莫名的bug
|
|
this.accountIpagination.current = current;
|
|
this.accountIpagination.current = current;
|
|
this.accountIpagination.pageSize= pageSize;
|
|
this.accountIpagination.pageSize= pageSize;
|
|
- this.handleGetTableList()
|
|
|
|
|
|
+ this.handleAcountRelax(this.relaxStatus ,this.relaxData)
|
|
}
|
|
}
|
|
},
|
|
},
|
|
columns: [
|
|
columns: [
|
|
@@ -508,6 +521,11 @@ export default {
|
|
causeDetailData: {}
|
|
causeDetailData: {}
|
|
};
|
|
};
|
|
},
|
|
},
|
|
|
|
+ watch: {
|
|
|
|
+ unitAccountId: function(n,o) {
|
|
|
|
+ this.handleAcountRelax(this.relaxStatus ,this.relaxData)
|
|
|
|
+ }
|
|
|
|
+ },
|
|
computed: {
|
|
computed: {
|
|
hasSelected() {
|
|
hasSelected() {
|
|
return this.selectedRowKeys.length > 0;
|
|
return this.selectedRowKeys.length > 0;
|
|
@@ -785,7 +803,7 @@ export default {
|
|
let that = this
|
|
let that = this
|
|
this.$confirm({
|
|
this.$confirm({
|
|
title: '删除提示',
|
|
title: '删除提示',
|
|
- content: '确定要删除这一条吗?',
|
|
|
|
|
|
+ content: '是否删除该定向包?',
|
|
onOk() {
|
|
onOk() {
|
|
getAction('/kuaishouDirectionalPackage/delete', {id: data.id}).then(result => {
|
|
getAction('/kuaishouDirectionalPackage/delete', {id: data.id}).then(result => {
|
|
if (result.code === 200) {
|
|
if (result.code === 200) {
|
|
@@ -803,14 +821,22 @@ export default {
|
|
},
|
|
},
|
|
handleAcountRelax(txt, recd) {
|
|
handleAcountRelax(txt, recd) {
|
|
this.relaxStatus = txt;
|
|
this.relaxStatus = txt;
|
|
|
|
+ this.relaxData = recd;
|
|
this.relaxVisible = true;
|
|
this.relaxVisible = true;
|
|
let params = {};
|
|
let params = {};
|
|
params.id = recd.id;
|
|
params.id = recd.id;
|
|
params.type = txt === 'unit' ? 2 : 1;
|
|
params.type = txt === 'unit' ? 2 : 1;
|
|
|
|
+ params.pageNo = this.accountIpagination.current;
|
|
|
|
+ params.pageSize = this.accountIpagination.pageSize;
|
|
|
|
+ if(txt === 'unit') {
|
|
|
|
+ params.accountId = this.unitAccountId;
|
|
|
|
+ }
|
|
|
|
+
|
|
// acountData
|
|
// acountData
|
|
getAction('/kuaishouDirectionalPackage/getRelatedAccountGroup', params).then( res => {
|
|
getAction('/kuaishouDirectionalPackage/getRelatedAccountGroup', params).then( res => {
|
|
if(res.success) {
|
|
if(res.success) {
|
|
- this.acountData = res.result.list
|
|
|
|
|
|
+ this.acountData = res.result.list;
|
|
|
|
+ this.accountIpagination.total = res.result.total;
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
@@ -826,7 +852,8 @@ export default {
|
|
const paramsData = {
|
|
const paramsData = {
|
|
id: id,
|
|
id: id,
|
|
pageNo: this.causePag.page,
|
|
pageNo: this.causePag.page,
|
|
- pageSize: this.causePag.size
|
|
|
|
|
|
+ pageSize: this.causePag.size,
|
|
|
|
+ status: this.resultHistory
|
|
};
|
|
};
|
|
postAction('/kuaishouDirectionalPackage/queryPushResults', paramsData).then(result => {
|
|
postAction('/kuaishouDirectionalPackage/queryPushResults', paramsData).then(result => {
|
|
if (result.code === 200) {
|
|
if (result.code === 200) {
|
|
@@ -863,6 +890,7 @@ export default {
|
|
this.$refs.templateModal.handleOk(val, 'edit')
|
|
this.$refs.templateModal.handleOk(val, 'edit')
|
|
},
|
|
},
|
|
handlePush(val) {
|
|
handlePush(val) {
|
|
|
|
+ this.finallyRightTree = [];
|
|
this.tableSelectList = val;
|
|
this.tableSelectList = val;
|
|
this.pushVisible = true;
|
|
this.pushVisible = true;
|
|
},
|
|
},
|
|
@@ -899,7 +927,7 @@ export default {
|
|
postAction('/kuaishouDirectionalPackage/pushDirectionalPackage' ,params).then(res => {
|
|
postAction('/kuaishouDirectionalPackage/pushDirectionalPackage' ,params).then(res => {
|
|
this.setPersonLoading = false;
|
|
this.setPersonLoading = false;
|
|
if(res.success) {
|
|
if(res.success) {
|
|
- this.$message.success('推送成功')
|
|
|
|
|
|
+ this.$message.success('推送中,请稍候')
|
|
this.handlePersonCancel()
|
|
this.handlePersonCancel()
|
|
}
|
|
}
|
|
else {
|
|
else {
|