|
@@ -102,8 +102,8 @@
|
|
|
<template #containChangeTotal="{ row }">
|
|
|
<hc-table-input v-model="row.containChangeTotal" :disabled="isView" @blur="containChangeTotalBlur(row)" />
|
|
|
</template>
|
|
|
- <template #upPayRatio="{ row }">
|
|
|
- <hc-table-input v-model="row.upPayRatio" :disabled="isView" @blur="unPayRatioBlur(row)" />
|
|
|
+ <template #payRatio="{ row }">
|
|
|
+ <hc-table-input v-model="row.payRatio" :disabled="isView" />
|
|
|
</template>
|
|
|
<template #currentMeterMoney="{ row }">
|
|
|
<hc-table-input v-model="row.currentMeterMoney" disabled />
|
|
@@ -422,7 +422,7 @@ const addTableColumn = ref([
|
|
|
{ key: 'resolveTotal', name: '分解数量', width: '100' },
|
|
|
{ key: 'changeTotal', name: '变更后数量', width: '100' },
|
|
|
{ key: 'currentMeterTotal', name: '本期计量数量', width: '140' },
|
|
|
- { key: 'upPayRatio', name: '支付比例', width: '140' },
|
|
|
+ { key: 'payRatio', name: '支付比例', width: '140' },
|
|
|
{ key: 'containChangeTotal', name: '含变更数量', width: '100' },
|
|
|
{ key: 'currentMeterMoney', name: '本期计量金额', width: '120' },
|
|
|
{ key: 'allMeterTotal', name: '累计计量量', width: '100' },
|
|
@@ -457,24 +457,24 @@ const currentMeterTotalBlur = (row) => {
|
|
|
// 当前行多返回一个字段otherPayMoney 代表其他期计量金额
|
|
|
// 累计计量金额 = 其他期计量金额+(本期计量金额*支付比例)
|
|
|
// 当前行多返回一个字段upPayMoney 代表最高支付金额
|
|
|
- let otherPayMoney = new BigNumber(row.otherPayMoney )//其他期计量金额
|
|
|
- let currentMeterMoney = new BigNumber(row.currentMeterMoney )//本期计量金额
|
|
|
- let upPayRatio = new BigNumber(row.upPayRatio ).dividedBy(100)//支付比例
|
|
|
- let upPayRatioMoney = (otherPayMoney.plus((currentMeterMoney.multipliedBy(upPayRatio)).toNumber()))//累计计量金额
|
|
|
- let upPayMoney = new BigNumber(row.upPayMoney)//最高支付金额
|
|
|
- const isComparedmoney = upPayRatioMoney.comparedTo(upPayMoney)
|
|
|
- //a 大于 b = 1,a 等于 b = 0,a 小于 b = -1, a 或 b 的值异常时 = null
|
|
|
- if (isComparedmoney === 1 || isComparedmoney === null) {
|
|
|
- isCanSave.value = true
|
|
|
+ // let otherPayMoney = new BigNumber(row.otherPayMoney )//其他期计量金额
|
|
|
+ // let currentMeterMoney = new BigNumber(row.currentMeterMoney )//本期计量金额
|
|
|
+ // let upPayRatio = new BigNumber(row.upPayRatio ).dividedBy(100)//支付比例
|
|
|
+ // let upPayRatioMoney = (otherPayMoney.plus((currentMeterMoney.multipliedBy(upPayRatio)).toNumber()))//累计计量金额
|
|
|
+ // let upPayMoney = new BigNumber(row.upPayMoney)//最高支付金额
|
|
|
+ // const isComparedmoney = upPayRatioMoney.comparedTo(upPayMoney)
|
|
|
+ // //a 大于 b = 1,a 等于 b = 0,a 小于 b = -1, a 或 b 的值异常时 = null
|
|
|
+ // if (isComparedmoney === 1 || isComparedmoney === null) {
|
|
|
+ // isCanSave.value = true
|
|
|
|
|
|
- window.$message.warning('累计计量金额超出支付比列,如需计量100%,请完成关联对应的质保资料')
|
|
|
- return '--el-table-tr-bg-color: #fe0000; --el-table-row-hover-bg-color: #fe0000; color: white;'
|
|
|
+ // window.$message.warning('累计计量金额超出支付比列,如需计量100%,请完成关联对应的质保资料')
|
|
|
+ // return '--el-table-tr-bg-color: #fe0000; --el-table-row-hover-bg-color: #fe0000; color: white;'
|
|
|
|
|
|
|
|
|
- } else {
|
|
|
- isCanSave.value = false
|
|
|
+ // } else {
|
|
|
+ // isCanSave.value = false
|
|
|
|
|
|
- }
|
|
|
+ // }
|
|
|
})
|
|
|
}
|
|
|
|