|
@@ -464,8 +464,8 @@ export default {
|
|
|
item.property == "fd" ||
|
|
|
item.property == "fc" ||
|
|
|
item.property == "singleTicketMargin"||
|
|
|
- item.property == "salesProfit"||
|
|
|
- item.property == "outFactoryPrice"
|
|
|
+ item.property == "outFactoryPrice"||
|
|
|
+ item.property == "salesProfit"
|
|
|
) {
|
|
|
let amountSum = 0;
|
|
|
let purchaseAmountSum = 0;
|
|
@@ -473,7 +473,8 @@ export default {
|
|
|
let fdSum = 0;
|
|
|
let fcSum = 0;
|
|
|
let singleTicketMarginSum = 0;
|
|
|
- let outFactoryPriceSum=0
|
|
|
+ let outFactoryPriceSum=0;
|
|
|
+ let salesProfitSum=0
|
|
|
data.forEach(e => {
|
|
|
amountSum = _.add(amountSum, Number(e.amount));
|
|
|
purchaseAmountSum = _.add(
|
|
@@ -491,6 +492,10 @@ export default {
|
|
|
outFactoryPriceSum,
|
|
|
Number(e.outFactoryPrice)
|
|
|
);
|
|
|
+ salesProfitSum= _.add(
|
|
|
+ salesProfitSum,
|
|
|
+ Number(e.salesProfit)
|
|
|
+ );
|
|
|
});
|
|
|
//入库金额总计
|
|
|
if (item.property == "purchasePrice") {
|
|
@@ -515,7 +520,7 @@ export default {
|
|
|
sums[index] = micrometerFormat(outFactoryPriceSum);
|
|
|
}
|
|
|
if (item.property == "salesProfit") {
|
|
|
- sums[index] = micrometerFormat(salesProfit);
|
|
|
+ sums[index] = micrometerFormat(salesProfitSum);
|
|
|
}
|
|
|
}
|
|
|
});
|