Commit e33d0059 by crushh

update: dist

parent 72dd9849
......@@ -153,6 +153,10 @@ export default {
return {
numFormat,
form: {
search: '',
storeGroupId: '',
storeGroupLevel: '',
orderBy: '',
activityId: this.$route.params.id,
pageNum: 1,
pageSize: 20
......@@ -322,8 +326,19 @@ export default {
.filter(el => el.length > 0);
},
exportParams() {
const { search, storeGroupId, storeGroupLevel } = this.form;
return { ...this.activityData, search, storeGroupId, storeGroupLevel };
const { search, storeGroupId, storeGroupLevel, orderBy } = this.form;
let params = {};
if (this.dimension == '分组维度') {
if (this.selectVal == 1) {
params = { ...this.activityData, storeGroupLevel, orderBy };
} else {
params = { ...this.activityData, storeGroupId, orderBy };
}
} else {
params = { ...this.activityData, search, storeGroupId, orderBy };
}
console.log(params);
return { ...this.activityData, ...params };
}
},
methods: {
......@@ -437,9 +452,13 @@ export default {
},
radioChange(data) {
this.form = {
search: '',
storeGroupId: '',
storeGroupLevel: '',
activityId: this.$route.params.id,
pageNum: 1,
pageSize: 20
pageSize: 20,
orderBy: ''
};
if (data == '分组维度') {
this.form.storeGroupLevel = 1;
......
......@@ -119,7 +119,7 @@ let tableHead = [
minWidth: '160',
sortable: 'custom',
formatter: function(row) {
return `<span>${!isNaN(row.customerIntentionsNumber) ? row.customerIntentionsNumber + '%' : '- -'}</span>`;
return `<span>${!isNaN(row.customerIntentionsNumber) ? row.sentMessagesNumber.toLocaleString() : '- -'}</span>`;
}
},
{
......@@ -161,6 +161,7 @@ export default {
search: '',
storeGroupId: '',
storeGroupLevel: '',
orderBy: '',
activityId: this.$route.params.id,
pageNum: 1,
pageSize: 20
......@@ -330,9 +331,19 @@ export default {
.filter(el => el.length > 0);
},
exportParams() {
const { search, storeGroupId, storeGroupLevel } = this.form;
console.log(search, storeGroupId, storeGroupLevel);
return { ...this.activityData, search, storeGroupId, storeGroupLevel };
const { search, storeGroupId, storeGroupLevel, orderBy } = this.form;
let params = {};
if (this.dimension == '分组维度') {
if (this.selectVal == 1) {
params = { ...this.activityData, storeGroupLevel, orderBy };
} else {
params = { ...this.activityData, storeGroupId, orderBy };
}
} else {
params = { ...this.activityData, search, storeGroupId, orderBy };
}
console.log(params);
return { ...this.activityData, ...params };
}
},
methods: {
......@@ -455,6 +466,10 @@ export default {
},
radioChange(data) {
this.form = {
search: '',
storeGroupId: '',
storeGroupLevel: '',
orderBy: '',
activityId: this.$route.params.id,
pageNum: 1,
pageSize: 20
......
......@@ -69,8 +69,3 @@ export default {
}
}
</style>
<style lang="scss">
.el-tooltip__popper.target-tooltip {
max-width: 475px !important;
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment