From b0aedd9ffa156ca262450804c332d350fde90244 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 8 Nov 2023 14:10:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=91=E8=9E=8D=E6=96=B9?=
=?UTF-8?q?=E6=A1=88=E6=A0=87=E5=87=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/components/publicPage/financialscheme.vue | 15 ++++++++++++++-
.../components/publicPage/financialschemeEdit.vue | 10 ++++++++--
.../components/publicPage/financialschemeInfo.vue | 10 ++++++++--
.../views/workflow/publicPage/financialscheme.vue | 15 ++++++++++++++-
.../workflow/publicPage/financialschemeEdit.vue | 7 +++++--
.../workflow/publicPage/financialschemeInfo.vue | 9 ++++++---
6 files changed, 55 insertions(+), 11 deletions(-)
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialscheme.vue b/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialscheme.vue
index 4b1493f1c6..d50015b8aa 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialscheme.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialscheme.vue
@@ -84,7 +84,7 @@
贷款保证金
-
+
@@ -340,9 +340,11 @@ export default {
finance: {
accessoriesAmount: '',
accessoriesAmountCb: false,
+ actualDiscount: '',
bondAmount: '',
bondAmounts: '',
bondRatio: '',
+ bondTypeKey: '',
dealWay: '',
dealWayKey: '',
depositPremium: '',
@@ -372,6 +374,7 @@ export default {
offsetPurchasetax: '',
offsetTotal: '',
operationAmount: '',
+ otherActualDiscount: '',
otherAmount: '',
otherAmountRemark: '',
otherDiscount: '',
@@ -484,9 +487,11 @@ export default {
}
this.finance.accessoriesAmount = ''
this.finance.accessoriesAmountCb = false
+ this.finance.actualDiscount = ''
this.finance.bondAmount = ''
this.finance.bondAmounts = ''
this.finance.bondRatio = ''
+ this.finance.bondTypeKey = ''
this.finance.dealWay = ''
this.finance.dealWayKey = ''
this.finance.depositPremium = ''
@@ -516,6 +521,7 @@ export default {
this.finance.offsetPurchasetax = ''
this.finance.offsetTotal = ''
this.finance.operationAmount = ''
+ this.finance.otherActualDiscount = ''
this.finance.otherAmount = ''
this.finance.otherAmountRemark = ''
this.finance.otherDiscount = ''
@@ -647,6 +653,8 @@ export default {
this.finance.serviceChargeTypeKey = choose[0].serviceChargeTypeKey
// 从金融产品政策中-- 获取服务费
this.finance.serviceChargeTypeValue = choose[0].serviceChargeTypeValue
+ // 从金融产品政策中 -- 保证金类型(01 固定 贷款保证金不能修改 02 敞口 贷款保证金可修改)
+ this.finance.bondTypeKey = choose[0].bondTypeKey
// 贴息用途赋值
this.finance.factoryDiscountUse = '抵利息'
this.finance.factoryDiscountUseKey = '02'
@@ -892,6 +900,8 @@ export default {
this.finance.offsetTotal = resp.data.offsetTotal
this.finance.realTotal = resp.data.realTotal
this.finance.vehTotalPrice = resp.data.vehTotalPrice
+ this.finance.actualDiscount = resp.data.actualDiscount
+ this.finance.otherActualDiscount = resp.data.otherActualDiscount
this.finance.isShowMore = this.isShowMore
this.$emit('backData', this.finance)
this.handleColse()
@@ -911,9 +921,11 @@ export default {
this.finance = {
accessoriesAmount: '',
accessoriesAmountCb: false,
+ actualDiscount: '',
bondAmount: '',
bondAmounts: '',
bondRatio: '',
+ bondTypeKey: '',
dealWay: '',
dealWayKey: '',
depositPremium: '',
@@ -943,6 +955,7 @@ export default {
offsetPurchasetax: '',
offsetTotal: '',
operationAmount: '',
+ otherActualDiscount: '',
otherAmount: '',
otherAmountRemark: '',
otherDiscount: '',
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeEdit.vue b/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeEdit.vue
index a1215a6459..cbba3e6e67 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeEdit.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeEdit.vue
@@ -67,7 +67,7 @@
厂家贴息
- {{ formobj.factoryDiscount }}
+ {{ formobj.factoryDiscount }} {{ formobj.actualDiscount !== '' ? '(实贴' + formobj.actualDiscount + ')' : '' }}
贴息用途
@@ -125,7 +125,7 @@
其它融贴息
- {{ formobj.otherDiscount }}
+ {{ formobj.otherDiscount }} {{ formobj.otherActualDiscount !== '' ? '(实贴' + formobj.otherActualDiscount + ')' : '' }}
@@ -332,9 +332,11 @@ export default {
formobj: {
accessoriesAmount: '',
accessoriesAmountCb: false,
+ actualDiscount: '',
bondAmount: '',
bondAmounts: '',
bondRatio: '',
+ bondTypeKey: '',
dealWay: '',
dealWayKey: '',
depositPremium: '',
@@ -364,6 +366,7 @@ export default {
offsetPurchasetax: '',
offsetTotal: '',
operationAmount: '',
+ otherActualDiscount: '',
otherAmount: '',
otherAmountRemark: '',
otherDiscount: '',
@@ -437,9 +440,11 @@ export default {
this.formobj = {
accessoriesAmount: '',
accessoriesAmountCb: false,
+ actualDiscount: '',
bondAmount: '',
bondAmounts: '',
bondRatio: '',
+ bondTypeKey: '',
dealWay: '',
dealWayKey: '',
depositPremium: '',
@@ -469,6 +474,7 @@ export default {
offsetPurchasetax: '',
offsetTotal: '',
operationAmount: '',
+ otherActualDiscount: '',
otherAmount: '',
otherAmountRemark: '',
otherDiscount: '',
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeInfo.vue
index 59854b9a36..529e504449 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeInfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeInfo.vue
@@ -66,7 +66,7 @@
厂家贴息
- {{ formobj.factoryDiscount }}
+ {{ formobj.factoryDiscount }} {{ formobj.actualDiscount !== '' ? '(实贴' + formobj.actualDiscount + ')' : '' }}
贴息用途
@@ -124,7 +124,7 @@
其它融贴息
- {{ formobj.otherDiscount }}
+ {{ formobj.otherDiscount }} {{ formobj.otherActualDiscount !== '' ? '(实贴' + formobj.otherActualDiscount + ')' : '' }}
@@ -326,9 +326,11 @@ export default {
formobj: {
accessoriesAmount: '',
accessoriesAmountCb: false,
+ actualDiscount: '',
bondAmount: '',
bondAmounts: '',
bondRatio: '',
+ bondTypeKey: '',
dealWay: '',
dealWayKey: '',
depositPremium: '',
@@ -358,6 +360,7 @@ export default {
offsetPurchasetax: '',
offsetTotal: '',
operationAmount: '',
+ otherActualDiscount: '',
otherAmount: '',
otherAmountRemark: '',
otherDiscount: '',
@@ -406,9 +409,11 @@ export default {
this.formobj = {
accessoriesAmount: '',
accessoriesAmountCb: false,
+ actualDiscount: '',
bondAmount: '',
bondAmounts: '',
bondRatio: '',
+ bondTypeKey: '',
dealWay: '',
dealWayKey: '',
depositPremium: '',
@@ -438,6 +443,7 @@ export default {
offsetPurchasetax: '',
offsetTotal: '',
operationAmount: '',
+ otherActualDiscount: '',
otherAmount: '',
otherAmountRemark: '',
otherDiscount: '',
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue
index bc96630779..1a7767f752 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue
@@ -84,7 +84,7 @@
贷款保证金
-
+
@@ -339,9 +339,11 @@ export default {
finance: {
accessoriesAmount: '',
accessoriesAmountCb: false,
+ actualDiscount: '',
bondAmount: '',
bondAmounts: '',
bondRatio: '',
+ bondTypeKey: '',
dealWay: '',
dealWayKey: '',
depositPremium: '',
@@ -371,6 +373,7 @@ export default {
offsetPurchasetax: '',
offsetTotal: '',
operationAmount: '',
+ otherActualDiscount: '',
otherAmount: '',
otherAmountRemark: '',
otherDiscount: '',
@@ -470,9 +473,11 @@ export default {
this.finance = {
accessoriesAmount: '',
accessoriesAmountCb: false,
+ actualDiscount: '',
bondAmount: '',
bondAmounts: '',
bondRatio: '',
+ bondTypeKey: '',
dealWay: '',
dealWayKey: '',
depositPremium: '',
@@ -502,6 +507,7 @@ export default {
offsetPurchasetax: '',
offsetTotal: '',
operationAmount: '',
+ otherActualDiscount: '',
otherAmount: '',
otherAmountRemark: '',
otherDiscount: '',
@@ -577,6 +583,8 @@ export default {
this.finance.serviceChargeTypeKey = choose[0].serviceChargeTypeKey
// 从金融产品政策中-- 获取服务费
this.finance.serviceChargeTypeValue = choose[0].serviceChargeTypeValue
+ // 从金融产品政策中 -- 保证金类型(01 固定 贷款保证金不能修改 02 敞口 贷款保证金可修改)
+ this.finance.bondTypeKey = choose[0].bondTypeKey
// 当融资项目总额不为空且不为0时,如果更换产品政策(需要重新计算首付金额、产品贷款金额、贷款保证金等,重置其它融模块的内容)
if (this.finance.loanTotal !== '' && this.finance.loanTotal !== '0') {
// 重新计算
@@ -819,6 +827,8 @@ export default {
this.finance.offsetTotal = resp.data.offsetTotal
this.finance.realTotal = resp.data.realTotal
this.finance.vehTotalPrice = resp.data.vehTotalPrice
+ this.finance.actualDiscount = resp.data.actualDiscount
+ this.finance.otherActualDiscount = resp.data.otherActualDiscount
this.finance.isShowMore = this.isShowMore
this.$emit('backData', this.finance)
this.handleColse()
@@ -838,9 +848,11 @@ export default {
this.finance = {
accessoriesAmount: '',
accessoriesAmountCb: false,
+ actualDiscount: '',
bondAmount: '',
bondAmounts: '',
bondRatio: '',
+ bondTypeKey: '',
dealWay: '',
dealWayKey: '',
depositPremium: '',
@@ -870,6 +882,7 @@ export default {
offsetPurchasetax: '',
offsetTotal: '',
operationAmount: '',
+ otherActualDiscount: '',
otherAmount: '',
otherAmountRemark: '',
otherDiscount: '',
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialschemeEdit.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialschemeEdit.vue
index be9b0643a0..3ee5f86908 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialschemeEdit.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialschemeEdit.vue
@@ -67,7 +67,7 @@
厂家贴息
- {{ formobj.factoryDiscount }}
+ {{ formobj.factoryDiscount }} {{ formobj.actualDiscount !== '' ? '(实贴' + formobj.actualDiscount + ')' : '' }}
贴息用途
@@ -125,7 +125,7 @@
其它融贴息
- {{ formobj.otherDiscount }}
+ {{ formobj.otherDiscount }} {{ formobj.otherActualDiscount !== '' ? '(实贴' + formobj.otherActualDiscount + ')' : '' }}
@@ -332,9 +332,11 @@ export default {
formobj: {
accessoriesAmount: '',
accessoriesAmountCb: false,
+ actualDiscount: '',
bondAmount: '',
bondAmounts: '',
bondRatio: '',
+ bondTypeKey: '',
dealWay: '',
dealWayKey: '',
depositPremium: '',
@@ -364,6 +366,7 @@ export default {
offsetPurchasetax: '',
offsetTotal: '',
operationAmount: '',
+ otherActualDiscount: '',
otherAmount: '',
otherAmountRemark: '',
otherDiscount: '',
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialschemeInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialschemeInfo.vue
index 6801755b58..4a27605304 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialschemeInfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialschemeInfo.vue
@@ -66,7 +66,7 @@
厂家贴息
- {{ formobj.factoryDiscount }}
+ {{ formobj.factoryDiscount }} {{ formobj.actualDiscount !== '' ? '(实贴' + formobj.actualDiscount + ')' : '' }}
贴息用途
@@ -123,8 +123,8 @@
{{ formobj.otherPolicyInterest }}
- 利息总额
- {{ formobj.otherDiscount }}
+ 其它融贴息
+ {{ formobj.otherDiscount }} {{ formobj.otherActualDiscount !== '' ? '(实贴' + formobj.otherActualDiscount + ')' : '' }}
@@ -406,9 +406,11 @@ export default {
this.formobj = {
accessoriesAmount: '',
accessoriesAmountCb: false,
+ actualDiscount: '',
bondAmount: '',
bondAmounts: '',
bondRatio: '',
+ bondTypeKey: '',
dealWay: '',
dealWayKey: '',
depositPremium: '',
@@ -438,6 +440,7 @@ export default {
offsetPurchasetax: '',
offsetTotal: '',
operationAmount: '',
+ otherActualDiscount: '',
otherAmount: '',
otherAmountRemark: '',
otherDiscount: '',