|
|
@@ -451,13 +451,15 @@ const setBasePeriodForm = (periodId) => {
|
|
|
const periods = period.value
|
|
|
baseForm.value.contractPeriodId = periodId
|
|
|
const periodData = periods.find((item) => item.id === periodId)
|
|
|
- baseForm.value.periodNumber = periodData.periodNumber
|
|
|
- baseForm.value.businessDate = periodData.endDate ?? null
|
|
|
+ const obj = getObjValue(periodData)
|
|
|
+ baseForm.value.periodNumber = obj?.periodNumber
|
|
|
+ baseForm.value.businessDate = obj?.endDate ?? null
|
|
|
getMeterNumber(periodId)
|
|
|
}
|
|
|
|
|
|
//获取计量单编号
|
|
|
const getMeterNumber = async (periodId) => {
|
|
|
+ if (isNullES(periodId)) return
|
|
|
const { data } = await mainApi.getMeterNumber({
|
|
|
projectId: pid.value,
|
|
|
contractId: cid.value,
|
|
|
@@ -510,7 +512,7 @@ const currentMeterTotalBlur = (row) => {
|
|
|
//本期计量金额 = 单价 * 变更后数量 - 累计金额
|
|
|
const currentPrice = new BigNumber(row.currentPrice)
|
|
|
const changeTotal = new BigNumber(row.changeTotal)
|
|
|
- const allMeterMoney = new BigNumber(row.allMeterMoney)
|
|
|
+ const allMeterMoney = new BigNumber(row.allMeterMoney ?? 0)
|
|
|
// 计算本期计量金额
|
|
|
const currentMeterMoney = currentPrice.times(changeTotal).minus(allMeterMoney)
|
|
|
row.currentMeterMoney = currentMeterMoney.toString()
|
|
|
@@ -603,7 +605,7 @@ const unPayRatioBlur = (row)=>{
|
|
|
//本期计量金额 = 单价 * 变更后数量 - 累计金额
|
|
|
const currentPrice = new BigNumber(row.currentPrice)
|
|
|
const changeTotal = new BigNumber(row.changeTotal)
|
|
|
- const allMeterMoney = new BigNumber(row.allMeterMoney)
|
|
|
+ const allMeterMoney = new BigNumber(row.allMeterMoney ?? 0)
|
|
|
// 计算本期计量金额
|
|
|
const currentMeterMoney = currentPrice.times(changeTotal).minus(allMeterMoney)
|
|
|
row.currentMeterMoney = currentMeterMoney.toString()
|
