|
|
@@ -517,12 +517,12 @@ const currentMeterTotalBlur = (row) => {
|
|
|
// 比较这两个值
|
|
|
const areEqual = allMeterTotal.isEqualTo(changeTotal)
|
|
|
if (areEqual) {
|
|
|
- //本期计量金额 = 单价 * 变更后数量 - 基数
|
|
|
+ //本期计量金额 = 单价 * 变更后数量 - 累计金额
|
|
|
const currentPrice = new BigNumber(row.currentPrice)
|
|
|
const changeTotal = new BigNumber(row.changeTotal)
|
|
|
- const otherMeterTotal = new BigNumber(row.otherMeterTotal)
|
|
|
+ const allMeterMoney = new BigNumber(row.allMeterMoney)
|
|
|
// 计算本期计量金额
|
|
|
- const currentMeterMoney = currentPrice.times(changeTotal).minus(otherMeterTotal)
|
|
|
+ const currentMeterMoney = currentPrice.times(changeTotal).minus(allMeterMoney)
|
|
|
row.currentMeterMoney = currentMeterMoney.toString()
|
|
|
}
|
|
|
|
|
|
@@ -604,12 +604,12 @@ const unPayRatioBlur = (row)=>{
|
|
|
// 比较这两个值
|
|
|
const areEqual = allMeterTotal.isEqualTo(changeTotal)
|
|
|
if (areEqual) {
|
|
|
- //本期计量金额 = 单价 * 变更后数量 - 基数
|
|
|
+ //本期计量金额 = 单价 * 变更后数量 - 累计金额
|
|
|
const currentPrice = new BigNumber(row.currentPrice)
|
|
|
const changeTotal = new BigNumber(row.changeTotal)
|
|
|
- const otherMeterTotal = new BigNumber(row.otherMeterTotal)
|
|
|
+ const allMeterMoney = new BigNumber(row.allMeterMoney)
|
|
|
// 计算本期计量金额
|
|
|
- const currentMeterMoney = currentPrice.times(changeTotal).minus(otherMeterTotal)
|
|
|
+ const currentMeterMoney = currentPrice.times(changeTotal).minus(allMeterMoney)
|
|
|
row.currentMeterMoney = currentMeterMoney.toString()
|
|
|
}
|
|
|
|
