|
@@ -139,6 +139,7 @@
|
|
|
<script setup>
|
|
|
import { nextTick, ref, watch } from 'vue'
|
|
|
import { getStoreValue } from '~src/utils/storage'
|
|
|
+import { isNumberReg } from '~uti/tools'
|
|
|
import HcBillBaseModal from './addBillBaseModal.vue'
|
|
|
import { arrToId, getArrValue, getObjValue, getRandom, isNullES } from 'js-fast-way'
|
|
|
import BigNumber from 'bignumber.js'
|
|
@@ -348,15 +349,16 @@ const addTableData = ref([])
|
|
|
//计算本期计量金额
|
|
|
const currentMeterTotalBlur = (row) => {
|
|
|
//如果为空
|
|
|
- if (isNullES(row.currentMeterTotal)) {
|
|
|
- nextTick(() => {
|
|
|
- row.currentMeterTotal = 0
|
|
|
- })
|
|
|
+ let currentMeterTotal = row.currentMeterTotal
|
|
|
+ const isMeter = isNumberReg(currentMeterTotal)
|
|
|
+ if (isNullES(currentMeterTotal) || !isMeter) {
|
|
|
+ currentMeterTotal = 0
|
|
|
}
|
|
|
//计算本期计量金额
|
|
|
nextTick(() => {
|
|
|
- row.currentMeterMoney = (BigNumber(row.currentMeterTotal).multipliedBy(row.currentPrice)).toString()
|
|
|
- row.allMeterTotal = (BigNumber(row.currentMeterTotal).plus(row.webAllMeterTotal)).toString()
|
|
|
+ row.currentMeterTotal = currentMeterTotal
|
|
|
+ row.currentMeterMoney = (BigNumber(currentMeterTotal).multipliedBy(row.currentPrice)).toString()
|
|
|
+ row.allMeterTotal = (BigNumber(currentMeterTotal).plus(row.webAllMeterTotal)).toString()
|
|
|
|
|
|
//计算总计量金额
|
|
|
let meterMoney = 0
|