From fbb6eb61ded4939840d21e3c0dee1e8cf7ce8ac7 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Thu, 31 Oct 2024 18:54:40 +0800 Subject: [PATCH] fix --- package-lock.json | 6 ++-- package.json | 1 + src/api/http.js | 3 ++ src/pages/manage/list/agent/electricRate.vue | 2 +- .../list/corporateLoans/application.vue | 2 ++ .../apply/creditEvaluation/importReport.vue | 26 ++++++++++++++--- .../apply/creditEvaluation/preLoan.vue | 27 +++++++++++++++--- .../apply/loanApplication/step1.vue | 20 ++++++++----- .../apply/loanApplication/step2.vue | 28 ++++++++++++++++--- src/pages/manage/list/corporateLoans/loan.vue | 1 + .../manage/list/corporateLoans/management.vue | 9 ++++-- .../manage/list/corporateLoans/repayment.vue | 21 ++++++++++++++ .../manage/list/personalLoans/detail.vue | 1 + src/pages/manage/list/personalLoans/list.vue | 22 ++++++++++++++- 14 files changed, 143 insertions(+), 26 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9b1d39b..0dc46f8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8298,9 +8298,9 @@ } }, "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" + "version": "4.17.21", + "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "lodash._basecopy": { "version": "3.0.1", diff --git a/package.json b/package.json index f6ac39c..b13bf2e 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "element-theme": "^2.0.1", "element-ui": "^2.13.0", "js-cookie": "^2.2.1", + "lodash": "^4.17.21", "mavon-editor": "^2.6.17", "postcss": "^7.0.36", "postcss-px2rem": "^0.3.0", diff --git a/src/api/http.js b/src/api/http.js index f438fd3..8fea696 100644 --- a/src/api/http.js +++ b/src/api/http.js @@ -68,6 +68,9 @@ export const creditEvaluationDetails = data => { export const loanApplicationInput = data => { return post(`/judgment/bankLoanApplication/loanApplicationInput`, data) } +export const loanApplicationInterestCalculation = data => { + return post(`/judgment/bankLoanApplication/loanApplicationInterestCalculation`, data) +} export const loanApplicationDetails = data => { return get(`/judgment/bankLoanApplication/loanApplicationDetails`, data) } diff --git a/src/pages/manage/list/agent/electricRate.vue b/src/pages/manage/list/agent/electricRate.vue index 392ca41..44e1e46 100644 --- a/src/pages/manage/list/agent/electricRate.vue +++ b/src/pages/manage/list/agent/electricRate.vue @@ -355,7 +355,7 @@ export default { { answerId: 725, emptyOne: 111, emptyTwo: form.paymentUnit, operationIds: preId + ',725', type: 3 }, { answerId: 726, emptyOne: 112, emptyTwo: form.houseId, operationIds: preId + ',726', type: 3 }, - { answerId: 730, emptyOne: '', emptyTwo: '', operationIds: preId + ',730', type: '' }, + { answerId: 730, emptyOne: 153, emptyTwo: form.address, operationIds: preId + ',730', type: 3 }, { answerId: 727, emptyOne: 113, emptyTwo: form.paymentMoney, operationIds: preId + ',727', type: 3 }, { answerId: 728, emptyOne: 114, emptyTwo: form.monthlyWithholding, operationIds: preId + ',728', type: 1 }, { answerId: 729, emptyOne: 17, emptyTwo: form.drawPassword, operationIds: preId + ',729', type: 3 }, diff --git a/src/pages/manage/list/corporateLoans/application.vue b/src/pages/manage/list/corporateLoans/application.vue index ba02436..52f55e2 100644 --- a/src/pages/manage/list/corporateLoans/application.vue +++ b/src/pages/manage/list/corporateLoans/application.vue @@ -16,6 +16,7 @@ + @@ -42,6 +42,7 @@ export default { data () { return { form: {}, + originForm: {}, } }, mounted () { @@ -64,13 +65,30 @@ export default { importCashFlowStatement: r.importCashFlowStatement || '', }) } + this.originForm = JSON.stringify(this.creditImportIds) }, // 导入 importSth (i) { this.setCreditImportIndex(i) this.$parent.$parent.$parent.showData('导入报表', 12) }, - async next () { + // 上一步 + async prev () { + if (this.originForm !== JSON.stringify(this.creditImportIds)) { + try { + await this.$confirm(`编辑的内容未保存，是否保存并继续上一步？`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + closeOnClickModal: false, + }) + this.next(0) + } catch (e) { } + } else { + this.$emit('updateStep', 0) + } + }, + async next (step) { const form = this.creditImportIds if (!form.importBalanceSheet) return this.$message.error('请导入资产负债表！') if (!form.importIncomeStatement) return this.$message.error('请导入损益表！') @@ -92,7 +110,7 @@ export default { projectId: +sessionStorage.getItem('projectId'), startTime: sessionStorage.getItem('startTime') }) - this.$emit('updateStep', 2) + this.$emit('updateStep', step) } catch { (e) => { } } }, }, diff --git a/src/pages/manage/list/corporateLoans/apply/creditEvaluation/preLoan.vue b/src/pages/manage/list/corporateLoans/apply/creditEvaluation/preLoan.vue index 45adf09..72fe292 100644 --- a/src/pages/manage/list/corporateLoans/apply/creditEvaluation/preLoan.vue +++ b/src/pages/manage/list/corporateLoans/apply/creditEvaluation/preLoan.vue @@ -74,8 +74,8 @@
- 上一步 - 下一步 + 上一步 + 下一步
@@ -123,6 +123,7 @@ export default { loanRiskSituation: 204, preLoanOtherRiskSituations: '', }, + originForm: {}, rules: { surveyDate: [ { @@ -224,8 +225,26 @@ export default { r.loanRiskSituation = +r.loanRiskSituation || 204 this.form = r } + this.originForm = JSON.stringify(this.form) }, - async next () { + // 上一步 + async prev () { + debugger + if (this.originForm !== JSON.stringify(this.form)) { + try { + await this.$confirm(`编辑的内容未保存，是否保存并继续上一步？`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + closeOnClickModal: false, + }) + this.next(1) + } catch (e) { } + } else { + this.$emit('updateStep', 1) + } + }, + async next (step) { this.$refs.form.validate(myValidate(async () => { try { const { form } = this @@ -254,7 +273,7 @@ export default { projectId: +sessionStorage.getItem('projectId'), startTime: sessionStorage.getItem('startTime') }) - this.$emit('updateStep', 3) + this.$emit('updateStep', step) } catch { (e) => { } } }, this.$refs)) }, diff --git a/src/pages/manage/list/corporateLoans/apply/loanApplication/step1.vue b/src/pages/manage/list/corporateLoans/apply/loanApplication/step1.vue index 122fd3e..90064e3 100644 --- a/src/pages/manage/list/corporateLoans/apply/loanApplication/step1.vue +++ b/src/pages/manage/list/corporateLoans/apply/loanApplication/step1.vue @@ -172,15 +172,21 @@ export default { }) const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',766,768' + const rule = [ + { answerId: 820, emptyOne: 134, emptyTwo: form.creditTermOne, operationIds: preId + ',820', type: 1 }, + { answerId: 821, emptyOne: 125, emptyTwo: form.loanApplicationAmount, operationIds: preId + ',821', type: 3 }, + { answerId: 822, emptyOne: 135, emptyTwo: form.repaymentMethodOne, operationIds: preId + ',822', type: 1 }, + { answerId: 823, emptyOne: 136, emptyTwo: form.distributionMethod, operationIds: preId + ',823', type: 1 }, + { answerId: 845, emptyOne: 140, emptyTwo: form.loanApplicationDate, operationIds: preId + ',845', type: 3 }, + ] + form.companyRegisteredAddress && rule.push({ answerId: 883, emptyOne: 153, emptyTwo: form.companyRegisteredAddress, operationIds: preId + ',883', type: 3 }) + form.corporateName && rule.push({ answerId: 884, emptyOne: 153, emptyTwo: form.corporateName, operationIds: preId + ',884', type: 3 }) + form.corporateIdNumber && rule.push({ answerId: 885, emptyOne: 153, emptyTwo: form.corporateIdNumber, operationIds: preId + ',885', type: 3 }) + form.creditRating && rule.push({ answerId: 896, emptyOne: '', emptyTwo: '', operationIds: preId + ',896', type: '' }) + form.creditAmount && rule.push({ answerId: 897, emptyOne: '', emptyTwo: '', operationIds: preId + ',897', type: '' }) await addOperation({ parentId: preId, - lcJudgmentRuleReq: [ - { answerId: 820, emptyOne: 134, emptyTwo: form.creditTermOne, operationIds: preId + ',820', type: 1 }, - { answerId: 821, emptyOne: 125, emptyTwo: form.loanApplicationAmount, operationIds: preId + ',821', type: 3 }, - { answerId: 822, emptyOne: 135, emptyTwo: form.repaymentMethodOne, operationIds: preId + ',822', type: 1 }, - { answerId: 823, emptyOne: 136, emptyTwo: form.distributionMethod, operationIds: preId + ',823', type: 1 }, - { answerId: 845, emptyOne: 140, emptyTwo: form.loanApplicationDate, operationIds: preId + ',845', type: 3 }, - ], + lcJudgmentRuleReq: rule, projectId: +sessionStorage.getItem('projectId'), startTime: sessionStorage.getItem('startTime') }) diff --git a/src/pages/manage/list/corporateLoans/apply/loanApplication/step2.vue b/src/pages/manage/list/corporateLoans/apply/loanApplication/step2.vue index 3a4d8a4..a6a3ef5 100644 --- a/src/pages/manage/list/corporateLoans/apply/loanApplication/step2.vue +++ b/src/pages/manage/list/corporateLoans/apply/loanApplication/step2.vue @@ -47,7 +47,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -117,7 +117,7 @@