From 50caac244faf1ddac03af0d8d4680e51999b3431 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 12 Sep 2023 10:14:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=91=E8=9E=8D?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=94=BF=E7=AD=96=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../financialpolicymanagement/financialpolicymanagement.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagement.vue b/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagement.vue index d045e78c47..939c2b335b 100644 --- a/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagement.vue +++ b/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagement.vue @@ -576,7 +576,7 @@ export default { spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.7)' }) - req.setRiskState({ sidsList: this.sids, riskState: '1' }).then(resp => { + req.setRiskState({ sidsList: this.sids, riskState: '1', userSid: window.sessionStorage.getItem('userSid') }).then(resp => { if (resp.success) { this.$message({ type: 'success', message: resp.msg, showClose: true }) } @@ -605,7 +605,7 @@ export default { spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.7)' }) - req.setRiskState({ sidsList: this.sids, riskState: '0' }).then(resp => { + req.setRiskState({ sidsList: this.sids, riskState: '0', userSid: window.sessionStorage.getItem('userSid') }).then(resp => { if (resp.success) { this.$message({ type: 'success', message: resp.msg, showClose: true }) } From 4805d946cdff346ce269a8e921b2dd80d9ddacf0 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 12 Sep 2023 10:23:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=91=E8=9E=8D?= =?UTF-8?q?=E6=96=B9=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/publicPage/financialscheme.vue | 13 ++++++++----- .../components/publicPage/financialschemeEdit.vue | 7 +++++-- .../customizedfinancialsolutionsAdd.vue | 4 ++-- .../customizedfinancialsolutionsEdit.vue | 2 +- .../views/workFlow/publicPage/financialscheme.vue | 12 +++++++----- .../workFlow/publicPage/financialschemeEdit.vue | 7 +++++-- 6 files changed, 28 insertions(+), 17 deletions(-) diff --git a/anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue b/anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue index 7948273985..caed89f73e 100644 --- a/anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue +++ b/anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue @@ -350,6 +350,7 @@ export default { vehOtherPrice: '', vehTotalPrice: '' }, + vehModelSid: '', rules: { } } @@ -378,11 +379,12 @@ export default { } return val }, - showAdd(value) { + showAdd(value, vehModelSid) { this.init() + this.vehModelSid = vehModelSid this.finance = JSON.parse(JSON.stringify(value)) if (this.finance.isPack !== '' && this.finance.isPack !== null) { - selectList({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack }).then((resp) => { + selectList({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack, modelSid: vehModelSid }).then((resp) => { if (resp.success) { this.policy_list = resp.data } @@ -468,7 +470,7 @@ export default { vehOtherPrice: '', vehTotalPrice: '' } - selectList({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack }).then((resp) => { + selectList({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack, modelSid: this.vehModelSid }).then((resp) => { if (resp.success) { this.policy_list = resp.data } @@ -585,10 +587,10 @@ export default { // 应收明细 -- 根据金融产品政策获取的服务费类型计算服务费 if (this.finance.serviceChargeTypeKey === '01') { // 融资项目总额 * 融资项目总额比例(金融产品政策中服务费) - this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue))) + this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) * (parseFloat(this.arguments(this.finance.serviceChargeTypeValue)) / 100)) } else if (this.finance.serviceChargeTypeKey === '02') { // 贷款金额 * 贷款金额比例(金融产品政策中服务费) - this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanAmount)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue))) + this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanAmount)) * (parseFloat(this.arguments(this.finance.serviceChargeTypeValue)) / 100)) } else if (this.finance.serviceChargeTypeKey === '03') { // 等于金融产品政策中服务费 this.finance.serviceAmount = this.finance.serviceChargeTypeValue @@ -807,6 +809,7 @@ export default { vehOtherPrice: '', vehTotalPrice: '' } + this.vehModelSid = '' this.$emit('doback') } } diff --git a/anrui-riskcenter-ui/src/components/publicPage/financialschemeEdit.vue b/anrui-riskcenter-ui/src/components/publicPage/financialschemeEdit.vue index 98502b288b..8b82ecc3fe 100644 --- a/anrui-riskcenter-ui/src/components/publicPage/financialschemeEdit.vue +++ b/anrui-riskcenter-ui/src/components/publicPage/financialschemeEdit.vue @@ -356,16 +356,18 @@ export default { vehOtherPrice: '', vehTotalPrice: '' }, + vehModelSid: '', rules: {} } }, methods: { - showInfo(value) { + showInfo(value, vehModelSid) { this.formobj = JSON.parse(JSON.stringify(value)) + this.vehModelSid = vehModelSid }, financialComputing() { this.viewState = 2 - this.$refs['divCount'].showAdd(this.formobj) + this.$refs['divCount'].showAdd(this.formobj, this.vehModelSid) }, backData(value) { this.viewState = 1 @@ -373,6 +375,7 @@ export default { }, backParameters() { this.$emit('backParameters', this.formobj) + this.vehModelSid = '' this.formobj = { accessoriesAmount: '', accessoriesAmountCb: false, diff --git a/anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutionsAdd.vue b/anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutionsAdd.vue index 2fcb8b8930..c05f8dad12 100644 --- a/anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutionsAdd.vue +++ b/anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutionsAdd.vue @@ -367,7 +367,7 @@ export default { }) this.formobj.userSid = window.sessionStorage.getItem('userSid') this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath') - this.$refs['divJRFA'].showInfo(this.formobj.loanTemplateSolutions) + this.$refs['divJRFA'].showInfo(this.formobj.loanTemplateSolutions, this.formobj.vehModelSid) }, showEdit(row) { this.init() @@ -379,7 +379,7 @@ export default { if (res.success) { this.formobj = res.data this.formobj.instanceId = res.data.procInstId - this.$refs['divJRFA'].showInfo(this.formobj.loanTemplateSolutions) + this.$refs['divJRFA'].showInfo(this.formobj.loanTemplateSolutions, this.formobj.vehModelSid) if (this.formobj.loanTemplateTrailer.vehTrailerCertificateFile.length > 0) { this.formobj.loanTemplateTrailer.vehTrailerCertificateFile.forEach((e) => { this.image_list.push({ diff --git a/anrui-riskcenter-ui/src/views/workFlow/dingzhijinrongFlow/customizedfinancialsolutionsEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/dingzhijinrongFlow/customizedfinancialsolutionsEdit.vue index ec386586de..e3683c7a72 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/dingzhijinrongFlow/customizedfinancialsolutionsEdit.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/dingzhijinrongFlow/customizedfinancialsolutionsEdit.vue @@ -380,7 +380,7 @@ export default { if (res.success) { this.formobj = res.data this.formobj.instanceId = res.data.procInstId - this.$refs['divJRFA'].showInfo(this.formobj.loanTemplateSolutions, this.formobj.orgPath) + this.$refs['divJRFA'].showInfo(this.formobj.loanTemplateSolutions, this.formobj.orgPath, this.formobj.vehModelSid) if (this.formobj.loanTemplateTrailer.vehTrailerCertificateFile.length > 0) { this.formobj.loanTemplateTrailer.vehTrailerCertificateFile.forEach((e) => { this.image_list.push({ diff --git a/anrui-riskcenter-ui/src/views/workFlow/publicPage/financialscheme.vue b/anrui-riskcenter-ui/src/views/workFlow/publicPage/financialscheme.vue index bff7837698..b2acdc962d 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/publicPage/financialscheme.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/publicPage/financialscheme.vue @@ -351,6 +351,7 @@ export default { vehTotalPrice: '' }, orgPath: '', + vehModelSid: '', rules: { } } @@ -379,12 +380,13 @@ export default { } return val }, - showAdd(value, orgPath) { + showAdd(value, orgPath, vehModelSid) { this.init() this.finance = JSON.parse(JSON.stringify(value)) this.orgPath = orgPath + this.vehModelSid = vehModelSid if (this.finance.isPack !== '' && this.finance.isPack !== null) { - selectList({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack }).then((resp) => { + selectList({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack, modelSid: this.vehModelSid }).then((resp) => { if (resp.success) { this.policy_list = resp.data } @@ -470,7 +472,7 @@ export default { vehOtherPrice: '', vehTotalPrice: '' } - selectList({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack }).then((resp) => { + selectList({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack, modelSid: this.vehModelSid }).then((resp) => { if (resp.success) { this.policy_list = resp.data } @@ -587,10 +589,10 @@ export default { // 应收明细 -- 根据金融产品政策获取的服务费类型计算服务费 if (this.finance.serviceChargeTypeKey === '01') { // 融资项目总额 * 融资项目总额比例(金融产品政策中服务费) - this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue))) + this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) * (parseFloat(this.arguments(this.finance.serviceChargeTypeValue)) / 100)) } else if (this.finance.serviceChargeTypeKey === '02') { // 贷款金额 * 贷款金额比例(金融产品政策中服务费) - this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanAmount)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue))) + this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanAmount)) * (parseFloat(this.arguments(this.finance.serviceChargeTypeValue)) / 100)) } else if (this.finance.serviceChargeTypeKey === '03') { // 等于金融产品政策中服务费 this.finance.serviceAmount = this.finance.serviceChargeTypeValue diff --git a/anrui-riskcenter-ui/src/views/workFlow/publicPage/financialschemeEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/publicPage/financialschemeEdit.vue index f004bbfcfd..cd7a9ef9c6 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/publicPage/financialschemeEdit.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/publicPage/financialschemeEdit.vue @@ -357,17 +357,19 @@ export default { vehTotalPrice: '' }, orgPath: '', + vehModelSid: '', rules: {} } }, methods: { - showInfo(value, orgPath) { + showInfo(value, orgPath, vehModelSid) { this.formobj = JSON.parse(JSON.stringify(value)) this.orgPath = orgPath + this.vehModelSid = vehModelSid }, financialComputing() { this.viewState = 2 - this.$refs['divCount'].showAdd(this.formobj, this.orgPath) + this.$refs['divCount'].showAdd(this.formobj, this.orgPath, this.vehModelSid) }, backData(value) { this.viewState = 1 @@ -375,6 +377,7 @@ export default { }, backParameters() { this.$emit('backParameters', this.formobj) + this.vehModelSid = '' this.formobj = { accessoriesAmount: '', accessoriesAmountCb: false,