From 96565c45036633ddd145bf540a5e0daa6b4add9b Mon Sep 17 00:00:00 2001 From: "luoJunYong.123" Date: Tue, 18 Jan 2022 10:36:58 +0800 Subject: [PATCH] update --- src/components/dialog/index.vue | 5 +- src/pages/counter/list/index.vue | 6 +- .../personal/currentAccount/openAccount.vue | 96 +++++++++++-------- 3 files changed, 65 insertions(+), 42 deletions(-) diff --git a/src/components/dialog/index.vue b/src/components/dialog/index.vue index c709290..ff9dfaa 100644 --- a/src/components/dialog/index.vue +++ b/src/components/dialog/index.vue @@ -28,7 +28,7 @@ -
{{ val? val: '未填写' }}
+
{{ val }}
 @@ -72,6 +72,9 @@ export default { } let num = 0; for(const key in this.showForm) { + if(!this.showForm[key]) { + continue; + } if(num%2 === 0) { this.leftObj[this.formName[key]] = this.showForm[key] }else { diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index 7ce2483..4757061 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -668,7 +668,11 @@ export default { } else if(this.$store.state.system.popText == '密码器'){ if(this.$store.state.system.id == '62,1'){ - + let accountPassword = sessionStorage.getItem('accountPassword'); + if(accountPassword){ + this.passwordForm.password = accountPassword + this.passwordForm.passwordAgain = accountPassword + } }else if(this.$store.state.system.id == '64'){ let nomCurrentWithdrawalPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword'); if(nomCurrentWithdrawalPassword){ diff --git a/src/pages/manage/list/personal/currentAccount/openAccount.vue b/src/pages/manage/list/personal/currentAccount/openAccount.vue index 708829f..6c39552 100644 --- a/src/pages/manage/list/personal/currentAccount/openAccount.vue +++ b/src/pages/manage/list/personal/currentAccount/openAccount.vue @@ -63,15 +63,15 @@

请刷卡

- +

请输入密码

-
- +
+
@@ -215,16 +215,16 @@ export default { userName: '', // 客户姓名 goldLogo: '', // 钞汇标识 accountQuality: '', // 账户性质 - accountType: '一类账户', // 账户类型 - drawWay: '密码', // 支取方式 + accountType: '', // 账户类型 + drawWay: '', // 支取方式 voucherType: '', // 凭证类型 accountQualitysTwo: '', // 账户性质2 - accountTypesTwo: '二类账户', // 账户类型2 - drawWaysTwo: '密码', // 支取方式2 + accountTypesTwo: '', // 账户类型2 + drawWaysTwo: '', // 支取方式2 voucherTypesTwo: '', // 凭证类型2 accountQualitysThree: '', // 账户性质3 - accountTypesThree: '三类账户', // 账户类型3 - drawWaysThree: '密码', // 支取方式3 + accountTypesThree: '', // 账户类型3 + drawWaysThree: '', // 支取方式3 voucherTypesThree: '', // 凭证类型3 }, formName:{ @@ -339,35 +339,37 @@ export default { parentId: '285,287,5,26,57,62' } getOperation(param).then((data)=>{ - console.log('need') - connsole.log(data) - if(data.status.status == 200) { + if(data.status == 200) { var list = data.data.judgmentRuleReqs for (var i = 0; i < list.length; i++) { + console.log(list[i].emptyTwo) if (list[i].answerId == '68') {this.form.userNumber = list[i].emptyTwo} - if (list[i].answerId == '69') {this.form.userName = list[i].emptyTwo} - if (list[i].answerId == '70') {this.form.currency = +list[i].emptyTwo} - if (list[i].answerId == '71') {this.form.goldLogo = +list[i].emptyTwo} - if (list[i].answerId == '72') {this.form.accountQuality = +list[i].emptyTwo} - if (list[i].answerId == '73') {this.form.voucherType = +list[i].emptyTwo} - if (list[i].answerId == '74') {this.form.accountType = +list[i].emptyTwo} - if (list[i].answerId == '75') { + else if (list[i].answerId == '69') {this.form.userName = list[i].emptyTwo} + else if (list[i].answerId == '70') {this.form.currency = list[i].emptyTwo} + else if (list[i].answerId == '71') {this.form.goldLogo = list[i].emptyTwo} + else if (list[i].answerId == '72') {this.form.accountQuality = list[i].emptyTwo} + else if (list[i].answerId == '73') {this.form.voucherType = list[i].emptyTwo} + else if (list[i].answerId == '74') {this.form.accountType = list[i].emptyTwo} + else if (list[i].answerId == '75') { this.form.cardNumber = list[i].emptyTwo this.cardNumberJudge = true } - if (list[i].answerId == '76') {this.form.drawWay = +list[i].emptyTwo} - // if (list[i].answerId == '77') {sessionStorage.setItem('accountPasswordAll', list[i].emptyTwo)} - if (list[i].answerId == '77') { + else if (list[i].answerId == '76') {this.form.drawWay = list[i].emptyTwo} + // else if (list[i].answerId == '77') {sessionStorage.setItem('accountPasswordAll', list[i].emptyTwo)} + else if (list[i].answerId == '77') { this.form.drawPassword = list[i].emptyTwo + sessionStorage.setItem('accountPassword', list[i].emptyTwo) + console.log(sessionStorage.getItem('accountPassword')) + } - if (list[i].answerId == '270') {this.form.accountQualitysTwo = +list[i].emptyTwo} - if (list[i].answerId == '271') {this.form.voucherTypesTwo = +list[i].emptyTwo} - if (list[i].answerId == '272') {this.form.accountTypesTwo = +list[i].emptyTwo} - if (list[i].answerId == '274') {this.form.drawWaysTwo = +list[i].emptyTwo} - if (list[i].answerId == '276') {this.form.accountQualitysThree = +list[i].emptyTwo} - if (list[i].answerId == '277') {this.form.voucherTypesThree = +list[i].emptyTwo} - if (list[i].answerId == '278') {this.form.accountTypesThree = +list[i].emptyTwo} - if (list[i].answerId == '280') {this.form.drawWaysThree = +list[i].emptyTwo} + else if (list[i].answerId == '270') {this.form.accountQualitysTwo = list[i].emptyTwo} + else if (list[i].answerId == '271') {this.form.voucherTypesTwo = list[i].emptyTwo} + else if (list[i].answerId == '272') {this.form.accountTypesTwo = list[i].emptyTwo} + else if (list[i].answerId == '274') {this.form.drawWaysTwo = list[i].emptyTwo} + else if (list[i].answerId == '276') {this.form.accountQualitysThree = list[i].emptyTwo} + else if (list[i].answerId == '277') {this.form.voucherTypesThree = list[i].emptyTwo} + else if (list[i].answerId == '278') {this.form.accountTypesThree = list[i].emptyTwo} + else if (list[i].answerId == '280') {this.form.drawWaysThree = list[i].emptyTwo} } }else{ @@ -381,13 +383,11 @@ export default { parentId: '285,287,5,25,33' } getOperation(param).then((data)=>{ - console.log(data) if(data.status == 200) { var list = data.data.judgmentRuleReqs for (var i = 0; i < list.length; i++) { if (list[i].answerId == '42') {this.form.userName = list[i].emptyTwo} else if (list[i].answerId == '75') { - console.log(list[i].emptyTwo) this.form.cardNumber = list[i].emptyTwo this.cardNumberJudge = true } @@ -405,17 +405,19 @@ export default { } let dataList = []; getOperation(param).then((data)=>{ - console.log('what>') - console.log(data) if(data.status == 200){ let list = data.data.judgmentRuleReqs; - for(var i=0;i 0) { + this.cardNumberJudge = true; + this.form.cardNumber = list[0].emptyTwo } }else{ - dataList = [] + // dataList = [] } - sessionStorage.setItem('dataList',JSON.stringify(dataList)) + // sessionStorage.setItem('dataList',JSON.stringify(dataList)) }).catch((error)=>{ }) }, @@ -493,8 +495,22 @@ export default { // return; // } this.$refs.form.validate(myValidate(() => { - // 验证通过逻辑写在这 - this.visible = true + // 验证通过逻辑写在这 + // this.formTwo == true && (this.form.accountTypesTwo && this.form.drawWaysTwo && this.form.voucherTypesTwo) + // this.formThree == true && (this.form.accountTypesThree && this.form.drawWaysThree && this.form.voucherTypesThree) + let judgeVisible2 = true + let judgeVisible3 = true + if(this.formTwo) { + judgeVisible2 = this.form.accountTypesTwo && this.form.drawWaysTwo && this.form.voucherTypesTwo + } + if(this.formThree) { + judgeVisible3 = this.form.accountTypesThree && this.form.drawWaysThree && this.form.voucherTypesThree + } + if(this.form.userName && this.form.currency && this.form.goldLogo && this.form.accountType && this.form.drawWay && this.form.voucherType && this.cardNumberJudge && this.form.drawPassword && judgeVisible2 && judgeVisible3) { + this.visible = true + }else { + this.$message.error('有必填项未填哦~'); + } }, this.$refs)); }, //确认提交