From f5d6903caf1e1014d76153b58e91471e41bff00f Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 4 Sep 2023 09:30:02 +0800 Subject: [PATCH 1/4] =?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 | 1 + 1 file changed, 1 insertion(+) 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 5634ac2d90..0daca9c72c 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialscheme.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialscheme.vue @@ -752,6 +752,7 @@ export default { this.finance.offsetTotal = resp.data.offsetTotal this.finance.realTotal = resp.data.realTotal this.finance.vehTotalPrice = resp.data.vehTotalPrice + this.finance.isShowMore = this.isShowMore this.$emit('backData', this.finance) this.handleColse() } else { From a093ee79839f8a17dd2ff8a1d9ce643807190df4 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 4 Sep 2023 09:46:12 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java | 1 + 1 file changed, 1 insertion(+) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java index 854a32ce56..26659b3603 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java @@ -54,6 +54,7 @@ public class LoanSolutionsOtherpolicy extends BaseEntity { @ApiModelProperty("主产品方案sid") private String solutionsSid; + private String otherPolicySid; @ApiModelProperty("其它融名称") private String otherPolicyName; @ApiModelProperty("其它融金额") From 11e43b1ec36fb15ae71f91e0ee36d858d2ff3e5e Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 4 Sep 2023 09:54:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B4=B7=E5=89=8D?= =?UTF-8?q?=E4=BF=A1=E7=94=A8=E5=AE=A1=E6=A0=B8=E3=80=81=E8=B4=B7=E5=89=8D?= =?UTF-8?q?=E4=BF=A1=E7=94=A8=E9=87=91=E8=9E=8D=E5=86=85=E5=8B=A4=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../creditauditmanagementAdd.vue | 2 + .../financialclerkbycreditvettingAdd.vue | 86 ++++++++++++++----- 2 files changed, 66 insertions(+), 22 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/creditauditmanagement/creditauditmanagementAdd.vue b/anrui-riskcenter-ui/src/views/creditauditmanagement/creditauditmanagementAdd.vue index 26002073ce..0263753c78 100644 --- a/anrui-riskcenter-ui/src/views/creditauditmanagement/creditauditmanagementAdd.vue +++ b/anrui-riskcenter-ui/src/views/creditauditmanagement/creditauditmanagementAdd.vue @@ -379,8 +379,10 @@ export default { const choose = this.customer_list.filter((item) => item.name === value) if (choose.length > 0) { this.formobj.custSid = choose[0].sid + this.formobj.mobile = choose[0].mobile } else { this.formobj.custSid = '' + this.formobj.mobile = '' } }, capitalChange(value) { diff --git a/anrui-riskcenter-ui/src/views/financialclerkbycreditvetting/financialclerkbycreditvettingAdd.vue b/anrui-riskcenter-ui/src/views/financialclerkbycreditvetting/financialclerkbycreditvettingAdd.vue index 27e6dabc15..bcdb132226 100644 --- a/anrui-riskcenter-ui/src/views/financialclerkbycreditvetting/financialclerkbycreditvettingAdd.vue +++ b/anrui-riskcenter-ui/src/views/financialclerkbycreditvetting/financialclerkbycreditvettingAdd.vue @@ -323,36 +323,78 @@ export default { saveOrUpdate() { this.$refs['form_obj'].validate((valid) => { if (valid) { - this.getUrl() - this.submitdisabled = true - req.saveOrUpdate(this.formobj).then((res) => { - if (res.success) { - this.$message({ showClose: true, type: 'success', message: '保存成功' }) - this.handleReturn('true') - } else { + if (this.formobj.zffkjg === '' || this.formobj.gsfkjg === '') { + this.$confirm('仅填写了部分审核结果,是否继续提交', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.getUrl() + this.submitdisabled = true + req.saveOrUpdate(this.formobj).then((res) => { + if (res.success) { + this.$message({ showClose: true, type: 'success', message: '保存成功' }) + this.handleReturn('true') + } else { + this.submitdisabled = false + } + }).catch(() => { + this.submitdisabled = false + }) + }) + } else { + this.getUrl() + this.submitdisabled = true + req.saveOrUpdate(this.formobj).then((res) => { + if (res.success) { + this.$message({ showClose: true, type: 'success', message: '保存成功' }) + this.handleReturn('true') + } else { + this.submitdisabled = false + } + }).catch(() => { this.submitdisabled = false - } - }).catch(() => { - this.submitdisabled = false - }) + }) + } } }) }, handleConfirm() { this.$refs['form_obj'].validate((valid) => { if (valid) { - this.getUrl() - this.submitdisabled = true - req.finStaffConfirm(this.formobj).then((res) => { - if (res.success) { - this.$message({ showClose: true, type: 'success', message: '操作成功' }) - this.handleReturn('true') - } else { + if (this.formobj.zffkjg === '' || this.formobj.gsfkjg === '') { + this.$confirm('仅填写了部分审核结果,是否继续提交', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.getUrl() + this.submitdisabled = true + req.finStaffConfirm(this.formobj).then((res) => { + if (res.success) { + this.$message({ showClose: true, type: 'success', message: '操作成功' }) + this.handleReturn('true') + } else { + this.submitdisabled = false + } + }).catch(() => { + this.submitdisabled = false + }) + }) + } else { + this.getUrl() + this.submitdisabled = true + req.finStaffConfirm(this.formobj).then((res) => { + if (res.success) { + this.$message({ showClose: true, type: 'success', message: '操作成功' }) + this.handleReturn('true') + } else { + this.submitdisabled = false + } + }).catch(() => { this.submitdisabled = false - } - }).catch(() => { - this.submitdisabled = false - }) + }) + } } }) }, From 779aecc96ac26050437f2807887c8104eabb01c2 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 4 Sep 2023 10:04:47 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B4=B7=E5=89=8D?= =?UTF-8?q?=E4=BF=A1=E7=94=A8=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/creditauditmanagement/creditauditmanagementAdd.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/creditauditmanagement/creditauditmanagementAdd.vue b/anrui-riskcenter-ui/src/views/creditauditmanagement/creditauditmanagementAdd.vue index 0263753c78..1449d1f9da 100644 --- a/anrui-riskcenter-ui/src/views/creditauditmanagement/creditauditmanagementAdd.vue +++ b/anrui-riskcenter-ui/src/views/creditauditmanagement/creditauditmanagementAdd.vue @@ -379,10 +379,10 @@ export default { const choose = this.customer_list.filter((item) => item.name === value) if (choose.length > 0) { this.formobj.custSid = choose[0].sid - this.formobj.mobile = choose[0].mobile + this.formobj.phone = choose[0].mobile } else { this.formobj.custSid = '' - this.formobj.mobile = '' + this.formobj.phone = '' } }, capitalChange(value) {