|
@@ -39,11 +39,8 @@
|
|
|
<template slot-scope="scope"> {{ scope.row.staticDate }}</template>
|
|
<template slot-scope="scope"> {{ scope.row.staticDate }}</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
<el-table-column align="center" label="收入金额" prop="revenueAmount" />
|
|
<el-table-column align="center" label="收入金额" prop="revenueAmount" />
|
|
|
- <el-table-column
|
|
|
|
|
- align="center"
|
|
|
|
|
- label="支出金额"
|
|
|
|
|
- prop="expenditureAmount"
|
|
|
|
|
- />
|
|
|
|
|
|
|
+ <el-table-column align="center" label="支出金额" prop="expenditureAmount"/>
|
|
|
|
|
+ <el-table-column align="center" label="实收金额" prop="receipts" />
|
|
|
</el-table>
|
|
</el-table>
|
|
|
<!-- <pagination
|
|
<!-- <pagination
|
|
|
v-show="total > 0"
|
|
v-show="total > 0"
|
|
@@ -135,7 +132,7 @@ export default {
|
|
|
if (index === 0) {
|
|
if (index === 0) {
|
|
|
sums[index] = '合计'
|
|
sums[index] = '合计'
|
|
|
return
|
|
return
|
|
|
- } else if (index == 2 || index == 1) {
|
|
|
|
|
|
|
+ } else if (index == 2 || index == 1|| index == 3) {
|
|
|
const values = data.map((item) => Number(item[column.property]))
|
|
const values = data.map((item) => Number(item[column.property]))
|
|
|
if (!values.every((value) => isNaN(value))) {
|
|
if (!values.every((value) => isNaN(value))) {
|
|
|
sums[index] = values.reduce((prev, curr) => {
|
|
sums[index] = values.reduce((prev, curr) => {
|
