From c0070fe8d624913b9ce31e9c1a0c23312d2670a2 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 22 May 2025 17:12:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=9B=9E=E8=B4=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue | 5 +---- .../src/views/workFlow/huigouFlow/buybackEdit.vue | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue b/anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue index 1ae5d4130b..1006bd509c 100644 --- a/anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue +++ b/anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue @@ -114,7 +114,7 @@
资方未到期金额
- +
@@ -471,9 +471,6 @@ export default { } }) }, - notDuePriceInput(val) { - this.formobj.companyCostVo.bankNotPrice = val - }, bankInterestInput(val) { this.formobj.companyCostVo.bankOverInterest = val }, diff --git a/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue index 63faae6a8f..7051fa2897 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue @@ -113,7 +113,7 @@
资方未到期金额
- +
@@ -471,9 +471,6 @@ export default { } }) }, - notDuePriceInput(val) { - this.formobj.companyCostVo.bankNotPrice = val - }, bankInterestInput(val) { this.formobj.companyCostVo.bankOverInterest = val }, From 3d0fcc176b50a43b4b0b54d96140f0edef469163 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 23 May 2025 13:43:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=9B=9E=E8=B4=AD?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue | 2 +- .../src/views/workFlow/huigouFlow/buybackEdit.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue b/anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue index 1006bd509c..fc5f38efda 100644 --- a/anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue +++ b/anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue @@ -303,7 +303,7 @@ export default { }, // 结清利润计算 calculateProfit() { - return (parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyNominalPrice === '' ? 0 : this.formobj.companyCostVo.companyNominalPrice) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice)) - (parseFloat(this.formobj.bankCostVo.bankInterest === '' ? 0 : this.formobj.bankCostVo.bankInterest) + parseFloat(this.formobj.bankCostVo.bankNominalPrice === '' ? 0 : this.formobj.bankCostVo.bankNominalPrice) + parseFloat(this.formobj.bankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.bankCostVo.bankContractLiquidated) + parseFloat(this.formobj.bankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.bankCostVo.bankOtherReceivable) + (parseFloat(this.formobj.companyCostVo.bankNotPrice === '' ? 0 : this.formobj.companyCostVo.bankNotPrice) - parseFloat(this.formobj.bankCostVo.notDuePrice === '' ? 0 : this.formobj.bankCostVo.notDuePrice))) || 0 + return (parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyNominalPrice === '' ? 0 : this.formobj.companyCostVo.companyNominalPrice) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice)) - (parseFloat(this.formobj.bankCostVo.bankInterest === '' ? 0 : this.formobj.bankCostVo.bankInterest) + parseFloat(this.formobj.bankCostVo.bankNominalPrice === '' ? 0 : this.formobj.bankCostVo.bankNominalPrice) + parseFloat(this.formobj.bankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.bankCostVo.bankContractLiquidated) + parseFloat(this.formobj.bankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.bankCostVo.bankOtherReceivable)) + (parseFloat(this.formobj.companyCostVo.bankNotPrice === '' ? 0 : this.formobj.companyCostVo.bankNotPrice) - parseFloat(this.formobj.bankCostVo.notDuePrice === '' ? 0 : this.formobj.bankCostVo.notDuePrice)) || 0 } }, data() { diff --git a/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue index 7051fa2897..6251f8e827 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue @@ -302,7 +302,7 @@ export default { }, // 结清利润计算 calculateProfit() { - return (parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyNominalPrice === '' ? 0 : this.formobj.companyCostVo.companyNominalPrice) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice)) - (parseFloat(this.formobj.bankCostVo.bankInterest === '' ? 0 : this.formobj.bankCostVo.bankInterest) + parseFloat(this.formobj.bankCostVo.bankNominalPrice === '' ? 0 : this.formobj.bankCostVo.bankNominalPrice) + parseFloat(this.formobj.bankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.bankCostVo.bankContractLiquidated) + parseFloat(this.formobj.bankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.bankCostVo.bankOtherReceivable) + (parseFloat(this.formobj.companyCostVo.bankNotPrice === '' ? 0 : this.formobj.companyCostVo.bankNotPrice) - parseFloat(this.formobj.bankCostVo.notDuePrice === '' ? 0 : this.formobj.bankCostVo.notDuePrice))) || 0 + return (parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyNominalPrice === '' ? 0 : this.formobj.companyCostVo.companyNominalPrice) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice)) - (parseFloat(this.formobj.bankCostVo.bankInterest === '' ? 0 : this.formobj.bankCostVo.bankInterest) + parseFloat(this.formobj.bankCostVo.bankNominalPrice === '' ? 0 : this.formobj.bankCostVo.bankNominalPrice) + parseFloat(this.formobj.bankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.bankCostVo.bankContractLiquidated) + parseFloat(this.formobj.bankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.bankCostVo.bankOtherReceivable)) + (parseFloat(this.formobj.companyCostVo.bankNotPrice === '' ? 0 : this.formobj.companyCostVo.bankNotPrice) - parseFloat(this.formobj.bankCostVo.notDuePrice === '' ? 0 : this.formobj.bankCostVo.notDuePrice)) || 0 } }, data() {