|
@@ -47,7 +47,7 @@ export function copyObj(obj) {
|
|
|
return newobj;
|
|
return newobj;
|
|
|
}
|
|
}
|
|
|
//合计费用
|
|
//合计费用
|
|
|
-export function getSummaries(param,key,unit) {
|
|
|
|
|
|
|
+export function getSummaries(param, key, unit) {
|
|
|
const { columns, data } = param;
|
|
const { columns, data } = param;
|
|
|
const sums = [];
|
|
const sums = [];
|
|
|
columns.forEach((column, index) => {
|
|
columns.forEach((column, index) => {
|
|
@@ -58,7 +58,7 @@ export function getSummaries(param,key,unit) {
|
|
|
|
|
|
|
|
if (key.includes(column.property)) {
|
|
if (key.includes(column.property)) {
|
|
|
const values = data.map((item) => Number(item[column.property]));
|
|
const values = data.map((item) => Number(item[column.property]));
|
|
|
- console.log(values)
|
|
|
|
|
|
|
+ console.log(values);
|
|
|
|
|
|
|
|
if (!values.every((value) => isNaN(value))) {
|
|
if (!values.every((value) => isNaN(value))) {
|
|
|
sums[index] = values.reduce((prev, curr) => {
|
|
sums[index] = values.reduce((prev, curr) => {
|
|
@@ -69,7 +69,8 @@ export function getSummaries(param,key,unit) {
|
|
|
return prev;
|
|
return prev;
|
|
|
}
|
|
}
|
|
|
}, 0);
|
|
}, 0);
|
|
|
- sums[index] += ' '+unit+'';
|
|
|
|
|
|
|
+ sums[index] = parseFloat(sums[index]).toFixed(3).replace(/\.?0+$/, '');
|
|
|
|
|
+ sums[index] += ' ' + unit + '';
|
|
|
} else {
|
|
} else {
|
|
|
sums[index] = '';
|
|
sums[index] = '';
|
|
|
}
|
|
}
|
|
@@ -79,4 +80,4 @@ export function getSummaries(param,key,unit) {
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
return sums;
|
|
return sums;
|
|
|
-}
|
|
|
|
|
|
|
+}
|