From 7b7282f0abed6c73b584e9276f89450f45dda18e Mon Sep 17 00:00:00 2001 From: "luoJunYong.123" Date: Thu, 20 Jan 2022 18:22:52 +0800 Subject: [PATCH] update --- src/components/needBefore/index.vue | 1 + src/pages/counter/list/index.vue | 4 +- src/pages/counter/list/myConfig.js | 24 +- src/pages/manage/index/index.vue | 8 +- .../ImportantCash/controlCash/cashOut.vue | 68 +++++- .../ImportantCash/controlCash/cashPaid.vue | 138 ++++++----- .../controlCash/cashRecipients.vue | 141 ++++++----- .../controlCash/cashTransferInto.vue | 74 +++++- .../list/ImportantCash/controlCash/index.vue | 15 +- src/pages/manage/list/business/deposit.vue | 109 +++++---- .../manage/list/business/openAccount.vue | 111 ++++++--- src/pages/manage/list/business/transfer.vue | 128 +++++++--- src/pages/manage/list/business/withdrawal.vue | 172 +++++++------- .../manage/list/client/consumerClient.vue | 28 ++- .../manage/list/client/corporateClient.vue | 219 ++++++++++-------- .../personal/callDeposits/accountClosed.vue | 25 +- .../personal/callDeposits/callDeposits.vue | 13 +- .../personal/callDeposits/openAccount.vue | 15 ++ .../currentAccount/accountCancellation.vue | 3 + .../list/personal/currentAccount/deposit.vue | 1 + .../list/personal/currentAccount/index.vue | 11 +- .../personal/currentAccount/openAccount.vue | 6 + .../list/personal/currentAccount/settle.vue | 2 + .../currentAccount/transferAccounts.vue | 2 + .../personal/currentAccount/withdrawal.vue | 2 + .../list/personal/timeDeposit/deposit.vue | 2 + .../list/personal/timeDeposit/openAccount.vue | 3 + .../list/personal/timeDeposit/timeDeposit.vue | 15 +- .../list/personal/timeDeposit/withdrawal.vue | 2 + .../personal/usefulPhrases/accountClosed.vue | 3 + .../usefulPhrases/continueDeposit.vue | 2 + .../personal/usefulPhrases/openAccount.vue | 3 + .../personal/usefulPhrases/usefulPhrases.vue | 13 +- .../list/servicesAccount/passwordChange.vue | 203 ++++++++++++---- .../list/servicesAccount/passwordLost.vue | 163 ++++++++----- src/store/modules/system.js | 90 +++++-- 36 files changed, 1235 insertions(+), 584 deletions(-) diff --git a/src/components/needBefore/index.vue b/src/components/needBefore/index.vue index a38a479..eca1f8f 100644 --- a/src/components/needBefore/index.vue +++ b/src/components/needBefore/index.vue @@ -26,6 +26,7 @@ const obj = { 'timeDeposit/deposit': '整存整取 -> 存款', 'timeDeposit/withdrawal': '整存整取 -> 取款', 'timeDeposit/deposit': '整存整取 -> 存款', + 'business/openAccount': '公司业务 -> 开户' } import {mapGetters} from 'vuex' diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index 074324b..6334d67 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -1379,7 +1379,7 @@ export default { if(this.popText.includes('身份证扫描')) { for (let i=0;i0){ diff --git a/src/pages/counter/list/myConfig.js b/src/pages/counter/list/myConfig.js index 957dcaa..4c7ab33 100644 --- a/src/pages/counter/list/myConfig.js +++ b/src/pages/counter/list/myConfig.js @@ -131,25 +131,41 @@ const myConfig = { nbm: 320, name: 'servicesPasswordChange', parentId: '285,287,5,28,316', - isPassword: false + isPassword: false, + machine: '身份证扫描仪' }, '323': { nbm: 323, name: 'servicesPasswordChange2', parentId: '285,287,5,28,316', - isPassword: false + isPassword: false, + machine: '刷卡器' + }, + '325': { + nbm: 325, + name: 'servicesPasswordChange3', + parentId: '285,287,5,28,316', + isPassword: true, + }, + '326': { + nbm: 326, + name: 'servicesPasswordChange4', + parentId: '285,287,5,28,316', + isPassword: true, }, '329': { nbm: 329, name: 'servicesPasswordLost', parentId: '285,287,5,28,328', - isPassword: false + isPassword: false, + machine: '刷卡器' }, '333': { nbm: 333, name: 'servicesPasswordLost2', parentId: '285,287,5,28,328', - isPassword: false + isPassword: false, + machine: '身份证扫描仪' }, '341': { nbm: 341, diff --git a/src/pages/manage/index/index.vue b/src/pages/manage/index/index.vue index 111fd0a..470362b 100644 --- a/src/pages/manage/index/index.vue +++ b/src/pages/manage/index/index.vue @@ -47,10 +47,14 @@ export default { } }, created() { - + console.log('hey') + if(sessionStorage.getItem('computerPath')) { + this.$router.push(sessionStorage.getItem('computerPath')) + } }, methods: { close(){ + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, handleFullscreen(){ @@ -61,7 +65,7 @@ export default { this.fullscreen = false this.$store.commit('system/changeFullscreen',false) }, - } + }, }; diff --git a/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue b/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue index 08c2dcd..97a7bf0 100644 --- a/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue +++ b/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue @@ -1,22 +1,27 @@ // 存款 @@ -168,4 +184,16 @@ export default { /deep/.el-table .success-row { background: #f0f9eb; } + + .submitBtn{ + position: relative; + width: 300px; + font-size: 18px; + height: 45px; + margin-top: 50px; + border-radius: 10px; + bottom: 10px; + left: 50%; + transform: translate(-50%,-20%); + } \ No newline at end of file diff --git a/src/pages/manage/list/ImportantCash/controlCash/cashRecipients.vue b/src/pages/manage/list/ImportantCash/controlCash/cashRecipients.vue index 756a073..f47e56e 100644 --- a/src/pages/manage/list/ImportantCash/controlCash/cashRecipients.vue +++ b/src/pages/manage/list/ImportantCash/controlCash/cashRecipients.vue @@ -1,26 +1,28 @@ @@ -170,4 +189,16 @@ export default { /deep/.el-table .success-row { background: #f0f9eb; } + + .submitBtn{ + position: relative; + width: 300px; + font-size: 18px; + height: 45px; + margin-top: 50px; + border-radius: 10px; + bottom: 10px; + left: 50%; + transform: translate(-50%,-20%); + } \ No newline at end of file diff --git a/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue b/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue index 1663305..ea2b085 100644 --- a/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue +++ b/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue @@ -1,21 +1,26 @@ diff --git a/src/pages/manage/list/ImportantCash/controlCash/index.vue b/src/pages/manage/list/ImportantCash/controlCash/index.vue index 69e4e55..bb8e5ca 100644 --- a/src/pages/manage/list/ImportantCash/controlCash/index.vue +++ b/src/pages/manage/list/ImportantCash/controlCash/index.vue @@ -60,6 +60,7 @@ export default { data() { return { text:'',/* 顶部文字 */ + cacheVal: '', textObj:{ '1':'现金领用', '2':'现金上缴', @@ -81,17 +82,21 @@ export default { } }, created() { - this.handleSelect('1') + if(sessionStorage.getItem('importantCashIndex')) { + this.handleSelect(sessionStorage.getItem('importantCashIndex')) + }else { + this.handleSelect('1') + } }, methods: { handleSelect(val){ - console.log(typeof(val),this.activeIndex,'xuanze'); - this.text = this.textObj[val] this.activeIndex = val + this.cacheVal = val }, - - + }, + destroyed() { + sessionStorage.setItem('importantCashIndex', this.cacheVal) } }; diff --git a/src/pages/manage/list/business/deposit.vue b/src/pages/manage/list/business/deposit.vue index 2f4fc4c..7e52612 100644 --- a/src/pages/manage/list/business/deposit.vue +++ b/src/pages/manage/list/business/deposit.vue @@ -1,6 +1,6 @@ // 存款 diff --git a/src/pages/manage/list/business/openAccount.vue b/src/pages/manage/list/business/openAccount.vue index cd6ebd1..87cdcca 100644 --- a/src/pages/manage/list/business/openAccount.vue +++ b/src/pages/manage/list/business/openAccount.vue @@ -1,6 +1,6 @@ // 开户 diff --git a/src/pages/manage/list/business/transfer.vue b/src/pages/manage/list/business/transfer.vue index 731daba..2bca0f5 100644 --- a/src/pages/manage/list/business/transfer.vue +++ b/src/pages/manage/list/business/transfer.vue @@ -1,16 +1,14 @@ // 转账 diff --git a/src/pages/manage/list/business/withdrawal.vue b/src/pages/manage/list/business/withdrawal.vue index 76f13b3..dfad940 100644 --- a/src/pages/manage/list/business/withdrawal.vue +++ b/src/pages/manage/list/business/withdrawal.vue @@ -1,6 +1,6 @@ // 取款 diff --git a/src/pages/manage/list/client/consumerClient.vue b/src/pages/manage/list/client/consumerClient.vue index b3a2d41..f0b0b5c 100644 --- a/src/pages/manage/list/client/consumerClient.vue +++ b/src/pages/manage/list/client/consumerClient.vue @@ -30,6 +30,8 @@ v-model="form.birthday" type="date" placeholder="选择日期" + value-format="yyyy-MM-dd HH:mm" + format="yyyy-MM-dd HH:mm" ref="birthday"> @@ -226,6 +228,8 @@ export default { created() { if(this.inMyWork(moduleName)) { if(this.needsModule(moduleName) === '') { + + if(sessionStorage.getItem('nomClientIdentity')) { this.idNumberJudge = true const { idType, userName, sex, birthday, nationality, mailbox, idNumber } = this.dataFlow @@ -238,6 +242,7 @@ export default { this.form.mailbox = mailbox } this.getFormData() + }else { this.isNeedBefore = true this.needBefore = this.needsModule(moduleName) @@ -279,10 +284,29 @@ export default { if (list[i].answerId == '46') {this.form.mailbox = list[i].emptyTwo} if (list[i].answerId == '47') {this.form.phone = list[i].emptyTwo} } + } + // const tt1 = JSON.parse(sessionStorage.getItem('tt1')) + // console.log('1-tt1') + // console.log(tt1) + // if(tt1) { + // for(const key in tt1) { + // this.form[tt1] = tt1[key] + // } + // } }).catch((error)=>{ + // const tt1 = JSON.parse(sessionStorage.getItem('tt1')) + // console.log('2-tt1') + // console.log(tt1) + // if(tt1) { + // for(const key in tt1) { + // this.form[key] = tt1[key] + // } + // } + // if(sessionStorage.getItem('tt1')) { + // this.form = {...sessionStorage.getItem('tt1')} + // } }) - console.log(this.form.idNumber) }, ...mapMutations({ @@ -298,6 +322,7 @@ export default { this.$message.warning('请刷身份证'); this.setPopId('33') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, //提交个人用户信息 @@ -306,6 +331,7 @@ export default { let consumerClientDragList = JSON.parse(nomClientIdentity); let nomClientIdentitys = JSON.parse(nomClientIdentity); this.$refs.form.validate(myValidate(() => { + // console.log(this.form.birthday) this.form.birthday = this.form.birthday.slice(0, 10) this.visible = true; // if (nomClientIdentitys && nomClientIdentitys.length > 0){ diff --git a/src/pages/manage/list/client/corporateClient.vue b/src/pages/manage/list/client/corporateClient.vue index 67bd87a..8435c73 100644 --- a/src/pages/manage/list/client/corporateClient.vue +++ b/src/pages/manage/list/client/corporateClient.vue @@ -12,15 +12,18 @@ - + - + -
+

请刷身份证

+
+ +
@@ -31,7 +34,7 @@ - + @@ -47,40 +50,7 @@ 提交
- - + @@ -90,27 +60,30 @@ import { mapState, mapMutations, mapGetters } from 'vuex' import { mobPattern, namePattern, ratePattern, vercustomer } from '@/utils/verify.js' import { addOperation, getOperation } from '@/api/http'; -import { phoneListen, checkRequired, myValidate, checkHanzi, checkName } from '@/utils/utilFunction.js' +import { phoneListen, checkRequired, myValidate, checkHanzi, checkName, ismoney } from '@/utils/utilFunction.js' import MyTitle from '@/components/myTitle' import NeedBefore from '@/components/needBefore' +import MyDialog from '@/components/dialog' const moduleName = 'corporateClient' export default { name: 'index', components: { MyTitle, - NeedBefore + NeedBefore, + MyDialog }, data() { return { unNeed: false, isNeedBefore: '', needBefore: '', - + idNumberJudge: false, visible:false,// 表单 authorization:false,// 切授权 success:false,// 切成功 form:{ + idNumber: '', name: '', phone: '', documentType: '', @@ -120,7 +93,25 @@ export default { companyAddress: '', certificateType: '' }, + formName:{ + idNumber: '法人证件号码', + name: '法人姓名', + phone: '联系电话', + documentType: '证件类型', + companyName: '公司名称', + registeredCapital: '注册资本', + codeNumber: '代码证号', + companyAddress: '公司地址', + certificateType: '法人证件类型' + }, rules: { + idNumber: [ + { + required: true, + message: '请输入公司名称', + trigger: 'blur' + } + ], companyName: [ { required: true, @@ -158,7 +149,16 @@ export default { // firmClientIdentity if(this.inMyWork(moduleName)) { if(this.needsModule(moduleName) === '') { - + if(sessionStorage.getItem('firmClientIdentity')) { + this.idNumberJudge = true + const { idNumber, userName } = this.dataFlow + this.form.idNumber = idNumber + this.form.name = userName + } + this.getFormData() + }else { + this.isNeedBefore = true + this.needBefore = this.needsModule(moduleName) } }else { this.isNeedBefore = true @@ -178,82 +178,105 @@ export default { var list = data.data.judgmentRuleReqs for (var i = 0; i < list.length; i++) { if (list[i].answerId == '48') {this.form.documentType = list[i].emptyTwo} //证件类型 - if (list[i].answerId == '49') {this.form.codeNumber = list[i].emptyTwo} //代码证号 - if (list[i].answerId == '50') {this.form.companyName = list[i].emptyTwo} //公司名称 - if (list[i].answerId == '51') {this.form.companyAddress = list[i].emptyTwo} //公司地址 - if (list[i].answerId == '52') {this.form.registeredCapital = list[i].emptyTwo} //注册资本 - if (list[i].answerId == '53') {this.form.certificateType = list[i].emptyTwo} //法人证件类型 - if (list[i].answerId == '54') {sessionStorage.setItem('firmClientIdentity', list[i].emptyTwo)} //法人证件号码 - if (list[i].answerId == '55') {this.form.name = list[i].emptyTwo} //法人姓名 - if (list[i].answerId == '56') {this.form.phone = list[i].emptyTwo} //联系电话 + else if (list[i].answerId == '49') {this.form.codeNumber = list[i].emptyTwo} //代码证号 + else if (list[i].answerId == '50') {this.form.companyName = list[i].emptyTwo} //公司名称 + else if (list[i].answerId == '51') {this.form.companyAddress = list[i].emptyTwo} //公司地址 + else if (list[i].answerId == '52') {this.form.registeredCapital = list[i].emptyTwo} //注册资本 + else if (list[i].answerId == '53') {this.form.certificateType = list[i].emptyTwo} //法人证件类型 + // else if (list[i].answerId == '54') {sessionStorage.setItem('firmClientIdentity', list[i].emptyTwo)} //法人证件号码 + else if (list[i].answerId == '54') { + console.log('54id') + console.log(list[i].emptyTwo) + this.idNumberJudge = true + this.form.idNumber = list[i].emptyTwo + } + else if (list[i].answerId == '55') {this.form.name = list[i].emptyTwo} //法人姓名 + else if (list[i].answerId == '56') {this.form.phone = list[i].emptyTwo} //联系电话 } } }).catch((error)=>{ }) }, ...mapMutations({ - changeShowGoods: 'system/changeShowGoods' + changeShowGoods: 'system/changeShowGoods', + setDataFlow: 'system/setDataFlow', + setNeedsModule: 'system/setNeedsModule', + setPopId: 'system/setPopId' }), popUp(){// 唤起弹窗 - this.$store.commit('system/changePop',{show:true,text:'身份证扫描仪',id:'34'}) + // this.$store.commit('system/changePop',{show:true,text:'身份证扫描仪',id:'34'}) + + this.$message.warning('请刷身份证'); + this.setPopId('34') + sessionStorage.setItem('computerPath', this.$route.fullPath) + this.$router.push('/counter/list/') }, popSure(){ }, submitForm() { - let projectId = sessionStorage.getItem('projectId') - let startTime = sessionStorage.getItem('startTime') + this.$refs.form.validate(myValidate(() => { // 验证通过逻辑写在这 this.visible = true; - let formList = []; - let firmClientIdentity = sessionStorage.getItem('firmClientIdentity') - let firmClientIdentitys = JSON.parse(firmClientIdentity); - if (firmClientIdentitys && firmClientIdentitys.length > 0){ - for (var i=0;i{ - // this.$message({ - // message: '提交成功', - // type: 'success' - // }); - }).catch((error)=>{ - }) - }else { - this.$message.error('有必填项未填哦~'); - } }, this.$refs)); }, + submitForm2() { + let projectId = sessionStorage.getItem('projectId') + let startTime = sessionStorage.getItem('startTime') + let formList = []; + let firmClientIdentity = sessionStorage.getItem('firmClientIdentity') + let firmClientIdentitys = JSON.parse(firmClientIdentity); + if (firmClientIdentitys && firmClientIdentitys.length > 0){ + // for (var i=0;i{ + // this.$message({ + // message: '提交成功', + // type: 'success' + // }); + + // this.setDataFlow({ ...this.form }) + this.setNeedsModule(moduleName) + this.setDataFlow({ userName: this.form.name }) + }).catch((error)=>{ + }) + }else { + this.$message.error('有必填项未填哦~'); + } + }, phoneListen: phoneListen, checkHanzi: checkHanzi, - checkName: checkName + checkName: checkName, + ismoney: ismoney }, computed: { ...mapGetters({ diff --git a/src/pages/manage/list/personal/callDeposits/accountClosed.vue b/src/pages/manage/list/personal/callDeposits/accountClosed.vue index 3dbd93c..d35fc4a 100644 --- a/src/pages/manage/list/personal/callDeposits/accountClosed.vue +++ b/src/pages/manage/list/personal/callDeposits/accountClosed.vue @@ -204,16 +204,10 @@ export default{ ] }, myTable: { - // clientName: '', // 客户姓名 - // currencyMark: '钞户', // 钞汇标识 - // depositNumber: '', // 定存编号 - // capital: '', // 本金 - // interestRate: '', // 利率 - // depositDate: '', // 存期 - // interest: '', // 利息 - // totalMoney: '', // 总金额 - // certificateType: '', //证件类型 - // breathDate: '', // 起息日期 + 302: { + prop: 'voucherNumber', + prop: '3' + }, 303: { prop: 'voucherType', type: '1', @@ -280,6 +274,14 @@ export default{ prop: 'certificateType',// type: '1', "subjectId": 19, + }, + 392: { + prop: 'idNumber', + type: '3' + }, + 394: { + prop: 'drawPassword', + type: '3' } }, myTable2: { @@ -375,6 +377,7 @@ export default{ this.$message.warning('请刷银行卡'); this.setPopId('302') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, popUp2(text) { @@ -382,6 +385,7 @@ export default{ this.$message.warning('请刷身份证'); this.setPopId('392') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, popUp3(text) { @@ -389,6 +393,7 @@ export default{ this.$message.warning('请在密码器输入密码'); this.setPopId('394') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, submitForm() { diff --git a/src/pages/manage/list/personal/callDeposits/callDeposits.vue b/src/pages/manage/list/personal/callDeposits/callDeposits.vue index b88c30c..624dacf 100644 --- a/src/pages/manage/list/personal/callDeposits/callDeposits.vue +++ b/src/pages/manage/list/personal/callDeposits/callDeposits.vue @@ -53,6 +53,7 @@ export default { data() { return { text:'',/* 顶部文字 */ + cacheVal: '', textObj:{ '1':'开户', '2':'支取销户', @@ -68,15 +69,21 @@ export default { } }, created() { - this.handleSelect('1') + if(sessionStorage.getItem('callDepositsIndex')) { + this.handleSelect(sessionStorage.getItem('callDepositsIndex')) + }else { + this.handleSelect('1') + } }, methods: { handleSelect(val){ this.text = this.textObj[val] this.activeIndex = val + this.cacheVal = val }, - - + }, + destroyed() { + sessionStorage.setItem('callDepositsIndex', this.cacheVal) } }; diff --git a/src/pages/manage/list/personal/callDeposits/openAccount.vue b/src/pages/manage/list/personal/callDeposits/openAccount.vue index 2ca4a03..fc0fa10 100644 --- a/src/pages/manage/list/personal/callDeposits/openAccount.vue +++ b/src/pages/manage/list/personal/callDeposits/openAccount.vue @@ -192,6 +192,14 @@ export default{ }, myTable2: { + 291: { + prop: 'idNumber',// 身份证号码 + type: '3', + }, + 297: { + prop: 'voucherNumber', // 银行卡号 + type: '3' + }, 293: { prop: 'customerName',//客户姓名 type: '3', @@ -227,6 +235,10 @@ export default{ type: '1', "subjectId": 48, }, + 301: { + prop: 'drawPassword', + type: '3' + }, // : { // prop: 'noticeType',//通知类型 后台没有这个 // type: '1' @@ -310,16 +322,19 @@ export default{ popUp(text) { this.$message.warning('请刷身份证'); this.setPopId('291') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, popUp2(text) { this.$message.warning('请刷银行卡'); this.setPopId('297') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, popUp3(text) { this.$message.warning('请在密码器输入密码'); this.setPopId('301') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, submitForm() { diff --git a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue index c8248db..68aea15 100644 --- a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue +++ b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue @@ -202,6 +202,7 @@ export default{ this.$message.warning('请刷银行卡'); this.setPopId('67,1') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, popUp2(text) { @@ -209,6 +210,7 @@ export default{ this.$message.warning('请刷身份证'); this.setPopId('67,2') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, popUp3(text) { @@ -216,6 +218,7 @@ export default{ this.$message.warning('请在密码器输入密码'); this.setPopId('117') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, checkHanzi: checkHanzi, diff --git a/src/pages/manage/list/personal/currentAccount/deposit.vue b/src/pages/manage/list/personal/currentAccount/deposit.vue index 05b8c32..db6f7ca 100644 --- a/src/pages/manage/list/personal/currentAccount/deposit.vue +++ b/src/pages/manage/list/personal/currentAccount/deposit.vue @@ -216,6 +216,7 @@ export default{ this.$message.warning('请刷银行卡'); this.setPopId('63') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, ismoney: ismoney, diff --git a/src/pages/manage/list/personal/currentAccount/index.vue b/src/pages/manage/list/personal/currentAccount/index.vue index 9a6005c..5a9fb7e 100644 --- a/src/pages/manage/list/personal/currentAccount/index.vue +++ b/src/pages/manage/list/personal/currentAccount/index.vue @@ -82,6 +82,7 @@ export default { text:'',/* 顶部文字 */ // 存款完才能取款,否则会提示 depositFinish: false, + cacheVal: '', textObj:{ '1':'开户', '2':'存款', @@ -105,16 +106,20 @@ export default { } }, created() { - this.handleSelect('1') + if(sessionStorage.getItem('currentAccountIndex')) { + this.handleSelect(sessionStorage.getItem('currentAccountIndex')) + }else { + this.handleSelect('1') + } }, destroyed() { - // sessionStorage.setItem('currentAccountIndex', ) + sessionStorage.setItem('currentAccountIndex', this.cacheVal) }, methods: { handleSelect(val){ - console.log(typeof(val),this.activeIndex,'xuanze'); this.text = this.textObj[val] this.activeIndex = val + this.cacheVal = val }, setDepositFinish() { this.depositFinish = true; diff --git a/src/pages/manage/list/personal/currentAccount/openAccount.vue b/src/pages/manage/list/personal/currentAccount/openAccount.vue index 374ef65..5866df6 100644 --- a/src/pages/manage/list/personal/currentAccount/openAccount.vue +++ b/src/pages/manage/list/personal/currentAccount/openAccount.vue @@ -710,6 +710,7 @@ export default { this.$message.warning('请刷银行卡'); this.setPopId('62,1') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, popUps(){ @@ -718,6 +719,7 @@ export default { this.$message.warning('请在密码器输入密码'); this.setPopId('62,1') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, popUpTwo(){ @@ -726,6 +728,7 @@ export default { this.$message.warning('请刷银行卡'); this.setPopId('62,2') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, popUpsTwo(){ @@ -734,6 +737,7 @@ export default { this.$message.warning('请在密码器输入密码'); this.setPopId('62,2') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, popUpThree(){ @@ -742,6 +746,7 @@ export default { this.$message.warning('请刷银行卡'); this.setPopId('62,3') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, popUpsThree(){ @@ -750,6 +755,7 @@ export default { this.$message.warning('请在密码器输入密码'); this.setPopId('62,3') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, checkName: checkName, diff --git a/src/pages/manage/list/personal/currentAccount/settle.vue b/src/pages/manage/list/personal/currentAccount/settle.vue index d7a09da..e96a8a3 100644 --- a/src/pages/manage/list/personal/currentAccount/settle.vue +++ b/src/pages/manage/list/personal/currentAccount/settle.vue @@ -260,11 +260,13 @@ export default{ this.$message.warning('请刷银行卡'); this.setPopId('66') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, popUp2(text) { this.$message.warning('请在密码器输入密码'); this.setPopId('66,2') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, ismoney: ismoney, diff --git a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue index 7ef3db1..a202cf1 100644 --- a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue +++ b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue @@ -269,6 +269,7 @@ export default{ this.$message.warning('请刷银行卡'); this.setPopId('65') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, popUp2(text) { @@ -276,6 +277,7 @@ export default{ this.$message.warning('请在密码器输入密码'); this.setPopId('99') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, ismoney: ismoney, diff --git a/src/pages/manage/list/personal/currentAccount/withdrawal.vue b/src/pages/manage/list/personal/currentAccount/withdrawal.vue index fd97363..c5ea45d 100644 --- a/src/pages/manage/list/personal/currentAccount/withdrawal.vue +++ b/src/pages/manage/list/personal/currentAccount/withdrawal.vue @@ -256,11 +256,13 @@ export default{ popUp(text) { this.$message.warning('请刷银行卡'); this.setPopId('64') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, popUp2(text) { this.$message.warning('请输入密码'); this.setPopId('64,2') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, ismoney: ismoney, diff --git a/src/pages/manage/list/personal/timeDeposit/deposit.vue b/src/pages/manage/list/personal/timeDeposit/deposit.vue index eae174e..4bd4b1b 100644 --- a/src/pages/manage/list/personal/timeDeposit/deposit.vue +++ b/src/pages/manage/list/personal/timeDeposit/deposit.vue @@ -337,6 +337,7 @@ export default{ this.$message.warning('请刷银行卡'); this.setPopId('131') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, popUp2(text) { @@ -344,6 +345,7 @@ export default{ this.$message.warning('请在密码器输入密码'); this.setPopId('140') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, submitForm() { diff --git a/src/pages/manage/list/personal/timeDeposit/openAccount.vue b/src/pages/manage/list/personal/timeDeposit/openAccount.vue index 39d86bd..e7762ee 100644 --- a/src/pages/manage/list/personal/timeDeposit/openAccount.vue +++ b/src/pages/manage/list/personal/timeDeposit/openAccount.vue @@ -293,6 +293,7 @@ export default{ this.$message.warning('请刷身份证'); this.setPopId('118,1') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, popUp2(text) { // 刷卡器 @@ -300,6 +301,7 @@ export default{ this.$message.warning('请刷银行卡'); this.setPopId('118,2') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, popUp3(text) { // 密码器 @@ -307,6 +309,7 @@ export default{ this.$message.warning('请在密码器输入密码'); this.setPopId('129') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, submitForm() { diff --git a/src/pages/manage/list/personal/timeDeposit/timeDeposit.vue b/src/pages/manage/list/personal/timeDeposit/timeDeposit.vue index b454299..a48cfce 100644 --- a/src/pages/manage/list/personal/timeDeposit/timeDeposit.vue +++ b/src/pages/manage/list/personal/timeDeposit/timeDeposit.vue @@ -65,6 +65,7 @@ export default { data() { return { text:'',/* 顶部文字 */ + cacheVal: '', textObj:{ '1':'开户', '2':'存款', @@ -82,17 +83,21 @@ export default { } }, created() { - this.handleSelect('1') + if(sessionStorage.getItem('timeDepositIndex')) { + this.handleSelect(sessionStorage.getItem('timeDepositIndex')) + }else { + this.handleSelect('1') + } }, methods: { handleSelect(val){ - console.log(typeof(val),this.activeIndex,'xuanze'); - this.text = this.textObj[val] this.activeIndex = val + this.cacheVal = val }, - - + }, + destroyed() { + sessionStorage.setItem('timeDepositIndex', this.cacheVal) } }; diff --git a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue index 092fe04..a5d9d47 100644 --- a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue +++ b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue @@ -272,6 +272,7 @@ export default{ this.$message.warning('请刷银行卡'); this.setPopId('144,1') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, popUp2(text) { @@ -279,6 +280,7 @@ export default{ this.$message.warning('请在密码器输入密码'); this.setPopId('154') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, submitIt() { diff --git a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue index aea1a67..7c11b0a 100644 --- a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue +++ b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue @@ -325,6 +325,7 @@ export default{ this.$message.warning('请刷银行卡'); this.setPopId('181') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, popUp2(text) { @@ -332,6 +333,7 @@ export default{ this.$message.warning('请在密码器输入密码'); this.setPopId('192') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, popUp3(text) { @@ -339,6 +341,7 @@ export default{ this.$message.warning('请刷身份证'); this.setPopId('180') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, submitForm() { diff --git a/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue b/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue index 39e960d..641b6ff 100644 --- a/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue +++ b/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue @@ -225,6 +225,7 @@ export default{ // this.$store.commit('system/changePop',{show:true,text, id: '171'}) this.$message.warning('请刷银行卡'); this.setPopId('171') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, popUp2(text) { @@ -232,6 +233,7 @@ export default{ this.$message.warning('请在密码器输入密码'); this.setPopId('178') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, submitForm() { diff --git a/src/pages/manage/list/personal/usefulPhrases/openAccount.vue b/src/pages/manage/list/personal/usefulPhrases/openAccount.vue index 7e2b3f2..5b05a31 100644 --- a/src/pages/manage/list/personal/usefulPhrases/openAccount.vue +++ b/src/pages/manage/list/personal/usefulPhrases/openAccount.vue @@ -306,16 +306,19 @@ export default{ popUp1(text) { this.$message.warning('请刷身份证'); this.setPopId('1399') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, popUp2(text) { this.$message.warning('请刷银行卡'); this.setPopId('166') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, popUp3(text) { this.$message.warning('请在密码器输入密码'); this.setPopId('167') + sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') }, getFormData(){ diff --git a/src/pages/manage/list/personal/usefulPhrases/usefulPhrases.vue b/src/pages/manage/list/personal/usefulPhrases/usefulPhrases.vue index 58e96e1..3ecdc6a 100644 --- a/src/pages/manage/list/personal/usefulPhrases/usefulPhrases.vue +++ b/src/pages/manage/list/personal/usefulPhrases/usefulPhrases.vue @@ -64,6 +64,7 @@ export default { data() { return { text:'',/* 顶部文字 */ + cacheVal: '', textObj:{ '1':'开户', '2':'续存', @@ -81,15 +82,21 @@ export default { } }, created() { - this.handleSelect('1') + if(sessionStorage.getItem('usefulPhrasesIndex')) { + this.handleSelect(sessionStorage.getItem('usefulPhrasesIndex')) + }else { + this.handleSelect('1') + } }, methods: { handleSelect(val){ this.text = this.textObj[val] this.activeIndex = val + this.cacheVal = val }, - - + }, + destroyed() { + sessionStorage.setItem('usefulPhrasesIndex', this.cacheVal) } }; diff --git a/src/pages/manage/list/servicesAccount/passwordChange.vue b/src/pages/manage/list/servicesAccount/passwordChange.vue index f5403e5..7e59817 100644 --- a/src/pages/manage/list/servicesAccount/passwordChange.vue +++ b/src/pages/manage/list/servicesAccount/passwordChange.vue @@ -1,5 +1,5 @@ diff --git a/src/pages/manage/list/servicesAccount/passwordLost.vue b/src/pages/manage/list/servicesAccount/passwordLost.vue index 63f4663..10e9fac 100644 --- a/src/pages/manage/list/servicesAccount/passwordLost.vue +++ b/src/pages/manage/list/servicesAccount/passwordLost.vue @@ -1,14 +1,16 @@ diff --git a/src/store/modules/system.js b/src/store/modules/system.js index fc543ce..2ab452c 100644 --- a/src/store/modules/system.js +++ b/src/store/modules/system.js @@ -7,7 +7,7 @@ const allGoods = { 439: {name:'预留印鉴卡',src:require('@/assets/img/seal/paid.png'),id:439}, 412: {name:'转账支票',src:require('@/assets/img/goods/xd-zzzp.png'),id:412}, 30: {name:'银行承兑汇票',src:require('@/assets/img/seal/paid.png'),id:30}, - 411: {name:411,src:require('@/assets/img/goods/xjzp.png'),id:411}, + 411: {name:'现金支票',src:require('@/assets/img/goods/xjzp.png'),id:'现金支票'}, 425: {name:'取款凭条',src:require('@/assets/img/goods/qkpt.png'),id:425}, 426: {name:'转账凭条',src:require('@/assets/img/goods/zzpt.png'),id:426}, 479: {name:'业务收费凭证',src:require('@/assets/img/goods/ywsfpz.png'),id:479}, @@ -1144,9 +1144,19 @@ export default { importanceArr: [], // 重要空白凭证箱 commonArr: [], // 普通凭证箱 + + needsModule: { + 'corporateClient': false, + 'business/openAccount': false + }, + dataFlow: { + idNumber, + userName, + peopleNumber + } }, '项目十二': { - id: '', + id: 500, data: [ 442, 431, 409, 15 ], // 15是现金 needs: [ 438, 439 ], // 多了普通空白凭证, 预留印鉴卡 isStamp: { @@ -1165,9 +1175,18 @@ export default { importanceArr: [], // 重要空白凭证箱 commonArr: [], // 普通凭证箱 + + needsModule: { + 'business/deposit': false + }, + dataFlow: { + idNumber, + userName, + peopleNumber + } }, '项目十三': { - id: '', + id: 501, data: [ 442, 411 ], needs: [ 425, 15 ], isStamp: { @@ -1186,9 +1205,21 @@ export default { importanceArr: [], // 重要空白凭证箱 commonArr: [], // 普通凭证箱 + + needsModule: { + 'business/withdrawal': false, + 'business/transfer': false + }, + dataFlow: { + // idNumber, + // userName, + // peopleNumber, + // currency:'CNY人民币', + // goldLogo:'钞户', + } }, '项目十四': { - id: '', + id: 502, data: [ 442, 412 ], needs: [ 426 ], isStamp: { @@ -1207,9 +1238,17 @@ export default { importanceArr: [], // 重要空白凭证箱 commonArr: [], // 普通凭证箱 + + needsModule: { + 'servicesAccount/passwordChange': false + }, + dataFlow: { + idNumber, + voucherNumber + } }, '项目十五': { - id: '', + id: 503, data: [ 13, 23, 16, 407 ], // 身份证原件、复印件、银行卡、特殊业务申请书 needs: [ ], isStamp: { @@ -1228,9 +1267,18 @@ export default { importanceArr: [], // 重要空白凭证箱 commonArr: [], // 普通凭证箱 + + needsModule: { + 'servicesAccount/passwordLost': false + }, + dataFlow: { + idNumber, + voucherNumber, + userName + } }, '项目十六': { - id: '', + id: 504, data: [ 13, 23, 16, 406 ], // 身份证原件、复印件、银行卡、密码挂失申请书 needs: [ ], isStamp: { @@ -1251,7 +1299,7 @@ export default { commonArr: [], // 普通凭证箱 }, '项目十七': { - id: '', + id: 505, data: [ 13, 23, 16, 468, 467 ], // 身份证原件、复印件、银行卡、密码挂失申请书回单、密码挂失申请书银行留存联 needs: [ ], isStamp: { @@ -1269,11 +1317,15 @@ export default { resource: [], // 资料 importanceArr: [], // 重要空白凭证箱 - commonArr: [], // 普通凭证箱 + commonArr: [], // 普通凭证箱, + + needsModule: { + 'controlCash/cashRecipients': false + }, }, '项目十八': { - id: '', + id: '506', data: [ 13, 23, 15, 413 ], // 身份证原件、复印件、现金、支票领购单 needs: [ 411, 479 ], isStamp: { @@ -1293,9 +1345,13 @@ export default { importanceArr: [], // 重要空白凭证箱 commonArr: [], // 普通凭证箱 + + needsModule: { + 'controlCash/cashTransferInto': false + }, }, '项目十九': { - id: '', + id: 507, data: [ ], // needs: [ 438 ], isStamp: { @@ -1314,9 +1370,13 @@ export default { importanceArr: [], // 重要空白凭证箱 commonArr: [], // 普通凭证箱 + + needsModule: { + 'controlCash/cashPaid': false + }, }, '项目二十': { - id: '', + id: 508, data: [ ], // needs: [ 438 ], isStamp: { @@ -1335,9 +1395,13 @@ export default { importanceArr: [], // 重要空白凭证箱 commonArr: [], // 普通凭证箱 + + needsModule: { + 'controlCash/cashOut': false + }, }, '项目二十一': { - id: '', + id: 509, data: [ ], // needs: [ 438 ], isStamp: { @@ -1358,7 +1422,7 @@ export default { commonArr: [], // 普通凭证箱 }, '项目二十二': { - id: '', + id: 510, data: [ ], // needs: [ 438 ], isStamp: {