|
|
@@ -153,7 +153,7 @@ import { nextTick, ref, watch } from 'vue'
|
|
|
import { isNumberReg, keepdecimal } from '~uti/tools'
|
|
|
import HcBillBaseModal from './addBillBaseModal.vue'
|
|
|
import qualityRleation from './qualityRleation.vue'
|
|
|
-import { arrDelKey, arrToId, arrToKey, deepClone, getArrValue, getObjValue, getRandom, isArrIndex, isNullES } from 'js-fast-way'
|
|
|
+import { arrDelKey, arrToId, arrToKey, deepClone, getArrValue, getObjValue, getRandom, isAllNull, isArrIndex, isNullES } from 'js-fast-way'
|
|
|
import BigNumber from 'bignumber.js'
|
|
|
import { getHeader } from 'hc-vue3-ui'
|
|
|
|
|
|
@@ -495,7 +495,7 @@ console.log(row, 'row')
|
|
|
//计算本期支付比例
|
|
|
//本期支 付比例=本期计量数量/变更后数量
|
|
|
//如果不存在unPayRatio，支付比例不能计算
|
|
|
- if (row.unPayRatio) {
|
|
|
+ if (row.upPayRatio !== null) {
|
|
|
row.payRatio = isNaN(BigNumber(currentMeterTotal).dividedBy(row.changeTotal).toString() * 100) ? '0.00' : BigNumber(currentMeterTotal).dividedBy(row.changeTotal).toString() * 100
|
|
|
row.payRatio = row.payRatio .toFixed(2) === 'Infinity' ? 0 : row.payRatio .toFixed(2)
|
|
|
}
|
