From 6a91504fc59d11615c00f36692755aaf7f2eaa35 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Thu, 19 Sep 2024 16:44:19 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/manage/list/agent/electricRate.vue | 8 +- src/pages/manage/list/agent/telRate.vue | 6 +- src/pages/manage/list/agent/waterRate.vue | 6 +- .../apply/creditEvaluation/basic.vue | 2 +- .../manage/list/corporateLoans/detail.vue | 34 ++-- src/pages/manage/list/corporateLoans/loan.vue | 4 +- .../manage/list/foreignExchange/puchasing.vue | 15 +- .../manage/list/personalLoans/detail.vue | 161 ++++++++++-------- src/pages/manage/list/personalLoans/index.vue | 2 +- src/pages/manage/list/personalLoans/list.vue | 3 +- src/store/modules/system.js | 2 - 11 files changed, 140 insertions(+), 103 deletions(-) diff --git a/src/pages/manage/list/agent/electricRate.vue b/src/pages/manage/list/agent/electricRate.vue index c158cac..f5d9c05 100644 --- a/src/pages/manage/list/agent/electricRate.vue +++ b/src/pages/manage/list/agent/electricRate.vue @@ -19,7 +19,7 @@ - + @@ -37,7 +37,7 @@ @input="(val) => checkName(val, form, 'customerName')"> - + @@ -48,7 +48,7 @@ - @@ -198,7 +198,7 @@ export default { trigger: 'blur' } ], - extendDepomonthlyWithholdingsitTarget: [ + monthlyWithholding: [ { required: true, message: '请选择每月代扣', diff --git a/src/pages/manage/list/agent/telRate.vue b/src/pages/manage/list/agent/telRate.vue index b1ee252..9882d64 100644 --- a/src/pages/manage/list/agent/telRate.vue +++ b/src/pages/manage/list/agent/telRate.vue @@ -25,7 +25,7 @@ - + 是 否 @@ -191,7 +191,7 @@ export default { trigger: 'blur' } ], - extendDepomonthlyWithholdingsitTarget: [ + monthlyWithholding: [ { required: true, message: '请选择每月代扣', @@ -321,7 +321,7 @@ export default { return } if (!this.form.voucherNumber) { - messageCard('请填写凭证号码') + messageCard('请填写账号') return } diff --git a/src/pages/manage/list/agent/waterRate.vue b/src/pages/manage/list/agent/waterRate.vue index b356ff6..2019c13 100644 --- a/src/pages/manage/list/agent/waterRate.vue +++ b/src/pages/manage/list/agent/waterRate.vue @@ -49,10 +49,10 @@ @input="(val) => checkName(val, form, 'customerName')"> - + - + 是 否 @@ -177,7 +177,7 @@ export default { trigger: 'blur' } ], - extendDepomonthlyWithholdingsitTarget: [ + monthlyWithholding: [ { required: true, message: '请选择每月代扣', diff --git a/src/pages/manage/list/corporateLoans/apply/creditEvaluation/basic.vue b/src/pages/manage/list/corporateLoans/apply/creditEvaluation/basic.vue index eff3417..bd2323a 100644 --- a/src/pages/manage/list/corporateLoans/apply/creditEvaluation/basic.vue +++ b/src/pages/manage/list/corporateLoans/apply/creditEvaluation/basic.vue @@ -86,7 +86,7 @@
- 返回 + 返回 下一步
diff --git a/src/pages/manage/list/corporateLoans/detail.vue b/src/pages/manage/list/corporateLoans/detail.vue index f854683..31bd55f 100644 --- a/src/pages/manage/list/corporateLoans/detail.vue +++ b/src/pages/manage/list/corporateLoans/detail.vue @@ -129,7 +129,7 @@ - + @@ -244,21 +244,25 @@ export default { // 放款 async loanSubmit () { if (!this.loanDate) return this.$message.error('请选择放款日期！') - const { data } = await loanDisbursement({ - companyLoanId: this.id, - loanDate: this.loanDate, - }) + try { + const { data } = await loanDisbursement({ + companyLoanId: this.id, + loanDate: this.loanDate, + }) - const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',766,768' - await addOperation({ - parentId: preId, - lcJudgmentRuleReq: [{ answerId: 838, emptyOne: '', emptyTwo: '', operationIds: preId + ',838', type: '' },], - projectId: +sessionStorage.getItem('projectId'), - startTime: sessionStorage.getItem('startTime') - }) - this.$message[data.status === 200 ? 'success' : 'error'](data.message) - this.loanVisible = false - this.getDetail() + this.$message[data.status === 200 ? 'success' : 'error'](data.message) + if (data.status === 200) { + const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',766,768' + await addOperation({ + parentId: preId, + lcJudgmentRuleReq: [{ answerId: 838, emptyOne: '', emptyTwo: '', operationIds: preId + ',838', type: '' },], + projectId: +sessionStorage.getItem('projectId'), + startTime: sessionStorage.getItem('startTime') + }) + this.loanVisible = false + this.getDetail() + } + } catch (e) { } }, }, } diff --git a/src/pages/manage/list/corporateLoans/loan.vue b/src/pages/manage/list/corporateLoans/loan.vue index 88de137..5f81c19 100644 --- a/src/pages/manage/list/corporateLoans/loan.vue +++ b/src/pages/manage/list/corporateLoans/loan.vue @@ -12,7 +12,9 @@ - + + + diff --git a/src/pages/manage/list/foreignExchange/puchasing.vue b/src/pages/manage/list/foreignExchange/puchasing.vue index bf055ea..59fb672 100644 --- a/src/pages/manage/list/foreignExchange/puchasing.vue +++ b/src/pages/manage/list/foreignExchange/puchasing.vue @@ -30,8 +30,8 @@ - + + @@ -93,7 +93,6 @@ export default { if (sessionStorage.getItem('foreignExchangePuchasingBankCard')) { this.cardNumberJudge = true const { voucherNumber, goldLogo } = this.dataFlow - this.form.goldLogo = goldLogo this.form.voucherNumber = voucherNumber } @@ -150,6 +149,16 @@ export default { } ], }, + goldLogos: [ + { + itemId: 150, + options: '现汇（参考牌价712.34）' + }, + { + itemId: 151, + options: '现钞（参考牌价712.34）' + }, + ], submited: 0 } }, diff --git a/src/pages/manage/list/personalLoans/detail.vue b/src/pages/manage/list/personalLoans/detail.vue index 3793716..0990fb3 100644 --- a/src/pages/manage/list/personalLoans/detail.vue +++ b/src/pages/manage/list/personalLoans/detail.vue @@ -62,7 +62,9 @@ - + + + @@ -120,7 +122,7 @@ + value-format="yyyy-MM-dd" :clearable="false" @change="maturityDateCalc"> @@ -435,8 +437,19 @@ export default { if (this.id) { // 查看及展期 const { data } = await personalBasicFind(this.id) - this.basicForm = data.data - if (data.data.bankPersonalLoanContractInfo) this.form = data.data.bankPersonalLoanContractInfo + const form = data.data + if (form.idType) form.idType = +form.idType + if (form.gender) form.gender = +form.gender + this.idNumberJudge = true + this.basicForm = form + + // 贷款合同 + + const contract = data.data.bankPersonalLoanContractInfo + if (contract) { + if (contract.loanTerm) contract.loanTerm = +contract.loanTerm + this.form = contract + } } else if (sessionStorage.getItem('nomUsefulPhrasesOpenCard2')) { // 新增 sessionStorage.removeItem('nomUsefulPhrasesOpenCard2') @@ -496,44 +509,46 @@ export default { ...basicForm, }) - // 判分 - const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',766,767' - const rule = [ - { answerId: 847, emptyOne: 125, emptyTwo: basicForm.phoneNumber, operationIds: preId + ',847', type: 3 }, - { answerId: 859, emptyOne: 125, emptyTwo: basicForm.applicationDate, operationIds: preId + ',859', type: 3 }, - ] + if (data.status === 200) { + // 判分 + const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',766,767' + const rule = [ + { answerId: 847, emptyOne: 125, emptyTwo: basicForm.phoneNumber, operationIds: preId + ',847', type: 3 }, + { answerId: 859, emptyOne: 125, emptyTwo: basicForm.applicationDate, operationIds: preId + ',859', type: 3 }, + ] - basicForm.position && rule.push({ answerId: 848, emptyOne: 125, emptyTwo: basicForm.position, operationIds: preId + ',848', type: 3 }) - basicForm.salary && rule.push({ answerId: 849, emptyOne: 125, emptyTwo: basicForm.salary, operationIds: preId + ',849', type: 3 }) - basicForm.currentWorkYears && rule.push({ answerId: 850, emptyOne: 125, emptyTwo: basicForm.currentWorkYears, operationIds: preId + ',850', type: 3 }) - basicForm.totalWorkYears && rule.push({ answerId: 851, emptyOne: 125, emptyTwo: basicForm.totalWorkYears, operationIds: preId + ',851', type: 3 }) - basicForm.propertyOwner && rule.push({ answerId: 852, emptyOne: 125, emptyTwo: basicForm.propertyOwner, operationIds: preId + ',852', type: 3 }) - basicForm.propertyCertificateNo && rule.push({ answerId: 853, emptyOne: 125, emptyTwo: basicForm.propertyCertificateNo, operationIds: preId + ',853', type: 3 }) - basicForm.coOwnership && rule.push({ answerId: 854, emptyOne: 125, emptyTwo: basicForm.coOwnership, operationIds: preId + ',854', type: 3 }) - basicForm.location && rule.push({ answerId: 855, emptyOne: 125, emptyTwo: basicForm.location, operationIds: preId + ',855', type: 3 }) - basicForm.propertyRightNature && rule.push({ answerId: 856, emptyOne: 125, emptyTwo: basicForm.propertyRightNature, operationIds: preId + ',856', type: 3 }) - basicForm.area && rule.push({ answerId: 857, emptyOne: 125, emptyTwo: basicForm.area, operationIds: preId + ',857', type: 3 }) - basicForm.usagePeriod && rule.push({ answerId: 858, emptyOne: 125, emptyTwo: basicForm.usagePeriod, operationIds: preId + ',858', type: 3 }) - await addOperation({ - parentId: preId, - lcJudgmentRuleReq: rule, - projectId: +sessionStorage.getItem('projectId'), - startTime: sessionStorage.getItem('startTime') - }) + basicForm.position && rule.push({ answerId: 848, emptyOne: 125, emptyTwo: basicForm.position, operationIds: preId + ',848', type: 3 }) + basicForm.salary && rule.push({ answerId: 849, emptyOne: 125, emptyTwo: basicForm.salary, operationIds: preId + ',849', type: 3 }) + basicForm.currentWorkYears && rule.push({ answerId: 850, emptyOne: 125, emptyTwo: basicForm.currentWorkYears, operationIds: preId + ',850', type: 3 }) + basicForm.totalWorkYears && rule.push({ answerId: 851, emptyOne: 125, emptyTwo: basicForm.totalWorkYears, operationIds: preId + ',851', type: 3 }) + basicForm.propertyOwner && rule.push({ answerId: 852, emptyOne: 125, emptyTwo: basicForm.propertyOwner, operationIds: preId + ',852', type: 3 }) + basicForm.propertyCertificateNo && rule.push({ answerId: 853, emptyOne: 125, emptyTwo: basicForm.propertyCertificateNo, operationIds: preId + ',853', type: 3 }) + basicForm.coOwnership && rule.push({ answerId: 854, emptyOne: 125, emptyTwo: basicForm.coOwnership, operationIds: preId + ',854', type: 3 }) + basicForm.location && rule.push({ answerId: 855, emptyOne: 125, emptyTwo: basicForm.location, operationIds: preId + ',855', type: 3 }) + basicForm.propertyRightNature && rule.push({ answerId: 856, emptyOne: 125, emptyTwo: basicForm.propertyRightNature, operationIds: preId + ',856', type: 3 }) + basicForm.area && rule.push({ answerId: 857, emptyOne: 125, emptyTwo: basicForm.area, operationIds: preId + ',857', type: 3 }) + basicForm.usagePeriod && rule.push({ answerId: 858, emptyOne: 125, emptyTwo: basicForm.usagePeriod, operationIds: preId + ',858', type: 3 }) + await addOperation({ + parentId: preId, + lcJudgmentRuleReq: rule, + projectId: +sessionStorage.getItem('projectId'), + startTime: sessionStorage.getItem('startTime') + }) - this.setCreditIds({ - personalLoanId: data.personalLoanId, - applicationDate: data.applicationDate || this.form.applicationDate, - contractNo: data.contractNo || this.form.contractNo, - }) - if (data.contractNo) this.form.contractNo = data.contractNo - this.curStep++ + this.setCreditIds({ + personalLoanId: data.personalLoanId, + applicationDate: data.applicationDate || this.form.applicationDate, + contractNo: data.contractNo || this.form.contractNo, + }) + if (data.contractNo) this.form.contractNo = data.contractNo + this.curStep++ + } } catch { (e) => { } } }, this.$refs)) } else { // 合同信息校验 + if (!this.form.contractAmount) return this.$message.warning('请输入合同金额！') this.$refs.form.validate(myValidate(() => { - // this.visible = true this.saveContract() }, this.$refs)) } @@ -549,23 +564,27 @@ export default { ...form, }) - // 判分 - const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',766,767' - const rule = [ - { answerId: 860, emptyOne: 125, emptyTwo: form.contractAmount, operationIds: preId + ',860', type: 3 }, - { answerId: 861, emptyOne: 141, emptyTwo: this.loanTerms.find(e => e.id === form.loanTerm).pointId, operationIds: preId + ',861', type: 1 }, - { answerId: 862, emptyOne: 125, emptyTwo: form.interestStartDate, operationIds: preId + ',862', type: 3 }, - { answerId: 863, emptyOne: 125, emptyTwo: form.repaymentMethod, operationIds: preId + ',863', type: 3 }, - { answerId: 864, emptyOne: 125, emptyTwo: form.repaymentAccount, operationIds: preId + ',864', type: 3 }, - ] - await addOperation({ - parentId: preId, - lcJudgmentRuleReq: rule, - projectId: +sessionStorage.getItem('projectId'), - startTime: sessionStorage.getItem('startTime') - }) + if (data.status === 200) { + // 判分 + const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',766,767' + const rule = [ + { answerId: 860, emptyOne: 125, emptyTwo: form.contractAmount, operationIds: preId + ',860', type: 3 }, + { answerId: 861, emptyOne: 141, emptyTwo: this.loanTerms.find(e => e.id === form.loanTerm).pointId, operationIds: preId + ',861', type: 1 }, + { answerId: 862, emptyOne: 125, emptyTwo: form.interestStartDate, operationIds: preId + ',862', type: 3 }, + { answerId: 863, emptyOne: 125, emptyTwo: form.repaymentMethod, operationIds: preId + ',863', type: 3 }, + { answerId: 864, emptyOne: 125, emptyTwo: form.repaymentAccount, operationIds: preId + ',864', type: 3 }, + ] + await addOperation({ + parentId: preId, + lcJudgmentRuleReq: rule, + projectId: +sessionStorage.getItem('projectId'), + startTime: sessionStorage.getItem('startTime') + }) - data.status === 200 ? this.$router.push('/counter/list/manage/personalLoans') : this.$message.error(data.message) + this.$router.push('/counter/list/manage/personalLoans') + } else { + this.$message.error(data.message) + } } catch { (e) => { } } }, // 展示放款弹框 @@ -581,16 +600,18 @@ export default { }) this.$message[data.status === 200 ? 'success' : 'error'](data.message) - // 判分 - const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',766,767' - await addOperation({ - parentId: preId, - lcJudgmentRuleReq: [{ answerId: 865, emptyOne: '', emptyTwo: '', operationIds: preId + ',865', type: '' }], - projectId: +sessionStorage.getItem('projectId'), - startTime: sessionStorage.getItem('startTime') - }) + if (data.status === 200) { + // 判分 + const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',766,767' + await addOperation({ + parentId: preId, + lcJudgmentRuleReq: [{ answerId: 865, emptyOne: '', emptyTwo: '', operationIds: preId + ',865', type: '' }], + projectId: +sessionStorage.getItem('projectId'), + startTime: sessionStorage.getItem('startTime') + }) - setTimeout(this.$router.push('/counter/list/manage/personalLoans'), 1500) + setTimeout(this.$router.push('/counter/list/manage/personalLoans'), 1500) + } }, // 展示展期弹框 @@ -606,16 +627,18 @@ export default { }) this.$message[data.status === 200 ? 'success' : 'error'](data.message) - // 判分 - const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',766,767' - await addOperation({ - parentId: preId, - lcJudgmentRuleReq: [{ answerId: 866, emptyOne: '', emptyTwo: '', operationIds: preId + ',866', type: '' }], - projectId: +sessionStorage.getItem('projectId'), - startTime: sessionStorage.getItem('startTime') - }) + if (data.status === 200) { + // 判分 + const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',766,767' + await addOperation({ + parentId: preId, + lcJudgmentRuleReq: [{ answerId: 866, emptyOne: '', emptyTwo: '', operationIds: preId + ',866', type: '' }], + projectId: +sessionStorage.getItem('projectId'), + startTime: sessionStorage.getItem('startTime') + }) - setTimeout(this.$router.push('/counter/list/manage/personalLoans'), 1500) + setTimeout(this.$router.push('/counter/list/manage/personalLoans'), 1500) + } }, phoneListen, diff --git a/src/pages/manage/list/personalLoans/index.vue b/src/pages/manage/list/personalLoans/index.vue index 0402ea1..439c17e 100644 --- a/src/pages/manage/list/personalLoans/index.vue +++ b/src/pages/manage/list/personalLoans/index.vue @@ -25,7 +25,7 @@ export default { }, data () { return { - text: '',/* 顶部文字 */ + text: '全部',/* 顶部文字 */ textObj: { '1': '全部', '2': '正常还款', diff --git a/src/pages/manage/list/personalLoans/list.vue b/src/pages/manage/list/personalLoans/list.vue index faa608a..f6b1941 100644 --- a/src/pages/manage/list/personalLoans/list.vue +++ b/src/pages/manage/list/personalLoans/list.vue @@ -39,7 +39,8 @@ scope.row.contractNo !== '——' ? '查看' : '编辑' }} diff --git a/src/store/modules/system.js b/src/store/modules/system.js index 98989b2..73e7365 100644 --- a/src/store/modules/system.js +++ b/src/store/modules/system.js @@ -1510,7 +1510,6 @@ export default { // 下拉框的数据,在电脑中的下拉框有许多相同的，不用每次都请求服务器，可以在这里拿数据: selectList: { - banknoteRemittanceList: [], currencySelectList: [], goldLogoSelectList: [], accountQualitySelectList: [], @@ -2837,7 +2836,6 @@ export default { 76: 'isTranslate', 40: 'outAccountWayList', 39: 'calculateWayList', - 119: 'banknoteRemittanceList', 122: 'fundingSourceList', 123: 'allCurrencyList', 124: 'buyForeignPurposeList',