diff --git a/src/components/needBefore/index.vue b/src/components/needBefore/index.vue index 33cdcef..25bb3b8 100644 --- a/src/components/needBefore/index.vue +++ b/src/components/needBefore/index.vue @@ -19,6 +19,8 @@ const obj = { 'currentAccount/settle': '活期业务 -> 销户', 'timeDeposit/openAccount': '整存整取 -> 开户', 'timeDeposit/deposit': '整存整取 -> 存款', + 'timeDeposit/withdrawal': '整存整取 -> 取款', + 'timeDeposit/deposit': '整存整取 -> 存款', } import {mapGetters} from 'vuex' diff --git a/src/pages/counter/list/myConfig.js b/src/pages/counter/list/myConfig.js index 037257f..7002b2f 100644 --- a/src/pages/counter/list/myConfig.js +++ b/src/pages/counter/list/myConfig.js @@ -49,9 +49,9 @@ const myConfig = { }, '144,1': { nbm: 144, - name: 'nomtimeDepositWithdrawal1', + name: 'nomtimeDepositWithdrawalPassword', parentId: '285,287,5,26,58,120', - isPassword: false + isPassword: true }, '156': { nbm: 156, diff --git a/src/pages/manage/list/personal/timeDeposit/deposit.vue b/src/pages/manage/list/personal/timeDeposit/deposit.vue index c5546af..a77893c 100644 --- a/src/pages/manage/list/personal/timeDeposit/deposit.vue +++ b/src/pages/manage/list/personal/timeDeposit/deposit.vue @@ -64,7 +64,7 @@

请输入密码

- +
@@ -249,6 +249,10 @@ export default{ type: '1', "subjectId": 28, }, + 140: { + prop: 'drawPassword', + type: '3' + }, 141: { prop: 'certificateDeposit',//存款类别 type: '1', @@ -293,9 +297,14 @@ export default{ const parentId = '285,287,5,26,58,119' const cards = { // 131: 'nomtimeDeposit1', - 140: 'nomtimeDepositlPassword' + // 140: 'nomtimeDepositlPassword' + } + const callback = () => { + if(this.form.voucherNumber) { + this.cardNumberJudge = true + } } - autoPlay2(parentId, this.form, this.myTable2, this.myTable, cards) + autoPlay2(parentId, this.form, this.myTable2, this.myTable, cards, callback) }, popUp(text) { this.$store.commit('system/changePop',{show:true,text, id: '131'}) @@ -318,10 +327,10 @@ export default{ // { // 131: nomtimeDeposit1 // }, - { - 140: nomtimeDepositlPassword, - "subjectId": 17, - } + // { + // 140: nomtimeDepositlPassword, + // "subjectId": 17, + // } ] autoPlay(parentId, this.form, this.myTable2, this.myTable, cards) }, @@ -350,7 +359,8 @@ export default{ }) }, dataFlowPassword(newVal) { - this.form.drawPassword = '******' + const nomtimeDepositlPassword = sessionStorage.getItem('nomtimeDepositlPassword') + this.form.drawPassword = nomtimeDepositlPassword } } } diff --git a/src/pages/manage/list/personal/timeDeposit/openAccount.vue b/src/pages/manage/list/personal/timeDeposit/openAccount.vue index 53a9a3c..8c8a80f 100644 --- a/src/pages/manage/list/personal/timeDeposit/openAccount.vue +++ b/src/pages/manage/list/personal/timeDeposit/openAccount.vue @@ -30,7 +30,7 @@ -
+

请刷身份证

@@ -41,19 +41,24 @@ - + - - + +
+

请刷卡

+
+
+ +

请输入密码

- +
@@ -88,6 +93,8 @@ export default{ return{ visible: false, needBefore: '', + idNumberJudge: false, + cardNumberJudge: false, form:{ // 必填项 idNumber: '', // 身份证 @@ -104,6 +111,7 @@ export default{ clientNumber: '' // 客户号 }, formName: { + idNumber: '身份证', // customerName: '客户姓名', // currency: '币种', // currencyMark: '钞汇标识', // @@ -159,6 +167,10 @@ export default{ type: '1', "subjectId": 19, }, + 122: { + prop: 'idNumber',// 身份证 + type: '3' + }, 123: { prop: 'clientNumber',//客户号 type: '3', @@ -175,7 +187,10 @@ export default{ prop: 'voucherNumber',// 凭证号码 type: '3', }, - + 129: { + prop: 'drawPassword', + type: '3' + }, 130: { prop: 'withdrawingWay', //支取方式 type: '1', @@ -217,14 +232,25 @@ export default{ setDataFlow: 'system/setDataFlow', setNeedsModule: 'system/setNeedsModule' }), + getDataBlur() { + + }, getFormData(){ const parentId = '285,287,5,26,58,118' const cards = { - 13: 'nomtimeOpenAccount1', - // 128: 'nomtimeOpenAccount2', - 129: 'nomtimeOpenAccountPassword' + // 13: 'nomtimeOpenAccount1', + // // 128: 'nomtimeOpenAccount2', + // 129: 'nomtimeOpenAccountPassword' } - autoPlay2(parentId, this.form, this.myTable2, this.myTable, cards) + const callback = () => { + if(this.form.idNumber) { + this.idNumberJudge = true + } + if(this.form.voucherNumber) { + this.cardNumberJudge = true + } + } + autoPlay2(parentId, this.form, this.myTable2, this.myTable, cards, callback) }, popUp1(text) { this.$store.commit('system/changePop',{show:true,text, id: '118,1'}) @@ -248,18 +274,18 @@ export default{ submitForm2() { let nomtimeOpenAccount1 = sessionStorage.getItem('nomtimeOpenAccount1') // let nomtimeOpenAccount2 = sessionStorage.getItem('nomtimeOpenAccount2') - let nomtimeOpenAccountPassword = sessionStorage.getItem('nomtimeOpenAccountPassword') + // let nomtimeOpenAccountPassword = sessionStorage.getItem('nomtimeOpenAccountPassword') const cards = [ - { - 13: nomtimeOpenAccount1 - }, // { - // 128: nomtimeOpenAccount2 - // }, - { - 129: nomtimeOpenAccountPassword, - "subjectId": 17, - } + // 13: nomtimeOpenAccount1 + // }, + // // { + // // 128: nomtimeOpenAccount2 + // // }, + // { + // 129: nomtimeOpenAccountPassword, + // "subjectId": 17, + // } ] const parentId = '285,287,5,26,58,118' autoPlay(parentId, this.form, this.myTable2, this.myTable, cards) @@ -281,8 +307,15 @@ export default{ }) }, watch: { + dataFlowCard(newVal) { + this.cardNumberJudge = true + this.$nextTick(() => { + this.$refs.voucherNumber.focus() + }) + }, dataFlowPassword(newVal) { - this.form.drawPassword = '******' + const nomtimeOpenAccountPassword = sessionStorage.getItem('nomtimeOpenAccountPassword') + this.form.drawPassword = nomtimeOpenAccountPassword }, dataFlowId(newVal) { // 身份证号码、客户姓名、币种（人民币）、钞汇标识（钞户） @@ -291,6 +324,9 @@ export default{ this.form.customerName = userName this.form.currency = currency this.form.currencyMark = goldLogo + + this.idNumberJudge = true + console.log(this.idNumberJudge) } } } diff --git a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue index bb4af02..51fb391 100644 --- a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue +++ b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue @@ -31,7 +31,7 @@

请输入密码

- +
@@ -72,7 +72,7 @@ import { myValidate, checkHanzi, checkName, ismoney, autoPlay, autoPlay2, rateListen, inputListen } from '@/utils/utilFunction.js'; import { mobPattern, namePattern, ratePattern, vercustomer } from '@/utils/verify.js' -const moduleName = 'consumerClient' +const moduleName = 'timeDeposit/withdrawal' import { mapMutations, mapGetters } from 'vuex' import NeedBefore from '@/components/needBefore' import MyDialog from '@/components/dialog' @@ -84,6 +84,9 @@ export default{ MyDialog }, created() { + console.log('---wha??????????') + console.log(moduleName) + console.log(this.needsModule(moduleName)) if(this.inMyWork(moduleName)) { if(this.needsModule(moduleName) === '') { }else { @@ -192,6 +195,10 @@ export default{ type: '1', "subjectId": 13, }, + 154: { + prop: 'drawPassword',//支取密码 + type: '3', + } }, myTable2: { 145: { @@ -209,7 +216,10 @@ export default{ }, mounted() { this.getFormData() - this.$refs.depositNumber.focus() + this.$nextTick(() => { + this.$refs.depositNumber.focus() + }) + }, methods: { ...mapMutations({ @@ -236,9 +246,15 @@ export default{ const parentId = '285,287,5,26,58,120' const cards = { // 144: 'nomtimeDepositWithdrawal1', - 154: 'nomtimeDepositWithdrawalPassword' + // 154: 'nomtimeDepositWithdrawalPassword' } - autoPlay2(parentId, this.form, this.myTable2, this.myTable, cards) + const callback = () => { + if(this.form.voucherNumber) { + this.cardNumberJudge = true + } + // if(this.form.drawPassword) + } + autoPlay2(parentId, this.form, this.myTable2, this.myTable, cards, callback) }, popUp(text) { this.$store.commit('system/changePop',{show:true,text, id: '144,1'}) @@ -254,16 +270,16 @@ export default{ }, submitForm2() { // let nomtimeDepositWithdrawal1 = sessionStorage.getItem('nomtimeDepositWithdrawal1') - let nomtimeDepositWithdrawalPassword = sessionStorage.getItem('nomtimeDepositWithdrawalPassword') + // let nomtimeDepositWithdrawalPassword = sessionStorage.getItem('nomtimeDepositWithdrawalPassword') const parentId = '285,287,5,26,58,120' const cards = [ // { // 144: nomtimeDepositWithdrawal1 // }, - { - 154: nomtimeDepositWithdrawalPassword, - "subjectId": 17, - } + // { + // 154: nomtimeDepositWithdrawalPassword, + // "subjectId": 17, + // } ] autoPlay(parentId, this.form, this.myTable2, this.myTable, cards) this.setNeedsModule(moduleName) @@ -293,7 +309,8 @@ export default{ }) }, dataFlowPassword(newVal) { - this.form.drawPassword = '******' + const nomtimeDepositWithdrawalPassword = sessionStorage.getItem('nomtimeDepositWithdrawalPassword') + this.form.drawPassword = nomtimeDepositWithdrawalPassword } // cardNumberJudge } diff --git a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue index aa4f965..81b9998 100644 --- a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue +++ b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue @@ -76,7 +76,7 @@

请输入密码

- +