From 3077ec43996590329fec176e9725b9a3cdbbc696 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 31 Aug 2023 08:36:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/jichuxinxi/crmvehicle.js | 12 +- .../components/publicPage/financialscheme.vue | 785 +++++++++--------- .../publicPage/financialschemeEdit.vue | 110 ++- .../publicPage/financialschemeInfo.vue | 109 ++- .../cheliangxuqiu/cheliangxuqiuAdd.vue | 33 +- .../workflow/publicPage/financialscheme.vue | 2 +- 6 files changed, 539 insertions(+), 512 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/crmvehicle.js b/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/crmvehicle.js index cbcd699290..6e250403fd 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/crmvehicle.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/crmvehicle.js @@ -63,16 +63,18 @@ export function details(data) { export function getPcVehicleInfoBySid(data, user) { return request({ url: '/crm/v1/crmvehicledemand/initVisitDemands/' + data, - method: 'get', - // data: data + method: 'get' }) } // 删除 export function delBySids(data) { return request({ - url: '/crm/v1/crmvehicledemand/del/' + data, - method: 'get', - data: data + url: '/crm/v1/crmvehicledemand/deleteAll', + method: 'DELETE', + data: data, + headers: { + 'Content-Type': 'application/json' + } }) } 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 510d916e10..81ac3c868d 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialscheme.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialscheme.vue @@ -8,261 +8,299 @@ 关闭 - - -
是否打包
- - - 是 - 否 - - - - -
产品政策
- - - - - - - - - -
融资项目
- -
- *主车发票价元 - 配件元 - 挂车元 - 保险元 - 购置税元 -
- - - -
融资项目总额
- - {{ finance.loanTotal }} - - - - - -
首付比例(%)
- {{ finance.downPayRatio }} - - -
首付金额
- - - - - -
产品贷款金额
- - {{ finance.loanAmount }} - - - -
产品期数
- - {{ finance.loanPeriod }} - - - - - -
贷款保证金比例(%)
- - {{ finance.bondRatio }} - - - -
贷款保证金
- - - - - -
预计首款还款日
- - - - - - - - -
厂家贴息
- - - - - -
贴息用途
- - {{ finance.factoryDiscountUse }} - - - -
贴息抵车款
- - - - - - -
- - 其它融 -
-
- +
+ -
其它融名称
+
是否打包
+ + + 是 + 否 + + + + +
产品政策
- - + + + + + +
融资项目
+ +
+ *主车发票价元 + 配件元 + 挂车元 + 保险元 + 购置税元 +
+ + + +
融资项目总额
+ + {{ finance.loanTotal }} + + + + + +
首付比例(%)
+ {{ finance.downPayRatio }} + -
贷款金额
+
首付金额
- + -
期数
+
产品贷款金额
- {{ finance.otherPolicyPeriod }} + {{ finance.loanAmount }} -
年利率(%)
+
产品期数
- {{ finance.otherPolicyYearRatio }} + {{ finance.loanPeriod }} -
-
应收明细
- - -
贷款保证金
- {{ bondAmounts() }} - - -
保险保证金
- - - - - -
落户保证金
- - - - - -
服务费
- - - - - - - -
代收意外险
- - - - - -
上牌费
- - - - - -
运管费
- - - - - -
补车价
- - - - - - - -
其它费用
- - - - - -
其它费用说明
- - - - - - - -
办理方式选择
- - - - - - + + +
贷款保证金比例(%)
+ + {{ finance.bondRatio }} + + + +
贷款保证金
+ + + + + +
预计首款还款日
+ + + + + + + + +
厂家贴息
+ + + + + +
贴息用途
+ + {{ finance.factoryDiscountUse }} + + + +
贴息抵车款
+ + + + + + +
+ + 其它融 +
+
+ + +
其它融名称
+ + + + + + + +
贷款金额
+ + + + + +
期数
+ + {{ finance.otherPolicyPeriod }} + + + +
年利率(%)
+ + {{ finance.otherPolicyYearRatio }} + + + +
+
应收明细
+ + +
贷款保证金
+ {{ bondAmounts() }} + + +
保险保证金
+ + + + + +
落户保证金
+ + + + + +
服务费
+ + + + + + + +
代收意外险
+ + + + + +
上牌费
+ + + + + +
运管费
+ + + + + +
补车价
+ + + + + + + +
其它费用
+ + + + + +
其它费用说明
+ + + + + + + +
办理方式选择
+ + + + + + - -
-
代收首年保险费
+ +
+
代收首年保险费
+ + + +
+
+
抵顶首年保险费
+ + + +
+ + +
+
代收购置税
+ + + +
+
+
抵顶购置税
+ + + +
+ + + + + +
名义(留购)价
- + -
-
-
抵顶首年保险费
+ + + 注：结清时需缴纳此费用 + + +
+
+ + +
产品政策
- + -
- - -
-
代收购置税
+ + + + +
*厂家贴息
- + -
-
-
抵顶购置税
+ + +
*贴息用途
- + {{ finance.factoryDiscountUse }} -
- - - - - -
名义(留购)价
- - - - - - 注：结清时需缴纳此费用 - - + + +
*贴息抵车款
+ + + + + +
*服务费
+ + + + + +
@@ -277,82 +315,74 @@ export default { return { viewTitle: '', submitdisabled: false, + isShowMore: false, dealWay_list: [], policy_list: [], other_list: [], finance: { - saleOrderSid: '', - type: '', - isPack: '', - policyName: '', - policySid: '', - mainVehicleAmount: '', accessoriesAmount: '', - trailerAmount: '', - purchaseTax: '', - premium: '', - loanTotal: '', - accessoriesAmountCb: false, - trailerAmountCb: false, - purchaseTaxCb: false, - premiumCb: false, - - downPayRatio: '', - downPayAmount: '', - loanAmount: '', - loanPeriod: '', - bondRatio: '', bondAmount: '', + bondAmounts: '', + bondRatio: '', + dealWay: '', + dealWayKey: '', + depositPremium: '', + depositSettle: '', + downPayAmount: '', + downPayAmounts: '', + downPayAmountsRatio: '', + downPayRatio: '', factoryDiscount: '', factoryDiscountUse: '', - factoryDiscountUseKey: '', - policyYearRatio: '', - loanPayMoney: '', + interest: '', + isPack: '', + isShowMore: false, + loanAmount: '', + loanAmountTotal: '', + loanDownPay: '', loanInterest: '', - discountCar: '', - otherPolicyState: false, - - otherPolicyName: '', - otherPolicySid: '', + loanPayMoney: '', + loanPeriod: '', + loanTotal: '', + mainVehicleAmount: '', + monthlyRepay: '', + nominalPrice: '', + offsetPremium: '', + offsetPurchasetax: '', + offsetTotal: '', + operationAmount: '', + otherAmount: '', + otherAmountRemark: '', otherPolicyAmount: '', - otherPolicyPeriod: '', - - otherPolicyMonthlyRepay: '', otherPolicyInterest: '', + otherPolicyMonthlyRepay: '', + otherPolicyName: '', + otherPolicyPeriod: '', + otherPolicySid: '', + otherPolicyState: false, otherPolicyYearRatio: '', - - loanDownPay: '', - downPayAmountsRatio: '', - loanAmountTotal: '', period: '', - monthlyRepay: '', - interest: '', - returnTime: '', - - downPayAmounts: '', - bondAmounts: '', - depositPremium: '', - depositSettle: '', - serviceAmount: '', + policyName: '', + policySid: '', + policyYearRatio: '', + premium: '', + premiumCb: false, proxyAccidentPremium: '', - registerAmount: '', - operationAmount: '', - vehOtherPrice: '', - otherAmount: '', - otherAmountRemark: '', - dealWay: '', - dealWayKey: '', proxyPremium: '', proxyPurchasetax: '', - proxyTotal: '', - offsetPremium: '', - offsetPurchasetax: '', - offsetTotal: '', - receivableTotal: '', + purchaseTax: '', + purchaseTaxCb: false, realTotal: '', - vehTotalPrice: '', - nominalPrice: '' + receivableTotal: '', + registerAmount: '', + returnTime: '', + serviceAmount: '', + saleOrderSid: '', + trailerAmount: '', + trailerAmountCb: false, + vehOtherPrice: '', + vehTotalPrice: '' }, rules: { } @@ -384,6 +414,7 @@ export default { }, showAdd(value) { this.finance = JSON.parse(JSON.stringify(value)) + this.isShowMore = this.finance.isShowMore this.init() }, showEdit(value) { @@ -403,78 +434,69 @@ export default { // 是否打包 isPackChange(val) { this.finance = { - saleOrderSid: '', - type: '', - isPack: val, - policyName: '', - policySid: '', - mainVehicleAmount: '', accessoriesAmount: '', - trailerAmount: '', - purchaseTax: '', - premium: '', - loanTotal: '', - accessoriesAmountCb: false, - trailerAmountCb: false, - purchaseTaxCb: false, - premiumCb: false, - - downPayRatio: '', - downPayAmount: '', - loanAmount: '', - loanPeriod: '', - bondRatio: '', bondAmount: '', + bondAmounts: '', + bondRatio: '', + dealWay: '', + dealWayKey: '', + depositPremium: '', + depositSettle: '', + downPayAmount: '', + downPayAmounts: '', + downPayAmountsRatio: '', + downPayRatio: '', factoryDiscount: '', factoryDiscountUse: '', - factoryDiscountUseKey: '', - policyYearRatio: '', - loanPayMoney: '', + interest: '', + isPack: val, + isShowMore: false, + loanAmount: '', + loanAmountTotal: '', + loanDownPay: '', loanInterest: '', - discountCar: '', - otherPolicyState: false, - - otherPolicyName: '', - otherPolicySid: '', + loanPayMoney: '', + loanPeriod: '', + loanTotal: '', + mainVehicleAmount: '', + monthlyRepay: '', + nominalPrice: '', + offsetPremium: '', + offsetPurchasetax: '', + offsetTotal: '', + operationAmount: '', + otherAmount: '', + otherAmountRemark: '', otherPolicyAmount: '', - otherPolicyPeriod: '', - - otherPolicyMonthlyRepay: '', otherPolicyInterest: '', + otherPolicyMonthlyRepay: '', + otherPolicyName: '', + otherPolicyPeriod: '', + otherPolicySid: '', + otherPolicyState: false, otherPolicyYearRatio: '', - - loanDownPay: '', - downPayAmountsRatio: '', - loanAmountTotal: '', period: '', - monthlyRepay: '', - interest: '', - returnTime: '', - - downPayAmounts: '', - bondAmounts: '', - depositPremium: '', - depositSettle: '', - serviceAmount: '', + policyName: '', + policySid: '', + policyYearRatio: '', + premium: '', + premiumCb: false, proxyAccidentPremium: '', - registerAmount: '', - operationAmount: '', - vehOtherPrice: '', - otherAmount: '', - otherAmountRemark: '', - dealWay: '', - dealWayKey: '', proxyPremium: '', proxyPurchasetax: '', - proxyTotal: '', - offsetPremium: '', - offsetPurchasetax: '', - offsetTotal: '', - receivableTotal: '', + purchaseTax: '', + purchaseTaxCb: false, realTotal: '', - vehTotalPrice: '', - nominalPrice: '' + receivableTotal: '', + registerAmount: '', + returnTime: '', + serviceAmount: '', + saleOrderSid: '', + trailerAmount: '', + trailerAmountCb: false, + vehOtherPrice: '', + vehTotalPrice: '' } selectList({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack }).then((resp) => { if (resp.success) { @@ -561,11 +583,11 @@ export default { // 首次计算出或修改融资项目总额 if (this.finance.loanTotal !== '') { // 主方案 -- 计算首付金额 - this.finance.downPayAmount = (parseInt(this.arguments(this.finance.loanTotal)) * parseFloat(this.arguments(this.finance.downPayRatio)) / 100).toFixed(0) + this.finance.downPayAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) * parseFloat(this.arguments(this.finance.downPayRatio)) / 100) // 主方案 -- 计算产品贷款金额 - this.finance.loanAmount = parseInt(this.arguments(this.finance.loanTotal)) - parseInt(this.arguments(this.finance.downPayAmount)) + this.finance.loanAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) - parseInt(this.arguments(this.finance.downPayAmount))) // 主方案 -- 计算贷款保证金 - this.finance.bondAmount = (parseFloat(this.arguments(this.finance.bondRatio)) * parseInt(this.arguments(this.finance.loanAmount)) / 100).toFixed(0) + this.finance.bondAmount = Math.round(parseFloat(this.arguments(this.finance.bondRatio)) * parseInt(this.arguments(this.finance.loanAmount)) / 100) } if (this.finance.premiumCb && this.finance.dealWayKey === '02') { this.finance.offsetPremium = this.finance.premium @@ -582,17 +604,17 @@ export default { downPayAmountInput() { if (this.finance.loanTotal !== '') { // 重新计算首付比例 - this.finance.downPayRatio = (parseInt(this.arguments(this.finance.downPayAmount)) / parseInt(this.arguments(this.finance.loanTotal)) * 100).toFixed(2) + this.finance.downPayRatio = (parseInt(this.arguments(this.finance.downPayAmount)) / parseInt(this.arguments(this.finance.loanTotal)) * 100).toPrecision(2) // 重新计算产品贷款金额 - this.finance.loanAmount = parseInt(this.arguments(this.finance.loanTotal)) - parseInt(this.arguments(this.finance.downPayAmount)) + this.finance.loanAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) - parseInt(this.arguments(this.finance.downPayAmount))) // 主方案 -- 贷款保证金 - this.finance.bondAmount = (parseFloat(this.arguments(this.finance.bondRatio)) * parseInt(this.arguments(this.finance.loanAmount)) / 100).toFixed(0) + this.finance.bondAmount = Math.round(parseFloat(this.arguments(this.finance.bondRatio)) * parseInt(this.arguments(this.finance.loanAmount)) / 100) } }, // 主方案 -- 修改贷款保证金，重新计算贷款保证金比例 bondAmountInput() { if (this.finance.bondAmount !== '') { - this.finance.bondRatio = (parseInt(this.arguments(this.finance.bondAmount)) / parseInt(this.arguments(this.finance.loanAmount)) * 100).toFixed(2) + this.finance.bondRatio = (parseInt(this.arguments(this.finance.bondAmount)) / parseInt(this.arguments(this.finance.loanAmount)) * 100).toPrecision(2) } }, // 其它融--名称 @@ -675,35 +697,41 @@ export default { } } this.submitdisabled = true - calculate(this.finance).then((resp) => { - if (resp.success) { - this.submitdisabled = false - console.log(resp.data) - this.finance.policyYearRatio = resp.data.policyYearRatio - this.finance.loanPayMoney = resp.data.loanPayMoney - this.finance.loanInterest = resp.data.loanInterest - this.finance.otherPolicyMonthlyRepay = resp.data.otherPolicyMonthlyRepay - this.finance.otherPolicyInterest = resp.data.otherPolicyInterest - this.finance.loanDownPay = resp.data.loanDownPay - this.finance.downPayAmountsRatio = resp.data.downPayAmountsRatio - this.finance.loanAmountTotal = resp.data.loanAmountTotal - this.finance.period = resp.data.period - this.finance.monthlyRepay = resp.data.monthlyRepay - this.finance.interest = resp.data.interest - this.finance.downPayAmounts = resp.data.downPayAmounts - this.finance.proxyTotal = resp.data.proxyTotal - this.finance.receivableTotal = resp.data.receivableTotal - this.finance.offsetTotal = resp.data.offsetTotal - this.finance.realTotal = resp.data.realTotal - this.finance.vehTotalPrice = resp.data.vehTotalPrice - this.$emit('backData', this.finance) - this.handleColse() - } else { + if (this.isShowMore) { + calculate(this.finance).then((resp) => { + if (resp.success) { + this.submitdisabled = false + console.log(resp.data) + this.finance.policyYearRatio = resp.data.policyYearRatio + this.finance.loanPayMoney = resp.data.loanPayMoney + this.finance.loanInterest = resp.data.loanInterest + this.finance.otherPolicyMonthlyRepay = resp.data.otherPolicyMonthlyRepay + this.finance.otherPolicyInterest = resp.data.otherPolicyInterest + this.finance.loanDownPay = resp.data.loanDownPay + this.finance.downPayAmountsRatio = resp.data.downPayAmountsRatio + this.finance.loanAmountTotal = resp.data.loanAmountTotal + this.finance.period = resp.data.period + this.finance.monthlyRepay = resp.data.monthlyRepay + this.finance.interest = resp.data.interest + this.finance.downPayAmounts = resp.data.downPayAmounts + this.finance.proxyTotal = resp.data.proxyTotal + this.finance.receivableTotal = resp.data.receivableTotal + this.finance.offsetTotal = resp.data.offsetTotal + this.finance.realTotal = resp.data.realTotal + this.finance.vehTotalPrice = resp.data.vehTotalPrice + this.$emit('backData', this.finance) + this.handleColse() + } else { + this.submitdisabled = false + } + }).catch(() => { this.submitdisabled = false - } - }).catch(() => { + }) + } else { + this.$emit('backData', this.finance) this.submitdisabled = false - }) + this.handleColse() + } }, handleColse() { this.finance = { @@ -780,6 +808,7 @@ export default { vehTotalPrice: '', nominalPrice: '' } + this.isShowMore = false this.$emit('doback') } } 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 7af514faa7..a1e1acedec 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeEdit.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeEdit.vue @@ -326,80 +326,69 @@ export default { viewState: 1, source: '', // 来源（1.客户洽谈--车辆需求--金融方案 2.销售订单--金融方案） formobj: { - saleOrderSid: '', - type: '', - isPack: '', - policyName: '', - policySid: '', - mainVehicleAmount: '', accessoriesAmount: '', - trailerAmount: '', - purchaseTax: '', - premium: '', - loanTotal: '', - accessoriesAmountCb: false, - trailerAmountCb: false, - purchaseTaxCb: false, - premiumCb: false, - - downPayRatio: '', - downPayAmount: '', - loanAmount: '', - loanPeriod: '', - bondRatio: '', bondAmount: '', + bondAmounts: '', + bondRatio: '', + dealWay: '', + dealWayKey: '', + depositPremium: '', + depositSettle: '', + downPayAmount: '', + downPayAmounts: '', + downPayAmountsRatio: '', + downPayRatio: '', factoryDiscount: '', factoryDiscountUse: '', - factoryDiscountUseKey: '', - policyYearRatio: '', - loanPayMoney: '', + interest: '', + isPack: '', + isShowMore: false, + loanAmount: '', + loanAmountTotal: '', + loanDownPay: '', loanInterest: '', - discountCar: '', - otherPolicyState: false, - - otherPolicyName: '', - otherPolicySid: '', + loanPayMoney: '', + loanPeriod: '', + loanTotal: '', + mainVehicleAmount: '', + monthlyRepay: '', + nominalPrice: '', + offsetPremium: '', + offsetPurchasetax: '', + offsetTotal: '', + operationAmount: '', + otherAmount: '', + otherAmountRemark: '', otherPolicyAmount: '', - otherPolicyPeriod: '', - - otherPolicyMonthlyRepay: '', otherPolicyInterest: '', + otherPolicyMonthlyRepay: '', + otherPolicyName: '', + otherPolicyPeriod: '', + otherPolicySid: '', + otherPolicyState: false, otherPolicyYearRatio: '', - - loanDownPay: '', - downPayAmountsRatio: '', - loanAmountTotal: '', period: '', - monthlyRepay: '', - interest: '', - returnTime: '', - - downPayAmounts: '', - bondAmounts: '', - depositPremium: '', - depositSettle: '', - serviceAmount: '', + policyName: '', + policySid: '', + policyYearRatio: '', + premium: '', + premiumCb: false, proxyAccidentPremium: '', - registerAmount: '', - operationAmount: '', - vehOtherPrice: '', - otherAmount: '', - otherAmountRemark: '', - dealWay: '', - dealWayKey: '', proxyPremium: '', proxyPurchasetax: '', - proxyTotal: '', - offsetPremium: '', - offsetPurchasetax: '', - offsetTotal: '', - receivableTotal: '', + purchaseTax: '', + purchaseTaxCb: false, realTotal: '', - vehTotalPrice: '', - nominalPrice: '', - - isShowMore: false + receivableTotal: '', + registerAmount: '', + returnTime: '', + serviceAmount: '', + saleOrderSid: '', + trailerAmount: '', + trailerAmountCb: false, + vehOtherPrice: '', + vehTotalPrice: '' }, orgSidPath: '', rules: {} @@ -423,6 +412,7 @@ export default { this.formobj = value this.orgSidPath = orgSidPath this.source = source + this.viewState = 1 }, financialComputing() { this.viewState = 2 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 31075f4b6e..53ea2838de 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeInfo.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeInfo.vue @@ -320,80 +320,69 @@ export default { index: 0, source: '', formobj: { - saleOrderSid: '', - type: '', - isPack: '', - policyName: '', - policySid: '', - mainVehicleAmount: '', accessoriesAmount: '', - trailerAmount: '', - purchaseTax: '', - premium: '', - loanTotal: '', - accessoriesAmountCb: false, - trailerAmountCb: false, - purchaseTaxCb: false, - premiumCb: false, - - downPayRatio: '', - downPayAmount: '', - loanAmount: '', - loanPeriod: '', - bondRatio: '', bondAmount: '', + bondAmounts: '', + bondRatio: '', + dealWay: '', + dealWayKey: '', + depositPremium: '', + depositSettle: '', + downPayAmount: '', + downPayAmounts: '', + downPayAmountsRatio: '', + downPayRatio: '', factoryDiscount: '', factoryDiscountUse: '', - factoryDiscountUseKey: '', - policyYearRatio: '', - loanPayMoney: '', + interest: '', + isPack: '', + isShowMore: false, + loanAmount: '', + loanAmountTotal: '', + loanDownPay: '', loanInterest: '', - discountCar: '', - otherPolicyState: false, - - otherPolicyName: '', - otherPolicySid: '', + loanPayMoney: '', + loanPeriod: '', + loanTotal: '', + mainVehicleAmount: '', + monthlyRepay: '', + nominalPrice: '', + offsetPremium: '', + offsetPurchasetax: '', + offsetTotal: '', + operationAmount: '', + otherAmount: '', + otherAmountRemark: '', otherPolicyAmount: '', - otherPolicyPeriod: '', - - otherPolicyMonthlyRepay: '', otherPolicyInterest: '', + otherPolicyMonthlyRepay: '', + otherPolicyName: '', + otherPolicyPeriod: '', + otherPolicySid: '', + otherPolicyState: false, otherPolicyYearRatio: '', - - loanDownPay: '', - downPayAmountsRatio: '', - loanAmountTotal: '', period: '', - monthlyRepay: '', - interest: '', - returnTime: '', - - downPayAmounts: '', - bondAmounts: '', - depositPremium: '', - depositSettle: '', - serviceAmount: '', + policyName: '', + policySid: '', + policyYearRatio: '', + premium: '', + premiumCb: false, proxyAccidentPremium: '', - registerAmount: '', - operationAmount: '', - vehOtherPrice: '', - otherAmount: '', - otherAmountRemark: '', - dealWay: '', - dealWayKey: '', proxyPremium: '', proxyPurchasetax: '', - proxyTotal: '', - offsetPremium: '', - offsetPurchasetax: '', - offsetTotal: '', - receivableTotal: '', + purchaseTax: '', + purchaseTaxCb: false, realTotal: '', - vehTotalPrice: '', - nominalPrice: '', - - isShowMore: false + receivableTotal: '', + registerAmount: '', + returnTime: '', + serviceAmount: '', + saleOrderSid: '', + trailerAmount: '', + trailerAmountCb: false, + vehOtherPrice: '', + vehTotalPrice: '' } } }, diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue index f4fe5b9cfa..48598a1287 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue @@ -24,7 +24,7 @@
*资金来源
- + 自有资金 三方金融 @@ -94,7 +94,7 @@
-
+
金融方案类型
@@ -198,6 +198,7 @@ export default { registerAmount: '', returnTime: '', serviceAmount: '', + saleOrderSid: '', trailerAmount: '', trailerAmountCb: false, vehOtherPrice: '', @@ -261,14 +262,20 @@ export default { }) }, // 付款方式 - purchaseMethodInput(val) { - if (val === '1') { - this.formobj.purchaseMethodValue = '全款' - } else { - this.formobj.purchaseMethodValue = '贷款' - } + purchaseMethodInput() { this.formobj.financePlan = '' this.formobj.financePlanValue = '' + this.formobj.typeKey = '' + this.formobj.type = '' + this.handleEmpty() + }, + financePlanInput() { + this.formobj.typeKey = '' + this.formobj.type = '' + this.handleEmpty() + }, + // 清空金融方案 + handleEmpty() { this.formobj.crmSolutions = { accessoriesAmount: '', accessoriesAmountCb: false, @@ -328,11 +335,13 @@ export default { registerAmount: '', returnTime: '', serviceAmount: '', + saleOrderSid: '', trailerAmount: '', trailerAmountCb: false, vehOtherPrice: '', vehTotalPrice: '' } + this.$refs['divJR'].showClient(this.formobj.crmSolutions, window.sessionStorage.getItem('defaultOrgPath'), 'kehu') }, // 选择品牌 brandChange(value) { @@ -370,6 +379,8 @@ export default { } if (this.formobj.purchaseMethod === '1' && this.formobj.financePlan === '2') { this.formobj.crmSolutions.isShowMore = false + this.formobj.crmSolutions.factoryDiscountUse = '抵车款' + this.formobj.crmSolutions.factoryDiscount = '' } this.$refs['divJR'].showClient(this.formobj.crmSolutions, window.sessionStorage.getItem('defaultOrgPath'), 'kehu') } @@ -381,6 +392,11 @@ export default { handleSave() { this.$refs['form_obj'].validate((valid) => { if (valid) { + if (this.formobj.purchaseMethod === '1') { + this.formobj.purchaseMethodValue = '全款' + } else if (this.formobj.purchaseMethod === '2') { + this.formobj.purchaseMethodValue = '贷款' + } if (this.formobj.financePlan === '1') { this.formobj.financePlanValue = '自有资金' } else if (this.formobj.financePlan === '2') { @@ -474,6 +490,7 @@ export default { registerAmount: '', returnTime: '', serviceAmount: '', + saleOrderSid: '', trailerAmount: '', trailerAmountCb: false, vehOtherPrice: '', 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 bed47de64a..1deb621c4c 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 @@ -290,7 +290,7 @@
*贴息抵车款
- + From 0de5dee52cf442c3d0daa0bf26fe88d0183a4af6 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 31 Aug 2023 08:43:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A2=84=E4=BC=B0?= =?UTF-8?q?=E6=8A=A5=E4=BB=B7=E5=8D=95=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/ftl/templateQuotationFour.ftl | 2 +- .../src/main/resources/ftl/templateQuotationOne.ftl | 2 +- .../src/main/resources/ftl/templateQuotationThree.ftl | 2 +- .../src/main/resources/ftl/templateQuotationTwo.ftl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/templateQuotationFour.ftl b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/templateQuotationFour.ftl index 78c67137bf..265c2f5b11 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/templateQuotationFour.ftl +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/templateQuotationFour.ftl @@ -1803,7 +1803,7 @@ - 年 月 日 + 年 月 日 diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/templateQuotationOne.ftl b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/templateQuotationOne.ftl index 3eb38b764d..fc580aca8c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/templateQuotationOne.ftl +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/templateQuotationOne.ftl @@ -1053,7 +1053,7 @@ - 年 月 日 + 年 月 日 diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/templateQuotationThree.ftl b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/templateQuotationThree.ftl index 017ffdd55c..53d7ff50ff 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/templateQuotationThree.ftl +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/templateQuotationThree.ftl @@ -1340,7 +1340,7 @@ - 年 月 日 + 年 月 日 diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/templateQuotationTwo.ftl b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/templateQuotationTwo.ftl index 9bb39fbdd5..5f271c21b3 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/templateQuotationTwo.ftl +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/templateQuotationTwo.ftl @@ -1144,7 +1144,7 @@ - 年 月 日 + 年 月 日 From 83c6edf80ab22bc851f95469cd75fec95acdc837 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 31 Aug 2023 09:35:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../publicPage/financialschemeEdit.vue | 10 +- .../publicPage/financialschemeInfo.vue | 10 +- .../cheliangxuqiu/cheliangxuqiuAdd.vue | 2 +- .../workflow/publicPage/financialscheme.vue | 14 +- .../publicPage/financialschemeEdit.vue | 121 ++++++++---------- .../publicPage/financialschemeInfo.vue | 10 +- 6 files changed, 78 insertions(+), 89 deletions(-) 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 a1e1acedec..760407447c 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeEdit.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeEdit.vue @@ -25,11 +25,11 @@
融资项目
- 主车发票价{{ formobj.mainVehicleAmount }} 元 - 配件{{ formobj.accessoriesAmount }} 元 - 挂车{{ formobj.trailerAmount }} 元 - 保险{{ formobj.premium }} 元 - 购置税{{ formobj.purchaseTax }} 元 + 主车发票价 {{ formobj.mainVehicleAmount }} 元 + 配件 {{ formobj.accessoriesAmount }} 元 + 挂车 {{ formobj.trailerAmount }} 元 + 保险 {{ formobj.premium }} 元 + 购置税 {{ formobj.purchaseTax }} 元
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 53ea2838de..2d949c220a 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeInfo.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeInfo.vue @@ -24,11 +24,11 @@
融资项目
- 主车发票价{{ formobj.mainVehicleAmount }} 元 - 配件{{ formobj.accessoriesAmount }} 元 - 挂车{{ formobj.trailerAmount }} 元 - 保险{{ formobj.premium }} 元 - 购置税{{ formobj.purchaseTax }} 元 + 主车发票价 {{ formobj.mainVehicleAmount }} 元 + 配件 {{ formobj.accessoriesAmount }} 元 + 挂车 {{ formobj.trailerAmount }} 元 + 保险 {{ formobj.premium }} 元 + 购置税 {{ formobj.purchaseTax }} 元
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue index 48598a1287..91ee092019 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue @@ -94,7 +94,7 @@
-
+
金融方案类型
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 1deb621c4c..9aea6d52b5 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 @@ -518,11 +518,11 @@ export default { // 首次计算出或修改融资项目总额 if (this.finance.loanTotal !== '') { // 主方案 -- 计算首付金额 - this.finance.downPayAmount = (parseInt(this.arguments(this.finance.loanTotal)) * parseFloat(this.arguments(this.finance.downPayRatio)) / 100).toFixed(0) + this.finance.downPayAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) * parseFloat(this.arguments(this.finance.downPayRatio)) / 100) // 主方案 -- 计算产品贷款金额 - this.finance.loanAmount = parseInt(this.arguments(this.finance.loanTotal)) - parseInt(this.arguments(this.finance.downPayAmount)) + this.finance.loanAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) - parseInt(this.arguments(this.finance.downPayAmount))) // 主方案 -- 计算贷款保证金 - this.finance.bondAmount = (parseFloat(this.arguments(this.finance.bondRatio)) * parseInt(this.arguments(this.finance.loanAmount)) / 100).toFixed(0) + this.finance.bondAmount = Math.round(parseFloat(this.arguments(this.finance.bondRatio)) * parseInt(this.arguments(this.finance.loanAmount)) / 100) } if (this.finance.premiumCb && this.finance.dealWayKey === '02') { this.finance.offsetPremium = this.finance.premium @@ -539,17 +539,17 @@ export default { downPayAmountInput() { if (this.finance.loanTotal !== '') { // 重新计算首付比例 - this.finance.downPayRatio = (parseInt(this.arguments(this.finance.downPayAmount)) / parseInt(this.arguments(this.finance.loanTotal)) * 100).toFixed(2) + this.finance.downPayRatio = (parseInt(this.arguments(this.finance.downPayAmount)) / parseInt(this.arguments(this.finance.loanTotal)) * 100).toPrecision(2) // 重新计算产品贷款金额 - this.finance.loanAmount = parseInt(this.arguments(this.finance.loanTotal)) - parseInt(this.arguments(this.finance.downPayAmount)) + this.finance.loanAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) - parseInt(this.arguments(this.finance.downPayAmount))) // 主方案 -- 贷款保证金 - this.finance.bondAmount = (parseFloat(this.arguments(this.finance.bondRatio)) * parseInt(this.arguments(this.finance.loanAmount)) / 100).toFixed(0) + this.finance.bondAmount = Math.round(parseFloat(this.arguments(this.finance.bondRatio)) * parseInt(this.arguments(this.finance.loanAmount)) / 100) } }, // 主方案 -- 修改贷款保证金，重新计算贷款保证金比例 bondAmountInput() { if (this.finance.bondAmount !== '') { - this.finance.bondRatio = (parseInt(this.arguments(this.finance.bondAmount)) / parseInt(this.arguments(this.finance.loanAmount)) * 100).toFixed(2) + this.finance.bondRatio = (parseInt(this.arguments(this.finance.bondAmount)) / parseInt(this.arguments(this.finance.loanAmount)) * 100).toPrecision(2) } }, // 其它融--名称 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 de1efb2dde..24b00f9d66 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 @@ -25,11 +25,11 @@
融资项目
- 主车发票价{{ formobj.mainVehicleAmount }} 元 - 配件{{ formobj.accessoriesAmount }} 元 - 挂车{{ formobj.trailerAmount }} 元 - 保险{{ formobj.premium }} 元 - 购置税{{ formobj.purchaseTax }} 元 + 主车发票价 {{ formobj.mainVehicleAmount }} 元 + 配件 {{ formobj.accessoriesAmount }} 元 + 挂车 {{ formobj.trailerAmount }} 元 + 保险 {{ formobj.premium }} 元 + 购置税 {{ formobj.purchaseTax }} 元
@@ -313,7 +313,7 @@