From 3943210f03d67e605bf2ca1d1e367636dfefb463 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 29 Aug 2024 09:58:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E8=BE=86=E7=BB=93?= =?UTF-8?q?=E6=B8=85=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/settle/settleAdd.vue | 27 +++++++++++++------ .../views/workFlow/jieqingFlow/settleEdit.vue | 27 +++++++++++++------ 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/settle/settleAdd.vue b/anrui-riskcenter-ui/src/views/settle/settleAdd.vue index c3473e6e5a..85d3f175a0 100644 --- a/anrui-riskcenter-ui/src/views/settle/settleAdd.vue +++ b/anrui-riskcenter-ui/src/views/settle/settleAdd.vue @@ -354,23 +354,34 @@ export default { }, // 公司结清费用模块--公司正常结清合计计算 calculateSettleAll() { - if (!this.formobj.showHg) { - return parseFloat(this.formobj.loanSettleCompanyCostVo.overduePrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.overduePrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.funfCost === '' ? 0 : this.formobj.loanSettleCompanyCostVo.funfCost) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankOverInterest === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankOverInterest) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.deductionAmount === '' ? 0 : this.formobj.loanSettleCompanyCostVo.deductionAmount) + 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.loanSettleCompanyCostVo.loanDeposit === '' ? 0 : this.formobj.loanSettleCompanyCostVo.loanDeposit) || 0 - } else { - return parseFloat(this.formobj.loanSettleCompanyCostVo.overduePrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.overduePrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.funfCost === '' ? 0 : this.formobj.loanSettleCompanyCostVo.funfCost) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankOverInterest === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankOverInterest) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.deductionAmount === '' ? 0 : this.formobj.loanSettleCompanyCostVo.deductionAmount) + 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.loanSettleCompanyCostVo.loanDeposit === '' ? 0 : this.formobj.loanSettleCompanyCostVo.loanDeposit) - parseFloat(this.formobj.buyBackMoney === '' ? 0 : this.formobj.buyBackMoney) || 0 + let settleAll = '0' + // 公司正常结清合计 = 公司逾期月还 + 资金占用费 + 资方逾期利息 + 公司当期未到期月还 + 资方未到期金额 + 贷款保证金扣罚金额 + 名义价 + 合同违约金 + 其它费用 - 贷款保证金 + settleAll = Math.round((parseFloat(settleAll) + parseFloat(this.formobj.loanSettleCompanyCostVo.overduePrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.overduePrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.funfCost === '' ? 0 : this.formobj.loanSettleCompanyCostVo.funfCost) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankOverInterest === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankOverInterest) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.deductionAmount === '' ? 0 : this.formobj.loanSettleCompanyCostVo.deductionAmount) + 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.loanSettleCompanyCostVo.loanDeposit === '' ? 0 : this.formobj.loanSettleCompanyCostVo.loanDeposit)) * 100) / 100 + // 是否由回购申请管理点击结清进入该页面，为是时需要再减去回购后的还款金额 + if (this.formobj.showHg) { + settleAll = Math.round((parseFloat(settleAll) - parseFloat(this.formobj.buyBackMoney === '' ? 0 : this.formobj.buyBackMoney)) * 100) / 100 } + return settleAll }, // 公司结清费用减免情况模块--公司减免后结清合计计算 calculateAmountTo() { + let AmountTo = '0' + // 是否勾选公司结清费用减免情况,为是时公司减免后结清合计 = 公司正常结清合计 - 资金占用费减免 - 公司资金占用费减免 - 公司其他费用减免 if (this.formobj.trueReduction) { - return parseFloat(this.calculateSettleAll === '' ? 0 : this.calculateSettleAll) - parseFloat(this.formobj.loanSettleCompanyReductionVo.fundPenalty === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.fundPenalty) - parseFloat(this.formobj.loanSettleCompanyReductionVo.depositPenalty === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.depositPenalty) - parseFloat(this.formobj.loanSettleCompanyReductionVo.otherCost === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.otherCost) || 0 - } else { - return '0' + AmountTo = Math.round((parseFloat(AmountTo) + parseFloat(this.calculateSettleAll === '' ? 0 : this.calculateSettleAll) - parseFloat(this.formobj.loanSettleCompanyReductionVo.fundPenalty === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.fundPenalty) - parseFloat(this.formobj.loanSettleCompanyReductionVo.depositPenalty === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.depositPenalty) - parseFloat(this.formobj.loanSettleCompanyReductionVo.otherCost === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.otherCost)) * 100) / 100 } + return AmountTo }, // 结清利润计算 calculateProfit() { - return (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)) || 0 + 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))) * 100) / 100 + // 是否勾选公司结清费用减免情况,为是时需要再减去公司其他费用减免 + if (this.formobj.trueReduction) { + profit = Math.round((parseFloat(profit) - parseFloat(this.formobj.loanSettleCompanyReductionVo.otherCost === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.otherCost)) * 100) / 100 + } + return profit } }, data() { diff --git a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue index dc3d81fb6b..514a94be3c 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue @@ -353,23 +353,34 @@ export default { }, // 公司结清费用模块--公司正常结清合计计算 calculateSettleAll() { - if (!this.formobj.showHg) { - return parseFloat(this.formobj.loanSettleCompanyCostVo.overduePrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.overduePrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.funfCost === '' ? 0 : this.formobj.loanSettleCompanyCostVo.funfCost) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankOverInterest === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankOverInterest) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.deductionAmount === '' ? 0 : this.formobj.loanSettleCompanyCostVo.deductionAmount) + 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.loanSettleCompanyCostVo.loanDeposit === '' ? 0 : this.formobj.loanSettleCompanyCostVo.loanDeposit) || 0 - } else { - return parseFloat(this.formobj.loanSettleCompanyCostVo.overduePrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.overduePrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.funfCost === '' ? 0 : this.formobj.loanSettleCompanyCostVo.funfCost) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankOverInterest === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankOverInterest) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.deductionAmount === '' ? 0 : this.formobj.loanSettleCompanyCostVo.deductionAmount) + 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.loanSettleCompanyCostVo.loanDeposit === '' ? 0 : this.formobj.loanSettleCompanyCostVo.loanDeposit) - parseFloat(this.formobj.buyBackMoney === '' ? 0 : this.formobj.buyBackMoney) || 0 + let settleAll = '0' + // 公司正常结清合计 = 公司逾期月还 + 资金占用费 + 资方逾期利息 + 公司当期未到期月还 + 资方未到期金额 + 贷款保证金扣罚金额 + 名义价 + 合同违约金 + 其它费用 - 贷款保证金 + settleAll = Math.round((parseFloat(settleAll) + parseFloat(this.formobj.loanSettleCompanyCostVo.overduePrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.overduePrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.funfCost === '' ? 0 : this.formobj.loanSettleCompanyCostVo.funfCost) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankOverInterest === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankOverInterest) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.deductionAmount === '' ? 0 : this.formobj.loanSettleCompanyCostVo.deductionAmount) + 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.loanSettleCompanyCostVo.loanDeposit === '' ? 0 : this.formobj.loanSettleCompanyCostVo.loanDeposit)) * 100) / 100 + // 是否由回购申请管理点击结清进入该页面，为是时需要再减去回购后的还款金额 + if (this.formobj.showHg) { + settleAll = Math.round((parseFloat(settleAll) - parseFloat(this.formobj.buyBackMoney === '' ? 0 : this.formobj.buyBackMoney)) * 100) / 100 } + return settleAll }, // 公司结清费用减免情况模块--公司减免后结清合计计算 calculateAmountTo() { + let AmountTo = '0' + // 是否勾选公司结清费用减免情况,为是时公司减免后结清合计 = 公司正常结清合计 - 资金占用费减免 - 公司资金占用费减免 - 公司其他费用减免 if (this.formobj.trueReduction) { - return parseFloat(this.calculateSettleAll === '' ? 0 : this.calculateSettleAll) - parseFloat(this.formobj.loanSettleCompanyReductionVo.fundPenalty === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.fundPenalty) - parseFloat(this.formobj.loanSettleCompanyReductionVo.depositPenalty === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.depositPenalty) - parseFloat(this.formobj.loanSettleCompanyReductionVo.otherCost === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.otherCost) || 0 - } else { - return '0' + AmountTo = Math.round((parseFloat(AmountTo) + parseFloat(this.calculateSettleAll === '' ? 0 : this.calculateSettleAll) - parseFloat(this.formobj.loanSettleCompanyReductionVo.fundPenalty === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.fundPenalty) - parseFloat(this.formobj.loanSettleCompanyReductionVo.depositPenalty === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.depositPenalty) - parseFloat(this.formobj.loanSettleCompanyReductionVo.otherCost === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.otherCost)) * 100) / 100 } + return AmountTo }, // 结清利润计算 calculateProfit() { - return (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)) || 0 + 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))) * 100) / 100 + // 是否勾选公司结清费用减免情况,为是时需要再减去公司其他费用减免 + if (this.formobj.trueReduction) { + profit = Math.round((parseFloat(profit) - parseFloat(this.formobj.loanSettleCompanyReductionVo.otherCost === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.otherCost)) * 100) / 100 + } + return profit } }, data() {