diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index 84155c0..6ca23ee 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -1004,6 +1004,16 @@ export default { id(newVal) { console.log('新的id值') console.log(newVal) + }, + 'passwordForm.password'(newVal) { + // passwordForm:{ + // password:'', + // passwordAgain: '' + // }, + + this.passwordForm.passwordAgain = newVal + console.log('???xxxxxxxxxx') + console.log(this.passwordForm.passwordAgain) } }, created() { @@ -1417,6 +1427,7 @@ export default { sessionStorage.setItem('nomCurrentWithdrawalCard', JSON.stringify(this.receptionList)) } }else if (this.$store.state.system.id == '64,2' && this.popText === '密码器'){ + this.nbm = 64 if (this.passwordForm.passwordAgain){ let accountPassword = ''; diff --git a/src/pages/counter/list/myConfig.js b/src/pages/counter/list/myConfig.js index 4c7ab33..3cbdba8 100644 --- a/src/pages/counter/list/myConfig.js +++ b/src/pages/counter/list/myConfig.js @@ -6,7 +6,7 @@ const myConfig = { isPassword: true, }, '117': { - nbm: 118, + nbm: 117, name: 'nomCurrentCancellPassword', parentId: '285,287,5,26,57,67', isPassword: true diff --git a/src/pages/manage/list/personal/currentAccount/settle.vue b/src/pages/manage/list/personal/currentAccount/settle.vue index e96a8a3..53f14b4 100644 --- a/src/pages/manage/list/personal/currentAccount/settle.vue +++ b/src/pages/manage/list/personal/currentAccount/settle.vue @@ -13,15 +13,15 @@ - + CNY人民币 - - + + - +
@@ -34,15 +34,15 @@ - + - + - + @@ -58,7 +58,7 @@ 提交 - +
@@ -88,7 +88,7 @@ export default{ cardNumber: '', drawPassword: '', currency:'', - money:'', + balance:'', totalMoney:'', userName:'', goldLogo:'', @@ -100,7 +100,7 @@ export default{ cardNumber: '卡号', drawPassword: '支取密码', currency:'币种', - money:'金额', + balance:'余额', totalMoney:'总金额', userName:'客户姓名', // goldLogo:'钞汇标识', @@ -134,7 +134,7 @@ export default{ "subjectId": 9, }, 107: { - prop: 'money', + prop: 'balance', type: '3', "subjectId": 14, }, @@ -178,13 +178,15 @@ export default{ if(this.needsModule(moduleName) === '') { if(sessionStorage.getItem('nomCurrentSettleCard')) { this.cardNumberJudge = true - const { currency, userName, goldLogo, chargeWay, interest, voucherNumber } = this.dataFlow + const { currency, userName, goldLogo, chargeWay, interest, voucherNumber, balance, totalMoney } = this.dataFlow this.form.cardNumber = voucherNumber this.form.currency = currency this.form.userName = userName this.form.goldLogo = goldLogo this.form.chargeWay = chargeWay this.form.interest = interest + this.form.balance = balance + this.form.totalMoney = totalMoney } if(sessionStorage.getItem('nomCurrentSettlePassword')) { this.form.drawPassword = sessionStorage.getItem('nomCurrentSettlePassword') @@ -280,7 +282,10 @@ export default{ needsModule: 'system/needsModule', idCardNumber: 'system/idCardNumber', inMyWork: 'system/inMyWork', - }) + }), + needAuth() { + return this.form.balance > 50000 || this.totalMoney > 50000 + } }, } diff --git a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue index 7759777..837d754 100644 --- a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue +++ b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue @@ -53,7 +53,7 @@ 提交 - + @@ -104,10 +104,10 @@ export default{ rules: { userName: vercustomer , payeeName: [ - { - pattern: namePattern, - message: '收款人名称格式有误' - }, + // { + // pattern: namePattern, + // message: '收款人名称格式有误' + // }, { required: true, message: '请输入收款人名称', @@ -128,6 +128,13 @@ export default{ trigger: 'blur' } ], + shroffAccount: [ + { + required: true, + message: '请输入收款卡号', + trigger: 'blur' + } + ] }, myTable2: { 94: { @@ -290,7 +297,10 @@ export default{ needsModule: 'system/needsModule', idCardNumber: 'system/idCardNumber', inMyWork: 'system/inMyWork', - }) + }), + needAuth() { + return this.form.money > 50000 + } }, } diff --git a/src/pages/manage/list/personal/currentAccount/withdrawal.vue b/src/pages/manage/list/personal/currentAccount/withdrawal.vue index e8aa962..389a85d 100644 --- a/src/pages/manage/list/personal/currentAccount/withdrawal.vue +++ b/src/pages/manage/list/personal/currentAccount/withdrawal.vue @@ -56,7 +56,7 @@ 提交 - + @@ -83,6 +83,8 @@ export default{ created() { if(this.inMyWork(moduleName)) { if(this.needsModule(moduleName) === '') { + console.log('what?>>>>>>>>>>>>>>>>>>>>>>>>') + console.log(sessionStorage.getItem('nomCurrentWithdrawalPassword')) if(sessionStorage.getItem('nomCurrentWithdrawalCard')) { this.cardNumberJudge = true const { currency, userName, goldLogo, serviceCharge, chargeWay, voucherNumber } = this.dataFlow @@ -94,9 +96,7 @@ export default{ this.form.cardNumber = voucherNumber } - if(sessionStorage.getItem('nomCurrentWithdrawalPassword')) { - this.form.drawPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword') - } + this.getFormData() }else { @@ -200,7 +200,7 @@ export default{ else if (list[i].answerId == '89') {this.form.money = list[i].emptyTwo} //金额 else if (list[i].answerId == '90') {this.form.chargeWay = list[i].emptyTwo} //支取方式 // if (list[i].answerId == '91') {sessionStorage.setItem('nomCurrentWithdrawalPassword', list[i].emptyTwo)} //支取密码 - else if (list[i].answerId == '91') { + else if (list[i].answerId == '91' && !sessionStorage.getItem('nomCurrentWithdrawalPassword')) { this.form.drawPassword = list[i].emptyTwo sessionStorage.setItem('nomCurrentWithdrawalPassword', list[i].emptyTwo) } @@ -208,6 +208,11 @@ export default{ else if (list[i].answerId == '93') {this.form.remark = list[i].emptyTwo} //摘要 } } + if(sessionStorage.getItem('nomCurrentWithdrawalPassword')) { + this.form.drawPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword') + } + console.log('issue') + console.log(sessionStorage.getItem('nomCurrentWithdrawalPassword')) }).catch((error)=>{ }) }, @@ -283,7 +288,10 @@ export default{ needsModule: 'system/needsModule', idCardNumber: 'system/idCardNumber', inMyWork: 'system/inMyWork' - }) + }), + needAuth() { + return this.form.money > 50000 + } }, } diff --git a/src/pages/manage/list/personal/timeDeposit/deposit.vue b/src/pages/manage/list/personal/timeDeposit/deposit.vue index 4bd4b1b..bafcaea 100644 --- a/src/pages/manage/list/personal/timeDeposit/deposit.vue +++ b/src/pages/manage/list/personal/timeDeposit/deposit.vue @@ -13,15 +13,15 @@ - + CNY人民币 - + - + @@ -36,10 +36,10 @@ - + - + @@ -79,7 +79,7 @@ 提交 - + @@ -111,7 +111,7 @@ export default{ customerName: '', // 客户姓名 currency: '', // 币种 currencyMark: '', // 钞汇标识 - depositTerm: '3个月', // 存期 + depositTerm: '', // 存期 extendPeriod: '', // 续存 certificateDeposit: '现金', // 存款类别 valueDate: '', // 起息日 @@ -177,26 +177,26 @@ export default{ trigger: 'blur' } ], - extendPeriod: [ - { - required: true, - message: '请选择续存', - trigger: 'blur' - } - ], - interestRate: [{ - required: true, - message: '请输入利率', - trigger: 'blur' - }, - { - pattern: ratePattern, - message: '利率格式有误' - }], - valueDate: { - required: true, - message: '请输入起息日' - } + // extendPeriod: [ + // { + // required: true, + // message: '请选择续存', + // trigger: 'blur' + // } + // ], + // interestRate: [{ + // required: true, + // message: '请选择存期', + // trigger: 'blur' + // }, + // { + // pattern: ratePattern, + // message: '利率格式有误' + // }], + // valueDate: { + // required: true, + // message: '请输入起息日' + // } }, myTable: { 135: { @@ -383,6 +383,23 @@ export default{ inMyWork: 'system/inMyWork', }) }, + watch: { + 'form.depositTerm'(newVal) { + if(newVal === '3个月') { + this.form.interestRate = 1.35 + }else if(newVal === '6个月') { + this.form.interestRate = 1.55 + }else if(newVal === '1年') { + this.form.interestRate = 1.75 + }else if(newVal === '2年') { + this.form.interestRate = 2.25 + }else if(newVal === '3年') { + this.form.interestRate = 2.75 + }else if(newVal === '5年') { + this.form.interestRate = 2.75 + } + } + } }