diff --git a/src/api/http.js b/src/api/http.js index c0f6eb5..f42d7a6 100644 --- a/src/api/http.js +++ b/src/api/http.js @@ -136,4 +136,7 @@ export const batchProcessing = (data) => { } export const operationExtension = (data) => { return post(`/judgment/bankPersonalLoanContractInfo/operationExtension?contractId=${data.id}&extensionPeriod=${data.extensionPeriod}`) +} +export const calculateTheReturnInterestSum = (data) => { + return post(`/judgment/bankPersonalLoanContractInfo/calculateTheReturnInterestSum`, data) } \ No newline at end of file diff --git a/src/components/case/index.vue b/src/components/case/index.vue index 4eb4e66..c57db92 100644 --- a/src/components/case/index.vue +++ b/src/components/case/index.vue @@ -316,6 +316,7 @@ export default { sessionStorage.setItem('cid', cid) sessionStorage.setItem('systemId', systemId) sessionStorage.setItem('timestamp', timestamp) + console.log("🚀 ~ mounted ~ projectId:", token, projectId) sessionStorage.setItem('projectId', projectId) sessionStorage.setItem('assessmentId', assessmentId) sessionStorage.setItem('competitionId', competitionId) @@ -527,7 +528,6 @@ export default { this.selectProjects(params) }, selectProjects (params) { - console.log("🚀 ~ selectProjects ~ params:", params) getProjectDetail(params).then((data) => { if (data.status == 200) { this.globalTimer = ""; @@ -580,7 +580,6 @@ export default { sessionStorage.removeItem('submited', 0) sessionStorage.removeItem('firstLoad2') this.setBusinessKey('') - console.log("🚀 ~ getProjectDetail ~ params:", params) getProjectDetail(params).then((data) => { if (data.status == 200) { const { systemId, projectId } = data.data.projectManage @@ -653,7 +652,6 @@ export default { this.actEndTime = new Date().getTime(); let ruleReqs = sessionStorage.getItem('ruleReqs') let startTime = sessionStorage.getItem('startTime') || this.entryTime - console.log("🚀 ~ sureSubmit ~ this.entryTime:", this.entryTime) let ruleReqsList = JSON.parse(ruleReqs); let lcld = [] for (var i = 0; i < this.requires.length; i++) { diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index 5ec7394..d4b95c1 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -2166,6 +2166,10 @@ export default { }).catch((error) => { }) } else if (this.nbm == 12) { + if (!this.receptionList.length) { + this.setTipsOperate('请选择需要导入的报表!') + return + } this.setCreditImportIds(this.receptionList[0].id) this.setTipsOperate('导入成功!') } diff --git a/src/pages/manage/list/corporateLoans/apply/creditApplication/index.vue b/src/pages/manage/list/corporateLoans/apply/creditApplication/index.vue index b015bad..dc3ec47 100644 --- a/src/pages/manage/list/corporateLoans/apply/creditApplication/index.vue +++ b/src/pages/manage/list/corporateLoans/apply/creditApplication/index.vue @@ -330,8 +330,10 @@ export default { async submit () { try { const { form } = this - if (!form.matureRepayment && !form.otherRepayments) return this.$message.error('请选择还款来源！') + if (!form.matureRepayment && !form.otherRepaymentsCheck) return this.$message.error('请选择还款来源！') + if (form.otherRepaymentsCheck && !form.otherRepayments) return this.$message.error('请输入其他的还款来源！') if (!form.paymentForMaterials && !form.payLaborCosts && !form.payExpenses && !form.otherUses) return this.$message.error('请选择贷款用途！') + if (form.otherUseCheck && !form.otherUses) return this.$message.error('请输入其他的用途！') // 判分 await creditApplicationInput({ diff --git a/src/pages/manage/list/corporateLoans/detail.vue b/src/pages/manage/list/corporateLoans/detail.vue index 31bd55f..b84db56 100644 --- a/src/pages/manage/list/corporateLoans/detail.vue +++ b/src/pages/manage/list/corporateLoans/detail.vue @@ -65,6 +65,11 @@ + + + + @@ -113,11 +118,6 @@ - - - - @@ -143,8 +143,8 @@ - - + + @@ -222,12 +222,16 @@ export default { if (this.id) { // 查看及展期 const { data } = await companyLoanDetails(this.id) - this.form = data.bankCreditEvaluation || {} + + const eva = data.bankCreditEvaluation || {} + if (eva.identificationType) eva.identificationType = +eva.identificationType + this.form = eva || {} this.bankCompanyLoans = data.bankCompanyLoans || {} const app = data.bankLoanApplication || {} if (app.distributionMethod) app.distributionMethod = +app.distributionMethod if (app.repaymentMethodOne) app.repaymentMethodOne = +app.repaymentMethodOne + if (app.repaymentMethodTwo) app.repaymentMethodTwo = +app.repaymentMethodTwo if (app.creditTerm) app.creditTerm = +app.creditTerm if (app.guaranteeMethod) app.guaranteeMethod = +app.guaranteeMethod if (app.loanTerm) app.loanTerm = +app.loanTerm diff --git a/src/pages/manage/list/personalLoans/detail.vue b/src/pages/manage/list/personalLoans/detail.vue index ef694bc..7873f4b 100644 --- a/src/pages/manage/list/personalLoans/detail.vue +++ b/src/pages/manage/list/personalLoans/detail.vue @@ -121,7 +121,7 @@ - + import { phoneListen, myValidate, checkHanzi, checkName, ismoney, autoPlay, autoPlay2, inputListen, messageIdCard, messageCard, messagePassword } from '@/utils/utilFunction.js'; import { mobPattern, namePattern, ratePattern, vercustomer } from '@/utils/verify.js' -import { addOperation, personalBasicSave, loanContractSave, personalBasicFind, grantALoan, operationExtension } from '@/api/http' +import { addOperation, personalBasicSave, loanContractSave, personalBasicFind, grantALoan, operationExtension, calculateTheReturnInterestSum } from '@/api/http' import Util from '@/libs/util' const moduleName = 'personalLoans/detail' @@ -487,6 +487,15 @@ export default { date.setMonth(date.getMonth() + loanTerm) this.form.maturityDate = Util.formatDate('yyyy-MM-dd', date) } + this.interestCalc() + }, + // 计算利息总额 + async interestCalc () { + const { form } = this + if (form.contractAmount && form.maturityDate) { + const { data } = await calculateTheReturnInterestSum(form) + form.interestTotal = data.interestTotal || '' + } }, // 下一步 async next () { diff --git a/src/store/modules/system.js b/src/store/modules/system.js index fd6b8bb..8d467bd 100644 --- a/src/store/modules/system.js +++ b/src/store/modules/system.js @@ -1457,7 +1457,7 @@ const myInitState = { '业务三十六': { id: 844, name: '贷款业务', - data: [13, 16, 770, 771, 772, 442, 804, 805, 806, 807, 808, 809, 810, 811, 812, 813, 814, 815, 817, 818, 819], + data: [13, 16, 770, 771, 772, 442, 805, 806, 807, 808, 809, 810, 811, 812, 813, 814, 815, 817, 818, 819], needs: [], isStamp: { // '业务专用章': [ 411 ] @@ -2777,7 +2777,7 @@ export default { '业务三十六': { id: 844, name: '贷款业务', - data: [13, 16, 770, 771, 772, 442, 804, 805, 806, 807, 808, 809, 810, 811, 812, 813, 814, 815, 817, 818, 819], + data: [13, 16, 770, 771, 772, 442, 805, 806, 807, 808, 809, 810, 811, 812, 813, 814, 815, 817, 818, 819], needs: [], isStamp: { // '业务专用章': [ 411 ]