【修改】全所统计收入 增加合同金额
This commit is contained in:
@@ -82,6 +82,7 @@ const columns = [
|
|||||||
title: '',
|
title: '',
|
||||||
align: 'center',
|
align: 'center',
|
||||||
width: 150,
|
width: 150,
|
||||||
|
fixed:'left',
|
||||||
dataIndex: 'indexName',
|
dataIndex: 'indexName',
|
||||||
scopedSlots: {customRender: 'text'}
|
scopedSlots: {customRender: 'text'}
|
||||||
},
|
},
|
||||||
@@ -160,6 +161,7 @@ export default {
|
|||||||
let dataSource = res.result.list
|
let dataSource = res.result.list
|
||||||
// 讲树形结构的数据 ,修改成table可以直接展示的数据,默认只有三行数据
|
// 讲树形结构的数据 ,修改成table可以直接展示的数据,默认只有三行数据
|
||||||
let tableData = [
|
let tableData = [
|
||||||
|
{indexName: '合同金额', total: res.result.sumOfMoney},
|
||||||
{indexName: '确认收入金额', total: res.result.sumOfConfirmAmount},
|
{indexName: '确认收入金额', total: res.result.sumOfConfirmAmount},
|
||||||
{indexName: '开票金额', total: res.result.sumOfBillMoney},
|
{indexName: '开票金额', total: res.result.sumOfBillMoney},
|
||||||
{indexName: '到账金额', total: res.result.sumOfReallyMoney},
|
{indexName: '到账金额', total: res.result.sumOfReallyMoney},
|
||||||
@@ -169,9 +171,10 @@ export default {
|
|||||||
let keyItem = MonthData.find(ele => Number(ele.value) === (index + 1))
|
let keyItem = MonthData.find(ele => Number(ele.value) === (index + 1))
|
||||||
if(keyItem) {
|
if(keyItem) {
|
||||||
let key = keyItem.key
|
let key = keyItem.key
|
||||||
tableData[0][key] = item.confirmAmount
|
tableData[0][key] = item.allMoney
|
||||||
tableData[1][key] = item.billMoney
|
tableData[1][key] = item.confirmAmount
|
||||||
tableData[2][key] = item.comeAllMoney
|
tableData[2][key] = item.billMoney
|
||||||
|
tableData[3][key] = item.comeAllMoney
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
this.dataSource = tableData
|
this.dataSource = tableData
|
||||||
|
|||||||
Reference in New Issue
Block a user