From f447a548736e37fdbc12a7a131aa92de17af58d0 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 11 Sep 2024 14:17:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AE=A2=E6=88=B7=E8=BF=98?= =?UTF-8?q?=E6=AC=BE=E6=83=85=E5=86=B5=E7=BB=9F=E8=AE=A1=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-riskcenter-ui/src/views/settle/settleAdd.vue | 2 +- .../src/views/workFlow/jieqingFlow/settleEdit.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/settle/settleAdd.vue b/anrui-riskcenter-ui/src/views/settle/settleAdd.vue index 5dc1aa297c..0086499f5f 100644 --- a/anrui-riskcenter-ui/src/views/settle/settleAdd.vue +++ b/anrui-riskcenter-ui/src/views/settle/settleAdd.vue @@ -386,7 +386,7 @@ export default { calculateProfit() { let profit = '0' // 结清利润 = 公司结清相关费用（资方逾期利息 + 名义价 + 合同违约金 + 公司其他费用） - 资方结清相关费用（资方逾期利息 + 资方名义价 + 资方合同违约金 + 资方其他应收）+ 未到期利息差（公司未到期金额 - 资方未到期金额） - profit = Math.round((parseFloat(profit) + (parseFloat(this.formobj.loanSettleCompanyCostVo.bankOverInterest === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankOverInterest) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyNominalPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyNominalPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.contractLiquidated === '' ? 0 : this.formobj.loanSettleCompanyCostVo.contractLiquidated) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyOtherPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyOtherPrice)) - (parseFloat(this.formobj.loanSettleBankCostVo.bankInterest === '' ? 0 : this.formobj.loanSettleBankCostVo.bankInterest) + parseFloat(this.formobj.loanSettleBankCostVo.bankNominalPrice === '' ? 0 : this.formobj.loanSettleBankCostVo.bankNominalPrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.loanSettleBankCostVo.bankContractLiquidated) + parseFloat(this.formobj.loanSettleBankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.loanSettleBankCostVo.bankOtherReceivable) + (parseFloat(this.formobj.loanSettleCompanyCostVo.bankNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankNotPrice) - parseFloat(this.formobj.loanSettleBankCostVo.notDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.notDuePrice)))) * 100) / 100 + profit = Math.round(((parseFloat(profit) + (parseFloat(this.formobj.loanSettleCompanyCostVo.bankOverInterest === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankOverInterest) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyNominalPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyNominalPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.contractLiquidated === '' ? 0 : this.formobj.loanSettleCompanyCostVo.contractLiquidated) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyOtherPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyOtherPrice)) - (parseFloat(this.formobj.loanSettleBankCostVo.bankInterest === '' ? 0 : this.formobj.loanSettleBankCostVo.bankInterest) + parseFloat(this.formobj.loanSettleBankCostVo.bankNominalPrice === '' ? 0 : this.formobj.loanSettleBankCostVo.bankNominalPrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.loanSettleBankCostVo.bankContractLiquidated) + parseFloat(this.formobj.loanSettleBankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.loanSettleBankCostVo.bankOtherReceivable)) + (parseFloat(this.formobj.loanSettleCompanyCostVo.bankNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankNotPrice) - parseFloat(this.formobj.loanSettleBankCostVo.notDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.notDuePrice)))) * 100) / 100 // 是否勾选公司结清费用减免情况,为是时需要减去公司其他费用减免，减去公司未到期利息减免 if (this.formobj.trueReduction) { profit = Math.round((parseFloat(profit) - parseFloat(this.formobj.loanSettleCompanyReductionVo.otherCost === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.otherCost) - parseFloat(this.formobj.loanSettleCompanyReductionVo.notDuePriceRelief === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.notDuePriceRelief)) * 100) / 100 diff --git a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue index 5189f6ad7a..67b6a14aaa 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue @@ -385,7 +385,7 @@ export default { calculateProfit() { let profit = '0' // 结清利润 = 公司结清相关费用（资方逾期利息 + 名义价 + 合同违约金 + 公司其他费用） - 资方结清相关费用（资方逾期利息 + 资方名义价 + 资方合同违约金 + 资方其他应收）+ 未到期利息差（公司未到期金额 - 资方未到期金额） - profit = Math.round((parseFloat(profit) + (parseFloat(this.formobj.loanSettleCompanyCostVo.bankOverInterest === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankOverInterest) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyNominalPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyNominalPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.contractLiquidated === '' ? 0 : this.formobj.loanSettleCompanyCostVo.contractLiquidated) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyOtherPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyOtherPrice)) - (parseFloat(this.formobj.loanSettleBankCostVo.bankInterest === '' ? 0 : this.formobj.loanSettleBankCostVo.bankInterest) + parseFloat(this.formobj.loanSettleBankCostVo.bankNominalPrice === '' ? 0 : this.formobj.loanSettleBankCostVo.bankNominalPrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.loanSettleBankCostVo.bankContractLiquidated) + parseFloat(this.formobj.loanSettleBankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.loanSettleBankCostVo.bankOtherReceivable) + (parseFloat(this.formobj.loanSettleCompanyCostVo.bankNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankNotPrice) - parseFloat(this.formobj.loanSettleBankCostVo.notDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.notDuePrice)))) * 100) / 100 + profit = Math.round(((parseFloat(profit) + (parseFloat(this.formobj.loanSettleCompanyCostVo.bankOverInterest === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankOverInterest) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyNominalPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyNominalPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.contractLiquidated === '' ? 0 : this.formobj.loanSettleCompanyCostVo.contractLiquidated) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyOtherPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyOtherPrice)) - (parseFloat(this.formobj.loanSettleBankCostVo.bankInterest === '' ? 0 : this.formobj.loanSettleBankCostVo.bankInterest) + parseFloat(this.formobj.loanSettleBankCostVo.bankNominalPrice === '' ? 0 : this.formobj.loanSettleBankCostVo.bankNominalPrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.loanSettleBankCostVo.bankContractLiquidated) + parseFloat(this.formobj.loanSettleBankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.loanSettleBankCostVo.bankOtherReceivable)) + (parseFloat(this.formobj.loanSettleCompanyCostVo.bankNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankNotPrice) - parseFloat(this.formobj.loanSettleBankCostVo.notDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.notDuePrice)))) * 100) / 100 // 是否勾选公司结清费用减免情况,为是时需要减去公司其他费用减免，减去公司未到期利息减免 if (this.formobj.trueReduction) { profit = Math.round((parseFloat(profit) - parseFloat(this.formobj.loanSettleCompanyReductionVo.otherCost === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.otherCost) - parseFloat(this.formobj.loanSettleCompanyReductionVo.notDuePriceRelief === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.notDuePriceRelief)) * 100) / 100