|
@@ -27,7 +27,7 @@ $(function () {
|
|
{label: '门店名称', name: 'storeName', index: 'storeName', width: 120},
|
|
{label: '门店名称', name: 'storeName', index: 'storeName', width: 120},
|
|
{label: '商户编码', name: 'merchSn', index: 'storeId', width: 220},
|
|
{label: '商户编码', name: 'merchSn', index: 'storeId', width: 220},
|
|
{label: '商户名称', name: 'merchName', index: 'storeName', width: 120},
|
|
{label: '商户名称', name: 'merchName', index: 'storeName', width: 120},
|
|
- {label: '售价总额', name: 'totalSales', index: 'totalSales', align: 'right', width: 80},
|
|
|
|
|
|
+ {label: '销售总额', name: 'totalSales', index: 'totalSales', align: 'right', width: 80},
|
|
{label: '实际销售额', name: 'actualSales', index: 'actualSales', align: 'right', width: 80},
|
|
{label: '实际销售额', name: 'actualSales', index: 'actualSales', align: 'right', width: 80},
|
|
{label: '占比 %', name: 'proportion', index: 'proportion', align: 'right', width: 60},
|
|
{label: '占比 %', name: 'proportion', index: 'proportion', align: 'right', width: 60},
|
|
{label: '优惠损失', name: 'preferentialLoss', index: 'preferentialLoss', align: 'right', width: 80},
|
|
{label: '优惠损失', name: 'preferentialLoss', index: 'preferentialLoss', align: 'right', width: 80},
|
|
@@ -152,7 +152,7 @@ let vm = new Vue({
|
|
projectList: [
|
|
projectList: [
|
|
{
|
|
{
|
|
id: '0',
|
|
id: '0',
|
|
- name: '售价总额'
|
|
|
|
|
|
+ name: '销售总额'
|
|
},
|
|
},
|
|
{
|
|
{
|
|
id: '1',
|
|
id: '1',
|
|
@@ -354,7 +354,7 @@ let vm = new Vue({
|
|
vm.seriesList2[0] = '';
|
|
vm.seriesList2[0] = '';
|
|
|
|
|
|
if (vm.dataList.length > 0) {
|
|
if (vm.dataList.length > 0) {
|
|
- vm.dataList[0] = '[]/售价总额:元()';
|
|
|
|
|
|
+ vm.dataList[0] = '[]/销售总额:元()';
|
|
console.log(vm.dataList);
|
|
console.log(vm.dataList);
|
|
|
|
|
|
}
|
|
}
|
|
@@ -461,9 +461,9 @@ let vm = new Vue({
|
|
if (vm.projectSelect == '0') {
|
|
if (vm.projectSelect == '0') {
|
|
vm.seriesList2.splice(1, 1, vm.totalSales2);
|
|
vm.seriesList2.splice(1, 1, vm.totalSales2);
|
|
if (vm.xAxisList.type == 'dept') {
|
|
if (vm.xAxisList.type == 'dept') {
|
|
- vm.dataList.splice(1, 1, '[' + vm.merchSn + ']' + vm.merchName2 + '/售价总额:' + vm.totalSales2 + '元(' + vm.salesDate2 + ')');
|
|
|
|
|
|
+ vm.dataList.splice(1, 1, '[' + vm.merchSn + ']' + vm.merchName2 + '/销售总额:' + vm.totalSales2 + '元(' + vm.salesDate2 + ')');
|
|
} else {
|
|
} else {
|
|
- vm.dataList.splice(1, 1, '[' + vm.storeId + ']' + vm.storeName2 + '/售价总额:' + vm.totalSales2 + '元(' + vm.salesDate2 + ')');
|
|
|
|
|
|
+ vm.dataList.splice(1, 1, '[' + vm.storeId + ']' + vm.storeName2 + '/销售总额:' + vm.totalSales2 + '元(' + vm.salesDate2 + ')');
|
|
}
|
|
}
|
|
// pie 设置
|
|
// pie 设置
|
|
vm.seriesList.splice(1, 1, {value: vm.totalSales2, name: vm.dataList[1]});
|
|
vm.seriesList.splice(1, 1, {value: vm.totalSales2, name: vm.dataList[1]});
|
|
@@ -487,9 +487,9 @@ let vm = new Vue({
|
|
if (vm.projectSelect == '0') {
|
|
if (vm.projectSelect == '0') {
|
|
vm.seriesList2.push(vm.totalSales2);
|
|
vm.seriesList2.push(vm.totalSales2);
|
|
if (vm.xAxisList.type == 'dept') {
|
|
if (vm.xAxisList.type == 'dept') {
|
|
- vm.dataList.push('[' + vm.merchSn + ']' + vm.merchName2 + '/售价总额:' + vm.totalSales2 + '元(' + vm.salesDate2 + ')');
|
|
|
|
|
|
+ vm.dataList.push('[' + vm.merchSn + ']' + vm.merchName2 + '/销售总额:' + vm.totalSales2 + '元(' + vm.salesDate2 + ')');
|
|
} else {
|
|
} else {
|
|
- vm.dataList.push('[' + vm.storeId + ']' + vm.storeName2 + '/售价总额:' + vm.totalSales2 + '元(' + vm.salesDate2 + ')');
|
|
|
|
|
|
+ vm.dataList.push('[' + vm.storeId + ']' + vm.storeName2 + '/销售总额:' + vm.totalSales2 + '元(' + vm.salesDate2 + ')');
|
|
}
|
|
}
|
|
// pie 设置
|
|
// pie 设置
|
|
vm.seriesList.push({value: vm.totalSales2, name: vm.dataList[1]});
|
|
vm.seriesList.push({value: vm.totalSales2, name: vm.dataList[1]});
|
|
@@ -610,9 +610,9 @@ let vm = new Vue({
|
|
if (vm.projectSelect == '0') {
|
|
if (vm.projectSelect == '0') {
|
|
vm.seriesList2.splice(1, 1, vm.totalSales2);
|
|
vm.seriesList2.splice(1, 1, vm.totalSales2);
|
|
if (vm.xAxisList.type== 'dept') {
|
|
if (vm.xAxisList.type== 'dept') {
|
|
- vm.dataList.splice(1, 1, '[' + vm.merchSn + ']' + vm.merchName2 + '/售价总额:' + vm.totalSales2 + '元(' + vm.salesDate2 + ')');
|
|
|
|
|
|
+ vm.dataList.splice(1, 1, '[' + vm.merchSn + ']' + vm.merchName2 + '/销售总额:' + vm.totalSales2 + '元(' + vm.salesDate2 + ')');
|
|
} else {
|
|
} else {
|
|
- vm.dataList.splice(1, 1, '[' + vm.storeId + ']' + vm.storeName2 + '/售价总额:' + vm.totalSales2 + '元(' + vm.salesDate2 + ')');
|
|
|
|
|
|
+ vm.dataList.splice(1, 1, '[' + vm.storeId + ']' + vm.storeName2 + '/销售总额:' + vm.totalSales2 + '元(' + vm.salesDate2 + ')');
|
|
}
|
|
}
|
|
// pie 设置
|
|
// pie 设置
|
|
vm.seriesList.splice(1, 1, {value: vm.totalSales2, name: vm.dataList[1]});
|
|
vm.seriesList.splice(1, 1, {value: vm.totalSales2, name: vm.dataList[1]});
|
|
@@ -632,9 +632,9 @@ let vm = new Vue({
|
|
if (vm.projectSelect == '0') {
|
|
if (vm.projectSelect == '0') {
|
|
vm.seriesList2.push(vm.totalSales2);
|
|
vm.seriesList2.push(vm.totalSales2);
|
|
if (vm.xAxisList.type== 'dept') {
|
|
if (vm.xAxisList.type== 'dept') {
|
|
- vm.dataList.push('[' + vm.merchSn + ']' + vm.merchName2 + '/售价总额:' + vm.totalSales2 + '元(' + vm.salesDate2 + ')');
|
|
|
|
|
|
+ vm.dataList.push('[' + vm.merchSn + ']' + vm.merchName2 + '/销售总额:' + vm.totalSales2 + '元(' + vm.salesDate2 + ')');
|
|
} else {
|
|
} else {
|
|
- vm.dataList.push('[' + vm.storeId + ']' + vm.storeName2 + '/售价总额:' + vm.totalSales2 + '元(' + vm.salesDate2 + ')');
|
|
|
|
|
|
+ vm.dataList.push('[' + vm.storeId + ']' + vm.storeName2 + '/销售总额:' + vm.totalSales2 + '元(' + vm.salesDate2 + ')');
|
|
}
|
|
}
|
|
// pie 设置
|
|
// pie 设置
|
|
vm.seriesList.push({value: vm.totalSales2, name: vm.dataList[1]});
|
|
vm.seriesList.push({value: vm.totalSales2, name: vm.dataList[1]});
|
|
@@ -704,9 +704,9 @@ let vm = new Vue({
|
|
var temp = '';
|
|
var temp = '';
|
|
if (vm.xAxisList.projectSelect == '0') {
|
|
if (vm.xAxisList.projectSelect == '0') {
|
|
if (vm.xAxisList.type == 'dept') {
|
|
if (vm.xAxisList.type == 'dept') {
|
|
- temp = '[' + vm.xAxisList.merchSn + ']' + vm.xAxisList.merchName + '/售价总额:' + vm.xAxisList.totalSales + '元(' + vm.xAxisList.salesDate + ')';
|
|
|
|
|
|
+ temp = '[' + vm.xAxisList.merchSn + ']' + vm.xAxisList.merchName + '/销售总额:' + vm.xAxisList.totalSales + '元(' + vm.xAxisList.salesDate + ')';
|
|
} else {
|
|
} else {
|
|
- temp = '[' + vm.xAxisList.storeId + ']' + vm.xAxisList.storeName + '/售价总额:' + vm.xAxisList.totalSales + '元(' + vm.xAxisList.salesDate + ')';
|
|
|
|
|
|
+ temp = '[' + vm.xAxisList.storeId + ']' + vm.xAxisList.storeName + '/销售总额:' + vm.xAxisList.totalSales + '元(' + vm.xAxisList.salesDate + ')';
|
|
}
|
|
}
|
|
vm.seriesList2.push(vm.xAxisList.totalSales);
|
|
vm.seriesList2.push(vm.xAxisList.totalSales);
|
|
vm.seriesList.push({value: vm.xAxisList.totalSales, name: temp});
|
|
vm.seriesList.push({value: vm.xAxisList.totalSales, name: temp});
|
|
@@ -724,9 +724,9 @@ let vm = new Vue({
|
|
|
|
|
|
// if (vm.projectSelect == '0') {
|
|
// if (vm.projectSelect == '0') {
|
|
// if (vm.xAxisList.type== 'dept') {
|
|
// if (vm.xAxisList.type== 'dept') {
|
|
- // temp = '[' + vm.merchSn + ']' + vm.merchName + '/售价总额:' + vm.totalSales + '元(' + vm.salesDate + ')';
|
|
|
|
|
|
+ // temp = '[' + vm.merchSn + ']' + vm.merchName + '/销售总额:' + vm.totalSales + '元(' + vm.salesDate + ')';
|
|
// } else {
|
|
// } else {
|
|
- // temp = '[' + vm.storeId + ']' + vm.storeName + '/售价总额:' + vm.totalSales + '元(' + vm.salesDate + ')';
|
|
|
|
|
|
+ // temp = '[' + vm.storeId + ']' + vm.storeName + '/销售总额:' + vm.totalSales + '元(' + vm.salesDate + ')';
|
|
// }
|
|
// }
|
|
// vm.seriesList2.push(vm.totalSales);
|
|
// vm.seriesList2.push(vm.totalSales);
|
|
// vm.seriesList.push({value: vm.totalSales, name: temp});
|
|
// vm.seriesList.push({value: vm.totalSales, name: temp});
|
|
@@ -776,7 +776,7 @@ let vm = new Vue({
|
|
}
|
|
}
|
|
},
|
|
},
|
|
legend: {
|
|
legend: {
|
|
- data: ['/售价总额']
|
|
|
|
|
|
+ data: ['/销售总额']
|
|
},
|
|
},
|
|
xAxis: {
|
|
xAxis: {
|
|
data: vm.dataList,
|
|
data: vm.dataList,
|
|
@@ -804,9 +804,9 @@ let vm = new Vue({
|
|
},
|
|
},
|
|
tooltipFormatter: function () {
|
|
tooltipFormatter: function () {
|
|
if (vm.type == 'dept') {
|
|
if (vm.type == 'dept') {
|
|
- return '[' + vm.merchSn + ']' + vm.merchName + '/售价总额:' + vm.totalSales + '元(' + vm.salesDate + ')';
|
|
|
|
|
|
+ return '[' + vm.merchSn + ']' + vm.merchName + '/销售总额:' + vm.totalSales + '元(' + vm.salesDate + ')';
|
|
}
|
|
}
|
|
- return '[' + vm.storeId + ']' + vm.storeName + '/售价总额:' + vm.totalSales + '元(' + vm.salesDate + ')';
|
|
|
|
|
|
+ return '[' + vm.storeId + ']' + vm.storeName + '/销售总额:' + vm.totalSales + '元(' + vm.salesDate + ')';
|
|
},
|
|
},
|
|
showTable: function (postParam) {
|
|
showTable: function (postParam) {
|
|
|
|
|