diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index ef735e9..e24c14c 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -76,15 +76,10 @@
                 <img v-lazy="this.lazyImg[29]" alt=""  />
             </div>
             <img class="sth employee" v-lazy="lazyImg[21]" @click="setShowBusiness(true)" alt="" />
-<<<<<<< HEAD
         </el-tooltip> -->
 
         <img class="sth employee" v-lazy="lazyImg[21]" alt="" />
 
-=======
-        </el-tooltip>
-<!--        点击打开资料-->
->>>>>>> 8498f8e3a48d5889580b43697701a1ef33281d85
         <el-tooltip placement="top" popper-class="sth-popper" offset="-50">
             <div slot="content">
                 <img v-lazy="lazyImg[22]" alt="" />
@@ -673,7 +668,7 @@ export default {
                         this.passwordForm.password = accountPassword
                         this.passwordForm.passwordAgain = accountPassword
                     }
-                }else if(this.$store.state.system.id == '64'){
+                }else if(this.$store.state.system.id == '64,2'){
                     let nomCurrentWithdrawalPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword');
                     if(nomCurrentWithdrawalPassword){
                         this.passwordForm.password = nomCurrentWithdrawalPassword
@@ -685,7 +680,7 @@ export default {
                         this.passwordForm.password = nomCurrentTransferPassword
                         this.passwordForm.passwordAgain = nomCurrentTransferPassword
                     }
-                }else if(this.$store.state.system.id == '66'){
+                }else if(this.$store.state.system.id == '66,2'){
                     let nomCurrentSettlePassword = sessionStorage.getItem('nomCurrentSettlePassword');
                     if(nomCurrentSettlePassword){
                         this.passwordForm.password = nomCurrentSettlePassword
@@ -699,6 +694,7 @@ export default {
                         this.passwordForm.passwordAgain = nomCurrentSettlePassword
                     }
                 }else{
+
                     let accountPasswordAll = sessionStorage.getItem('accountPasswordAll');
                     if(accountPasswordAll){
                         this.passwordForm.password = accountPasswordAll
@@ -1332,163 +1328,157 @@ export default {
             if(this.popText.includes('密码器') && this.nbm !== 8 && this.passwordForm.passwordAgain) {
                 this.callChangePassword()
             }
-            
-            console.log('mxx')
-            console.log(this.id)
-            console.log(this.$store.state.system.id)
-            if (this.$store.state.system.id == '33'){
-                this.nbm = 33
-                // this.goodsShelfTotalData = this.auditGoodsShelf
-                if (this.receptionList.length >0){
-                    sessionStorage.setItem('nomClientIdentity', JSON.stringify(this.receptionList))
-                }
-                console.log(sessionStorage.getItem('nomClientIdentity'))
-            }else if (this.$store.state.system.id == '34'){
-                this.nbm = 34
-                // this.goodsShelfTotalData = this.auditGoodsShelf
-                if (this.receptionList.length >0){
-                    sessionStorage.setItem('firmClientIdentity', JSON.stringify(this.receptionList))
-                }
-            }else if (this.$store.state.system.id == '63'){
-                this.nbm = 63
-                // this.goodsShelfTotalData = this.auditGoodsShelf
-                if (this.receptionList.length >0){
-                    sessionStorage.setItem('nomBusinessDepositCard', JSON.stringify(this.receptionList))
-                }
-            }else if (this.$store.state.system.id == '64'){
-            this.nbm = 64
-            // this.goodsShelfTotalData = this.auditGoodsShelf
-            if (this.receptionList.length >0){
-                sessionStorage.setItem('nomCurrentWithdrawalCard', JSON.stringify(this.receptionList))
-            }
-            if (this.passwordForm.passwordAgain){
-                let accountPassword = '';
-                accountPassword = this.passwordForm.passwordAgain
-                sessionStorage.setItem('nomCurrentWithdrawalPassword', accountPassword)
-            }
-            }else if (this.$store.state.system.id == '65'){
-                this.nbm = 65
-                // this.goodsShelfTotalData = this.auditGoodsShelf
-                if (this.receptionList.length >0){
-                    sessionStorage.setItem('nomCurrentTransferCard', JSON.stringify(this.receptionList))
-                }
-                if (this.passwordForm.passwordAgain){
-                    let accountPassword = '';
-                    accountPassword = this.passwordForm.passwordAgain
-                    sessionStorage.setItem('nomCurrentTransferPassword', accountPassword)
-                }
-            }else if (this.$store.state.system.id == '66'){
-                this.nbm = 66
-                // this.goodsShelfTotalData = this.auditGoodsShelf
-                if (this.receptionList.length >0){
-                    sessionStorage.setItem('nomCurrentSettleCard', JSON.stringify(this.receptionList))
-                }
-                if (this.passwordForm.passwordAgain){
-                    let accountPassword = '';
-                    accountPassword = this.passwordForm.passwordAgain
-                    sessionStorage.setItem('nomCurrentSettlePassword', accountPassword)
-                }
-            }else if (this.$store.state.system.id == '67,1'){
-                this.nbm = 67
-                // this.goodsShelfTotalData = this.auditGoodsShelf
-                if (this.receptionList.length >0){
-                    sessionStorage.setItem('nomCurrentCancellCard1', JSON.stringify(this.receptionList))
-                }
-            }else if (this.$store.state.system.id == '67,2'){
-                this.nbm = 67
-                // this.goodsShelfTotalData = this.auditGoodsShelf
-                if (this.receptionList.length >0){
-                    sessionStorage.setItem('nomCurrentCancellCard2', JSON.stringify(this.receptionList))
-                }
-                
-            }else if (this.$store.state.system.id == '33'){
-                        this.nbm = 33
-                        // this.goodsShelfTotalData = this.auditGoodsShelf
-                        if (this.receptionList.length >0){
-                            sessionStorage.setItem('nomClientIdentity', JSON.stringify(this.receptionList))
-                        }
-            }else if (this.$store.state.system.id == '34'){
-                this.nbm = 34
-                // this.goodsShelfTotalData = this.auditGoodsShelf
-                if (this.receptionList.length >0){
-                    sessionStorage.setItem('firmClientIdentity', JSON.stringify(this.receptionList))
-                }
-            }else if (this.$store.state.system.id == '63'){
-                this.nbm = 63
-                // this.goodsShelfTotalData = this.auditGoodsShelf
-                if (this.receptionList.length >0){
-                    sessionStorage.setItem('nomBusinessDepositCard', JSON.stringify(this.receptionList))
-                }
-            }else if (this.$store.state.system.id == '64'){
-            this.nbm = 64
-            // this.goodsShelfTotalData = this.auditGoodsShelf
-            if (this.receptionList.length >0){
-                sessionStorage.setItem('nomCurrentWithdrawalCard', JSON.stringify(this.receptionList))
-            }
-            if (this.passwordForm.passwordAgain){
-                let accountPassword = '';
-                accountPassword = this.passwordForm.passwordAgain
-                sessionStorage.setItem('nomCurrentWithdrawalPassword', accountPassword)
-            }
-            }else if (myConfig[this.$store.state.system.id]){ // myConfig[this.$store.state.system.id]
-                
-                const { nbm, name, isPassword } = myConfig[this.$store.state.system.id]
-                this.nbm = nbm
-                if(!isPassword) {
+
+            if(this.popText === '身份证扫描仪' || this.popText === '刷卡器' || this.popText === '密码器') {
+                if (this.$store.state.system.id == '33' && this.popText === '身份证扫描仪'){
+                    this.nbm = 33
                     // this.goodsShelfTotalData = this.auditGoodsShelf
                     if (this.receptionList.length >0){
-                        sessionStorage.setItem(name, JSON.stringify(this.receptionList))
+                        sessionStorage.setItem('nomClientIdentity', JSON.stringify(this.receptionList))
                     }
-                }else {
+                    console.log(sessionStorage.getItem('nomClientIdentity'))
+                }else if (this.$store.state.system.id == '34'){
+                    this.nbm = 34
+                    // this.goodsShelfTotalData = this.auditGoodsShelf
+                    if (this.receptionList.length >0){
+                        sessionStorage.setItem('firmClientIdentity', JSON.stringify(this.receptionList))
+                    }
+                }else if (this.$store.state.system.id == '63' && this.popText === '刷卡器'){
+                    this.nbm = 63
+                    // this.goodsShelfTotalData = this.auditGoodsShelf
+                    if (this.receptionList.length >0){
+                        sessionStorage.setItem('nomBusinessDepositCard', JSON.stringify(this.receptionList))
+                    }
+                }else if (this.$store.state.system.id == '64' && this.popText === '刷卡器'){
+                    this.nbm = 64
+                    if (this.receptionList.length >0){
+                        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 = '';
-                            accountPassword = this.passwordForm.passwordAgain
-                            sessionStorage.setItem(name, accountPassword)
-                        }
-                }
-                
-                
-            }else if (this.$store.state.system.id == '67,3'){
-                this.nbm = 67
-                if (this.passwordForm.passwordAgain){
-                    let accountPassword = '';
-                    accountPassword = this.passwordForm.passwordAgain
-                    sessionStorage.setItem('nomCurrentCancellPassword', accountPassword)
-                }
-            }else if (this.$store.state.system.id == '62,1'){
-            this.nbm = 62
-            // this.goodsShelfTotalData = this.auditGoodsShelf
-            if (this.receptionList.length >0){
-                sessionStorage.setItem('accountVoucher', JSON.stringify(this.receptionList))
-            }
-            if (this.passwordForm.passwordAgain){
-                let accountPassword = '';
-                accountPassword = this.passwordForm.passwordAgain
-                sessionStorage.setItem('accountPassword', accountPassword)
-            }
-            }else if (this.$store.state.system.id == '62,2'){
-                    this.nbm = 62
+                        let accountPassword = '';
+                        accountPassword = this.passwordForm.passwordAgain
+                        sessionStorage.setItem('nomCurrentWithdrawalPassword', accountPassword)
+                    }
+                }else if (this.$store.state.system.id == '65' && this.popText === '刷卡器'){
+                    this.nbm = 65
+                    // this.goodsShelfTotalData = this.auditGoodsShelf
+                    if (this.receptionList.length >0){
+                        sessionStorage.setItem('nomCurrentTransferCard', JSON.stringify(this.receptionList))
+                    }
+                    // if (this.passwordForm.passwordAgain){
+                    //     let accountPassword = '';
+                    //     accountPassword = this.passwordForm.passwordAgain
+                    //     sessionStorage.setItem('nomCurrentTransferPassword', accountPassword)
+                    // }
+                }else if (this.$store.state.system.id == '66' && this.popText === '刷卡器'){
+                    this.nbm = 66
                     // this.goodsShelfTotalData = this.auditGoodsShelf
-                    
                     if (this.receptionList.length >0){
-                        sessionStorage.setItem('accountVoucherTwo', JSON.stringify(this.receptionList))
+                        sessionStorage.setItem('nomCurrentSettleCard', JSON.stringify(this.receptionList))
                     }
+                    // if (this.passwordForm.passwordAgain){
+                    //     let accountPassword = '';
+                    //     accountPassword = this.passwordForm.passwordAgain
+                    //     sessionStorage.setItem('nomCurrentSettlePassword', accountPassword)
+                    // }
+                }else if (this.$store.state.system.id == '66,2' && this.popText === '密码器'){
+                    this.nbm = 66
                     if (this.passwordForm.passwordAgain){
-                        let accountPasswordTwo = ''
-                        accountPasswordTwo = this.passwordForm.passwordAgain
-                        sessionStorage.setItem('accountPasswordTwo', accountPasswordTwo)
+                        let accountPassword = '';
+                        accountPassword = this.passwordForm.passwordAgain
+                        sessionStorage.setItem('nomCurrentSettlePassword', accountPassword)
                     }
-            }else if (this.$store.state.system.id == '62,3'){
-                    this.nbm = 62
+                }else if (this.$store.state.system.id == '67,1' && this.popText === '刷卡器'){
+                    this.nbm = 67
+                    // this.goodsShelfTotalData = this.auditGoodsShelf
+                    if (this.receptionList.length >0){
+                        sessionStorage.setItem('nomCurrentCancellCard1', JSON.stringify(this.receptionList))
+                    }
+                }else if (this.$store.state.system.id == '67,2' && this.popText === '身份证扫描仪'){
+                    this.nbm = 67
+                    // this.goodsShelfTotalData = this.auditGoodsShelf
+                    if (this.receptionList.length >0){
+                        sessionStorage.setItem('nomCurrentCancellCard2', JSON.stringify(this.receptionList))
+                    }
+                    
+                }else if (this.$store.state.system.id == '33'){
+                            this.nbm = 33
+                            // this.goodsShelfTotalData = this.auditGoodsShelf
+                            if (this.receptionList.length >0){
+                                sessionStorage.setItem('nomClientIdentity', JSON.stringify(this.receptionList))
+                            }
+                }else if (this.$store.state.system.id == '34'){
+                    this.nbm = 34
                     // this.goodsShelfTotalData = this.auditGoodsShelf
                     if (this.receptionList.length >0){
-                        sessionStorage.setItem('accountVoucherThree', JSON.stringify(this.receptionList))
+                        sessionStorage.setItem('firmClientIdentity', JSON.stringify(this.receptionList))
+                    }
+                }else if (myConfig[this.$store.state.system.id]){ // myConfig[this.$store.state.system.id]
+                    
+                    const { nbm, name, isPassword, machine } = myConfig[this.$store.state.system.id]
+                    this.nbm = nbm
+                    if(!isPassword) {
+                        if (this.receptionList.length >0 && machine === this.popText){
+                            sessionStorage.setItem(name, JSON.stringify(this.receptionList))
+                        }
+                    }else {
+                        if (this.passwordForm.passwordAgain){
+                                let accountPassword = '';
+                                accountPassword = this.passwordForm.passwordAgain
+                                sessionStorage.setItem(name, accountPassword)
+                            }
                     }
+                    
+                    
+                }else if (this.$store.state.system.id == '67,3'){
+                    this.nbm = 67
                     if (this.passwordForm.passwordAgain){
-                        let accountPasswordThree = ''
-                        accountPasswordThree = this.passwordForm.passwordAgain
-                        sessionStorage.setItem('accountPasswordThree', accountPasswordThree)
+                        let accountPassword = '';
+                        accountPassword = this.passwordForm.passwordAgain
+                        sessionStorage.setItem('nomCurrentCancellPassword', accountPassword)
                     }
+                }else if (this.$store.state.system.id == '62,1' && this.popText === '刷卡器'){
+                this.nbm = 62
+                if (this.receptionList.length >0){
+                    sessionStorage.setItem('accountVoucher', JSON.stringify(this.receptionList))
+                }
+                }else if (this.$store.state.system.id == '62,1' && this.popText === '密码器'){
+                this.nbm = 62
+                if (this.passwordForm.passwordAgain){
+                    let accountPassword = '';
+                    accountPassword = this.passwordForm.passwordAgain
+                    sessionStorage.setItem('accountPassword', accountPassword)
+                }
+                }else if (this.$store.state.system.id == '62,2' && this.popText === '刷卡器'){
+                        this.nbm = 62
+                        // this.goodsShelfTotalData = this.auditGoodsShelf
+                        
+                        if (this.receptionList.length >0){
+                            sessionStorage.setItem('accountVoucherTwo', JSON.stringify(this.receptionList))
+                        }
+                }else if (this.$store.state.system.id == '62,2' && this.popText === '密码器'){
+                        this.nbm = 62
+                        if (this.passwordForm.passwordAgain){
+                            let accountPasswordTwo = ''
+                            accountPasswordTwo = this.passwordForm.passwordAgain
+                            sessionStorage.setItem('accountPasswordTwo', accountPasswordTwo)
+                        }
+                }else if (this.$store.state.system.id == '62,3' && this.popText === '刷卡器'){
+                        this.nbm = 62
+                        // this.goodsShelfTotalData = this.auditGoodsShelf
+                        if (this.receptionList.length >0){
+                            sessionStorage.setItem('accountVoucherThree', JSON.stringify(this.receptionList))
+                        }
+                }else if (this.$store.state.system.id == '62,3' && this.popText === '密码器'){
+                        this.nbm = 62
+                        if (this.passwordForm.passwordAgain){
+                            let accountPasswordThree = ''
+                            accountPasswordThree = this.passwordForm.passwordAgain
+                            sessionStorage.setItem('accountPasswordThree', accountPasswordThree)
+                        }
+                }
             }else {
                 let formList = []
                 // this.toggleGoods()
diff --git a/src/pages/counter/list/myConfig.js b/src/pages/counter/list/myConfig.js
index 7002b2f..4ac70ef 100644
--- a/src/pages/counter/list/myConfig.js
+++ b/src/pages/counter/list/myConfig.js
@@ -3,7 +3,7 @@ const myConfig = {
         nbm: 118,
         name: 'nomCurrentTransferPassword',
         parentId: '285,287,5,26,57,65',
-        isPassword: true
+        isPassword: true,
     },
     '117': {
         nbm: 118,
@@ -15,13 +15,15 @@ const myConfig = {
         nbm: 118,
         name: 'nomtimeOpenAccount1',
         parentId: '285,287,5,26,58,118',
-        isPassword: false
+        isPassword: false,
+        machine: '身份证扫描仪'
     },
     '118,2': {
         nbm: 118,
         name: 'nomtimeOpenAccount2',
         parentId: '285,287,5,26,58,118',
-        isPassword: false
+        isPassword: false,
+        machine: '刷卡器'
     },
     '129': {
         nbm: 129,
@@ -33,7 +35,8 @@ const myConfig = {
         nbm: 131,
         name: 'nomtimeDeposit1',
         parentId: '285,287,5,26,58,119',
-        isPassword: false
+        isPassword: false,
+        machine: '刷卡器'
     },
     '140': {
         nbm: 140,
@@ -49,9 +52,10 @@ const myConfig = {
     },
     '144,1': {
         nbm: 144,
-        name: 'nomtimeDepositWithdrawalPassword',
+        name: 'nomtimeDepositWithdrawal1',
         parentId: '285,287,5,26,58,120',
-        isPassword: true
+        isPassword: false,
+        machine: '刷卡器'
     },
     '156': {
         nbm: 156,
@@ -69,7 +73,8 @@ const myConfig = {
         nbm: 166,
         name: 'nomUsefulPhrasesOpenCard',
         parentId: '285,287,5,26,59,155',
-        isPassword: false
+        isPassword: false,
+        machine: '刷卡器'
     },
     '167': {
         nbm: 167,
@@ -81,7 +86,8 @@ const myConfig = {
         nbm: 171,
         name: 'nomUsefulPhrasesContinueCard',
         parentId: '285,287,5,26,59,156',
-        isPassword: false
+        isPassword: false,
+        machine: '刷卡器'
     },
     '178': {
         nbm: 178,
@@ -93,7 +99,8 @@ const myConfig = {
         nbm: 181,
         name: 'nomUsefulPhrasesClosed2',
         parentId: '285,287,5,26,59,157',
-        isPassword: false
+        isPassword: false,
+        machine: '刷卡器'
     },
     '192': {
         nbm: 192,
@@ -201,13 +208,15 @@ const myConfig = {
         nbm: 1399,
         name: 'nomUsefulPhrasesOpenCard2',
         parentId: '285,287,5,26,59,155',
-        isPassword: false
+        isPassword: false,
+        machine: '身份证扫描仪'
     },
     '180': {
         nbm: 180,
         name: 'nomUsefulPhrasesClosed',
         parentId: '285,287,5,26,59,157',
-        isPassword: false
+        isPassword: false,
+        machine: '身份证扫描仪'
     }
 }
 
diff --git a/src/pages/manage/list/client/consumerClient.vue b/src/pages/manage/list/client/consumerClient.vue
index 0d60e42..08b5160 100644
--- a/src/pages/manage/list/client/consumerClient.vue
+++ b/src/pages/manage/list/client/consumerClient.vue
@@ -294,8 +294,9 @@ export default {
         popUp(){// 唤起弹窗
             // this.$store.commit('system/changePop',{show:true,text:'身份证扫描仪',id:'33'})
             // this.changeShowGoods(true)
-            this.$message.info('请刷身份证');
             // this.$store.commit('system/changePop',{show: false, text: '', id:'33'})
+
+            this.$message.warning('请刷身份证');
             this.setPopId('33')
             this.$router.push('/counter/list/')
         },
diff --git a/src/pages/manage/list/client/corporateClient.vue b/src/pages/manage/list/client/corporateClient.vue
index b438b09..0510c80 100644
--- a/src/pages/manage/list/client/corporateClient.vue
+++ b/src/pages/manage/list/client/corporateClient.vue
@@ -155,21 +155,10 @@ export default {
         }
     },
     created() {
+        // firmClientIdentity
         if(this.inMyWork(moduleName)) {
             if(this.needsModule(moduleName) === '') {
-                if(this.inMyWork(moduleName)) {
-                if(this.needsModule(moduleName) === '') {
-            }else {
-                this.isNeedBefore = true
-                this.needBefore = this.needsModule(moduleName)
-            }
-        }else {
-            this.isNeedBefore = true
-            this.unNeed = true
-        }
-            }else {
-                this.isNeedBefore = true
-                this.needBefore = this.needsModule(moduleName)
+                
             }
         }else {
             this.isNeedBefore = true
diff --git a/src/pages/manage/list/personal/callDeposits/openAccount.vue b/src/pages/manage/list/personal/callDeposits/openAccount.vue
index 60e6f89..4d14911 100644
--- a/src/pages/manage/list/personal/callDeposits/openAccount.vue
+++ b/src/pages/manage/list/personal/callDeposits/openAccount.vue
@@ -1,6 +1,6 @@
 // 开户
 <template>
-    <div class="body">
+    <div class="body" v-if="!isNeedBefore">
         <el-row :gutter="20" style="margin: 0">
             <el-form ref="form" :model="form" label-width="120px" :rules="rules">
                 <el-col :span="10" :offset="1">
@@ -61,15 +61,20 @@
                         </div>
                     </el-form-item>
                 </el-col>
-               
             </el-form>
         </el-row>
         <el-button @click="submitForm" type="primary" class="submitBtn">提交</el-button>
+        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
     </div>
+    <need-before v-else :moduleName='needBefore' :unNeed="unNeed" />
 </template>
 <script>
 import { mobPattern, namePattern, ratePattern, vercustomer } from '@/utils/verify.js'
 import { myValidate, checkHanzi, checkName, ismoney, autoPlay2, autoPlay } from '@/utils/utilFunction.js';
+
+import { mapMutations, mapGetters } from 'vuex'
+import NeedBefore from '@/components/needBefore'
+import MyDialog from '@/components/dialog'
 export default{
     name:'',
     props:{},
@@ -207,17 +212,35 @@ export default{
             },
         }
     },
+    created() {
+        if(this.inMyWork(moduleName)) {
+            if(this.needsModule(moduleName) === '') {
+                // 291: 'nomCallDepositOpen2',
+                // 297: 'nomCallDepositOpen3',
+                // 301: 'nomCallDepositOpenPassword'
+                if(sessionStorage.getItem('nomCallDepositOpen2')) {
+
+                }
+
+                this.getFormData()
+            }else {
+                this.isNeedBefore = true
+                this.needBefore = this.needsModule(moduleName)
+            }
+        }else {
+            this.isNeedBefore = true
+            this.unNeed = true
+        }
+    },
     mounted() {
-        this.getFormData()
-        this.$refs.clientNumber.focus()
     },
     methods: {
         getFormData(){
             const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,38,288'
             const cards = {    
-                291: 'nomCallDepositOpen2',
-                297: 'nomCallDepositOpen3',
-                301: 'nomCallDepositOpenPassword'
+                // 291: 'nomCallDepositOpen2',
+                // 297: 'nomCallDepositOpen3',
+                // 301: 'nomCallDepositOpenPassword'
             }
             autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cards)
         },
@@ -234,25 +257,18 @@ export default{
             this.$refs.form.validate(myValidate(() => {
                 // 验证通过逻辑写在这
                 this.visible = true;
-                const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,38,288'
-                const nomCallDepositOpen2 = sessionStorage.getItem('nomCallDepositOpen2')
-                const nomCallDepositOpen3 = sessionStorage.getItem('nomCallDepositOpen3')
-                const nomCallDepositOpenPassword = sessionStorage.getItem('nomCallDepositOpenPassword')
-                const cards = [
-                    {
-                        291: nomCallDepositOpen2,
-                    },
-                    {
-                        297: nomCallDepositOpen3,
-                    },
-                    {
-                        301: nomCallDepositOpenPassword,
-                      "subjectId": 17,
-                    }
-                ]
-                autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
+                
             }, this.$refs));
         },
+        submitForm2() {
+            const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,38,288'
+            const nomCallDepositOpen2 = sessionStorage.getItem('nomCallDepositOpen2')
+            const nomCallDepositOpen3 = sessionStorage.getItem('nomCallDepositOpen3')
+            const nomCallDepositOpenPassword = sessionStorage.getItem('nomCallDepositOpenPassword')
+            const cards = [
+            ]
+            autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
+        },
         ismoney: ismoney,
         checkHanzi: checkHanzi,
         checkName: checkName
diff --git a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
index 4e49844..37dcbce 100644
--- a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
+++ b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
@@ -30,7 +30,7 @@
                             <p>请刷身份证</p>
                         </div>
                         <div v-else>
-                            <el-input v-model="form.idNumber" ref="idNumber"></el-input>
+                            <el-input v-model="form.idNumber" maxlength="20" disabled ref="idNumber"></el-input>
                         </div>
                     </el-form-item>
                 </el-col>
@@ -116,9 +116,20 @@ export default{
 
         if(this.inMyWork(moduleName)) {
             if(this.needsModule(moduleName) === '') {
+                console.log(sessionStorage.getItem('nomCurrentCancellCard1'))
                 const { voucherNumber, userName } = this.dataFlow
                 this.form.cardNumber = voucherNumber
                 this.form.userName = userName
+                if(sessionStorage.getItem('nomCurrentCancellCard2')) {
+                    this.idNumberJudge = true
+                    const { idNumber } = this.dataFlow
+                    this.form.idNumber = idNumber
+                }
+                if(sessionStorage.getItem('nomCurrentCancellPassword')) {
+                    this.form.drawPassword = sessionStorage.getItem('nomCurrentCancellPassword')
+                }
+
+
                 const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,57,67'
                 const cardArr = {
                     // 113: 'nomCurrentCancellCard1',
@@ -151,7 +162,8 @@ export default{
         ...mapMutations({
             changeShowGoods: 'system/changeShowGoods',
             setDataFlow: 'system/setDataFlow',
-            setNeedsModule: 'system/setNeedsModule'
+            setNeedsModule: 'system/setNeedsModule',
+            setPopId: 'system/setPopId'
         }),
       submitForm(){
         this.visible = true
@@ -186,14 +198,25 @@ export default{
         }, this.$refs));
       },
         popUp1(text) {
-            this.$store.commit('system/changePop',{show:true,text, id: '67,1'})
+            // this.$store.commit('system/changePop',{show:true,text, id: '67,1'})
+
+            this.$message.warning('请刷银行卡');
+            this.setPopId('67,1')
+            this.$router.push('/counter/list/')
         },
         popUp2(text) {
-            this.$store.commit('system/changePop',{show:true,text, id: '67,2'})
-            console.log(this.$store.state.system.id)
+            // this.$store.commit('system/changePop',{show:true,text, id: '67,2'})
+
+            this.$message.warning('请刷身份证');
+            this.setPopId('67,2')
+            this.$router.push('/counter/list/')
         },
         popUp3(text) {
-            this.$store.commit('system/changePop',{show:true,text, id: '117'})
+            // this.$store.commit('system/changePop',{show:true,text, id: '117'})
+
+            this.$message.warning('请在密码器输入密码');
+            this.setPopId('117')
+            this.$router.push('/counter/list/')
         },
         checkHanzi: checkHanzi,
         checkName: checkName,
@@ -208,6 +231,7 @@ export default{
             needsModule: 'system/needsModule',
             idCardNumber: 'system/idCardNumber',
             inMyWork: 'system/inMyWork',
+            
         })
     },
     watch: {
diff --git a/src/pages/manage/list/personal/currentAccount/deposit.vue b/src/pages/manage/list/personal/currentAccount/deposit.vue
index 894fca6..606b850 100644
--- a/src/pages/manage/list/personal/currentAccount/deposit.vue
+++ b/src/pages/manage/list/personal/currentAccount/deposit.vue
@@ -19,12 +19,12 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="金额">
-                            <el-input :value="form.money" @input="val => ismoney(val, form, 'money')" ref="money"></el-input>
+                            <el-input :value="form.money" maxlength="15" @input="val => ismoney(val, form, 'money')" ref="money"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="10" :offset="1">
                         <el-form-item label="客户姓名" prop="userName">
-                            <el-input ref="userName"  :value="form.userName" @input="(val) => checkName(val, form, 'userName')"></el-input>
+                            <el-input ref="userName"  :value="form.userName" maxlength="20" @input="(val) => checkName(val, form, 'userName')"></el-input>
                         </el-form-item>
                         <el-form-item label="钞汇标识" prop="goldLogo">
                             <el-select v-model="form.goldLogo" ref="goldLogo" placeholder="请选择">
@@ -37,7 +37,7 @@
                     </el-col>
                     <el-col :span="21" :offset="1">
                         <el-form-item label="摘要">
-                            <el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="form.remark" ref="remark"></el-input>
+                            <el-input type="textarea" :rows="3" placeholder="请输入内容" maxlength="60" v-model="form.remark" ref="remark"></el-input>
                         </el-form-item>
                     </el-col>
                 </el-form>
@@ -111,15 +111,18 @@ export default{
             }, 
         }
     },
-  mounted() {
-      if(!this.needBefore) {
-        this.getFormData()
-      }
-      
-  },
   created() {
     if(this.inMyWork(moduleName)) {
         if(this.needsModule(moduleName) === '') {
+            if(sessionStorage.getItem('nomBusinessDepositCard')) {
+                const { userName, goldLogo, currency, voucherNumber } = this.dataFlow
+                this.form.userName = userName
+                this.form.goldLogo = goldLogo // goldLogo // 13是什么鬼
+                this.form.currency = currency
+                this.form.idCardNumber = voucherNumber
+                this.cardNumberJudge = true
+            }
+            this.getFormData()
         }else {
             this.isNeedBefore = true
             this.needBefore = this.needsModule(moduleName)
@@ -158,7 +161,8 @@ export default{
     ...mapMutations({
         changeShowGoods: 'system/changeShowGoods',
         setDataFlow: 'system/setDataFlow',
-        setNeedsModule: 'system/setNeedsModule'
+        setNeedsModule: 'system/setNeedsModule',
+        setPopId: 'system/setPopId'
     }),
     //提交表单
     submitForm(){
@@ -208,7 +212,11 @@ export default{
         }
     },
     popUp(text) {
-        this.$store.commit('system/changePop',{show:true,text:'刷卡器',id:'63'})
+        // this.$store.commit('system/changePop',{show:true,text:'刷卡器',id:'63'})
+
+        this.$message.warning('请刷银行卡');
+        this.setPopId('63')
+        this.$router.push('/counter/list/')
     },
     ismoney: ismoney,
     checkName: checkName,
diff --git a/src/pages/manage/list/personal/currentAccount/openAccount.vue b/src/pages/manage/list/personal/currentAccount/openAccount.vue
index 691a36c..56e2517 100644
--- a/src/pages/manage/list/personal/currentAccount/openAccount.vue
+++ b/src/pages/manage/list/personal/currentAccount/openAccount.vue
@@ -7,7 +7,7 @@
             <el-form ref="form" :model="form" label-width="120px" :rules="rules">
                 <el-col :span="10" :offset="2">
                     <el-form-item label="客户号">
-                        <el-input :value="form.userNumber" @input="(val) => checkHanzi(val, form, 'userNumber')" ref="userNumber"></el-input>
+                        <el-input :value="form.userNumber" disabled @input="(val) => checkHanzi(val, form, 'userNumber')" ref="userNumber"></el-input>
                     </el-form-item>
                     <el-form-item label="币种" prop="currency">
                         <el-select v-model="form.currency" placeholder="请选择" ref="currency" disabled>
@@ -17,7 +17,7 @@
                 </el-col>
                 <el-col :span="10" :offset="1">
                     <el-form-item label="客户姓名" prop="userName">
-                        <el-input :value="form.userName" @input="(val) => checkName(val, form, 'userName')" ref="userName"></el-input>
+                        <el-input :value="form.userName" disabled @input="(val) => checkName(val, form, 'userName')" ref="userName"></el-input>
                     </el-form-item>
                     <!-- <el-form-item label="钞汇标识" prop="goldLogo" disabled>
                         <el-select v-model="form.goldLogo" @focus="getSubjectInfoData('9')" placeholder="请选择" ref="goldLogo">
@@ -259,7 +259,9 @@ export default {
               cardNumber: '卡号', // 
               cardNumber2: '卡号二', // 
               cardNumber3: '卡号三', // 
-              drawPassword: '支取密码', // 
+              drawPassword: '支取密码', //
+              drawPassword2: '支取密码二', // 
+              drawPassword3: '支取密码三', //  
               userNumber: '客户号', // 
               currency: '币种', // 
               userName: '客户姓名', // 
@@ -339,6 +341,37 @@ export default {
     created() {
       if(this.inMyWork(moduleName)) {
           if(this.needsModule(moduleName) === '') {
+            const { peopleNumber, userName } = this.dataFlow
+            this.form.userNumber = peopleNumber
+            this.form.userName = userName
+            const { voucherNumber } = this.dataFlow
+
+            // 判断是否使用刷卡器
+            if(sessionStorage.getItem('accountVoucher')) {
+                this.form.cardNumber = voucherNumber
+                this.cardNumberJudge = true
+            }
+            if(sessionStorage.getItem('accountVoucherTwo')) {
+                this.form.cardNumber2 = voucherNumber
+                this.cardNumberJudge2 = true
+            }
+            if(sessionStorage.getItem('accountVoucherThree')) {
+                this.form.cardNumber3 = voucherNumber
+                this.cardNumberJudge3 = true
+            }
+
+            // 判断是否使用密码器
+            if(sessionStorage.getItem('accountPassword')) {
+                this.form.drawPassword = sessionStorage.getItem('accountPassword')
+            }
+            if(sessionStorage.getItem('accountPasswordTwo')) {
+                this.form.drawPassword2 = sessionStorage.getItem('accountPasswordTwo')
+            }
+            if(sessionStorage.getItem('accountPasswordThree')) {
+                this.form.drawPassword3 = sessionStorage.getItem('accountPasswordThree')
+            }
+
+            this.getOptionsList()
           }else {
               this.isNeedBefore = true
               this.needBefore = this.needsModule(moduleName)
@@ -349,17 +382,13 @@ export default {
       }
     },
   mounted(){
-      if(!this.needBefore) {
-        this.getOptionsList()
-        this.$refs.userNumber.focus()
-      }
-     
   },
     methods:{
         ...mapMutations({
             changeShowGoods: 'system/changeShowGoods',
             setNeedsModule: 'system/setNeedsModule',
-            setDataFlow: 'system/setDataFlow'
+            setDataFlow: 'system/setDataFlow',
+            setPopId: 'system/setPopId'
         }),
         getOptionsList(){
             for(var i=8;i<14;i++){
@@ -474,7 +503,6 @@ export default {
                 this.form.goldLogo = '钞户'
             }else if (item == '10'){
               this.accountQualitySelectList = data.data.items;
-              console.log('暗中观察')
               console.log(this.accountQualitySelectList)
               this.form.accountQuality =  this.accountQualitySelectList[0].itemId
             }else if (item == '11'){
@@ -676,28 +704,53 @@ export default {
             });
         },
       popUp(){
-        this.cardNumberTag = 1
-        this.$store.commit('system/changePop',{show:true,text:'刷卡器',id:'62,1'})
+        // 打开第一个刷卡器
+        // this.$store.commit('system/changePop',{show:true,text:'刷卡器',id:'62,1'})
+        // this.cardNumberTag = 1  
+
+        this.$message.warning('请刷银行卡');
+        this.setPopId('62,1')
+        this.$router.push('/counter/list/')
       },
       popUps(){
-        this.passwordTag = 1
-        this.$store.commit('system/changePop',{show:true,text:'密码器',id:'62,1'})
+        // this.passwordTag = 1
+        // this.$store.commit('system/changePop',{show:true,text:'密码器',id:'62,1'})
+
+        this.$message.warning('请在密码器输入密码');
+        this.setPopId('62,1')
+        this.$router.push('/counter/list/')
       },
       popUpTwo(){
-        this.cardNumberTag = 2
-        this.$store.commit('system/changePop',{show:true,text:'刷卡器',id:'62,2'})
+        // this.cardNumberTag = 2
+        // this.$store.commit('system/changePop',{show:true,text:'刷卡器',id:'62,2'})
+
+        this.$message.warning('请刷银行卡');
+        this.setPopId('62,2')
+        this.$router.push('/counter/list/')
       },
       popUpsTwo(){
-        this.passwordTag = 2
-        this.$store.commit('system/changePop',{show:true,text:'密码器',id:'62,2'})
+        // this.passwordTag = 2
+        // this.$store.commit('system/changePop',{show:true,text:'密码器',id:'62,2'})
+
+        this.$message.warning('请在密码器输入密码');
+        this.setPopId('62,2')
+        this.$router.push('/counter/list/')
       },
       popUpThree(){
-        this.cardNumberTag = 3
-        this.$store.commit('system/changePop',{show:true,text:'刷卡器',id:'62,3'})
+        // this.cardNumberTag = 3
+        // this.$store.commit('system/changePop',{show:true,text:'刷卡器',id:'62,3'})
+
+        this.$message.warning('请刷银行卡');
+        this.setPopId('62,3')
+        this.$router.push('/counter/list/')
       },
       popUpsThree(){
-        this.passwordTag = 3
-        this.$store.commit('system/changePop',{show:true,text:'密码器',id:'62,3'})
+        // this.passwordTag = 3
+        // this.$store.commit('system/changePop',{show:true,text:'密码器',id:'62,3'})
+
+        this.$message.warning('请在密码器输入密码');
+        this.setPopId('62,3')
+        this.$router.push('/counter/list/')
       },
       checkName: checkName,
       checkHanzi: checkHanzi,
@@ -728,7 +781,7 @@ export default {
             this.cardNumberJudge3 = true
           }
       },
-      dataFlowPassword(newVal) {
+      dataFlowPassword(newVal) { 
           if(this.passwordTag === 1) {
             const accountPassword = sessionStorage.getItem('accountPassword')
             this.form.drawPassword = accountPassword
diff --git a/src/pages/manage/list/personal/currentAccount/settle.vue b/src/pages/manage/list/personal/currentAccount/settle.vue
index 29b5cfd..72e819d 100644
--- a/src/pages/manage/list/personal/currentAccount/settle.vue
+++ b/src/pages/manage/list/personal/currentAccount/settle.vue
@@ -18,23 +18,23 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="金额">
-                        <el-input :value="form.money" @input="val => ismoney(val, form, 'money')"></el-input>
+                        <el-input :value="form.money" maxlength="20" @input="val => ismoney(val, form, 'money')"></el-input>
                     </el-form-item>
                     <el-form-item label="总金额">
-                        <el-input v-model="form.totalMoney" placeholder="显示余额加利息总额"></el-input>
+                        <el-input v-model="form.totalMoney" maxlength="20" placeholder="显示余额加利息总额"></el-input>
                     </el-form-item>
                     <el-form-item label="支取密码" required>
-                        <div v-if='!form.drawPassword' class="idCard" @click="popUp('密码器')">
+                        <div v-if='!form.drawPassword' class="idCard" @click="popUp2('密码器')">
                             <p>请输入密码</p>
                         </div>
-                        <div v-else @click="popUp('密码器')">
+                        <div v-else @click="popUp2('密码器')">
                             <el-input :value="form.drawPassword" ref="drawPassword" type="password"></el-input>
                         </div>
                     </el-form-item>
                 </el-col>
                 <el-col :span="10" :offset="1">
                     <el-form-item label="客户姓名" prop="userName"  :rules="rules.userName">
-                        <el-input :value="form.userName" @input="(val) => checkName(val, form, 'userName')" ref="userName"></el-input>
+                        <el-input :value="form.userName" maxlength="20" @input="(val) => checkName(val, form, 'userName')" ref="userName"></el-input>
                     </el-form-item>
                     <el-form-item label="钞汇标识">
                         <el-select v-model="form.goldLogo" placeholder="请选择">
@@ -42,7 +42,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="利息">
-                        <el-input v-model="form.interest"></el-input>
+                        <el-input v-model="form.interest" maxlength="20"></el-input>
                     </el-form-item>
                     <el-form-item label="支取方式" prop="chargeWay">
                         <el-select v-model="form.chargeWay" placeholder="请选择" ref="chargeWay">
@@ -52,7 +52,7 @@
                 </el-col>
                 <el-col :span="21" :offset="1">
                     <el-form-item label="摘要">
-                        <el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="form.remark"></el-input>
+                        <el-input type="textarea" maxlength="60" :rows="3" placeholder="请输入内容" v-model="form.remark"></el-input>
                     </el-form-item>
                 </el-col>
             </el-form>
@@ -80,6 +80,8 @@ export default{
     data(){
         return{
             visible: false,
+            unNeed: false,
+            isNeedBefore: '',
             needBefore: '',
             cardNumberJudge: false,
             form:{
@@ -174,6 +176,20 @@ export default{
     created() {
         if(this.inMyWork(moduleName)) {
             if(this.needsModule(moduleName) === '') {
+                if(sessionStorage.getItem('nomCurrentSettleCard')) {
+                    this.cardNumberJudge = true
+                    const { currency, userName, goldLogo, chargeWay, interest, voucherNumber } = 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
+                }
+                if(sessionStorage.getItem('nomCurrentSettlePassword')) {
+                    this.form.drawPassword = sessionStorage.getItem('nomCurrentSettlePassword')
+                }
+
                 const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,57,66'
                 const cardArr = {
                     // 103: 'nomCurrentSettleCard',
@@ -209,7 +225,8 @@ export default{
         ...mapMutations({
             changeShowGoods: 'system/changeShowGoods',
             setDataFlow: 'system/setDataFlow',
-            setNeedsModule: 'system/setNeedsModule'
+            setNeedsModule: 'system/setNeedsModule',
+            setPopId: 'system/setPopId'
         }),
 //提交表单
       getDataBlur() {
@@ -242,7 +259,16 @@ export default{
         this.setDataFlow({ voucherNumber: cardNumber, userName })
       },
       popUp(text) {
-        this.$store.commit('system/changePop',{show:true,text, id: 66})
+        // this.$store.commit('system/changePop',{show:true,text, id: 66})
+
+        this.$message.warning('请刷银行卡');
+        this.setPopId('66')
+        this.$router.push('/counter/list/')
+      },
+      popUp2(text) {
+        this.$message.warning('请在密码器输入密码');
+        this.setPopId('66,2')
+        this.$router.push('/counter/list/')
       },
       ismoney: ismoney,
       checkHanzi: checkHanzi,
@@ -261,14 +287,14 @@ export default{
     },
     watch: {
       dataFlowCard(newVal) {
-          this.cardNumberJudge = true
+          
           this.$nextTick(() => {
             this.$refs.cardNumber.focus()
           })
 
           // this.form.cardNumber = this.idCardNumber
 
-
+          this.cardNumberJudge = true
           const { currency, userName, goldLogo, serviceCharge, chargeWay, interest } = this.dataFlow
           this.form.currency = currency
           this.form.userName = userName
diff --git a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
index 8d4eb5c..06d03c1 100644
--- a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
+++ b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
@@ -18,7 +18,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="金额" prop="money">
-                        <el-input :value="form.money" @input="val => ismoney(val, form, 'money')" ref="money"></el-input>
+                        <el-input :value="form.money" maxlength="15" @input="val => ismoney(val, form, 'money')" ref="money"></el-input>
                     </el-form-item>
                     <el-form-item label="收款卡号" prop="shroffAccount">
                         <el-input :value="form.shroffAccount" @input="(val) => checkHanzi(val, form, 'shroffAccount')" ref="shroffAccount"></el-input>
@@ -34,20 +34,20 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="支取密码" required>
-                        <div v-if='!form.drawPassword' class="idCard" @click="popUp('密码器')">
+                        <div v-if='!form.drawPassword' class="idCard" @click="popUp2('密码器')">
                             <p>请输入密码</p>
                         </div>
-                        <div v-else @click="popUp('密码器')">
+                        <div v-else @click="popUp2('密码器')">
                             <el-input :value="form.drawPassword" ref="drawPassword" type="password"></el-input>
                         </div>
                     </el-form-item>
                     <el-form-item label="收款人名称" prop="payeeName" >
-                        <el-input :value="form.payeeName" @input="(val) => checkName(val, form, 'payeeName')" ref="payeeName"></el-input>
+                        <el-input :value="form.payeeName" maxlength="40" @input="(val) => checkName(val, form, 'payeeName')" ref="payeeName"></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="21" :offset="1">
                     <el-form-item label="摘要">
-                        <el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="form.remark"></el-input>
+                        <el-input type="textarea" :rows="3" maxlength="60" placeholder="请输入内容" v-model="form.remark"></el-input>
                     </el-form-item>
                 </el-col>
             </el-form>
@@ -182,6 +182,26 @@ export default{
    created() {
     if(this.inMyWork(moduleName)) {
         if(this.needsModule(moduleName) === '') {
+            // 由于需求变更过  可能看起来有点乱  不过代码还是美如画的
+
+            //     94: nomCurrentTransferCard
+            // }, 
+            // {
+            //     99: nomCurrentTransferPassword,
+            if(sessionStorage.getItem('nomCurrentTransferCard')) {
+                this.cardNumberJudge = true
+                const { currency, userName, goldLogo, voucherNumber } = this.dataFlow
+                this.form.cardNumber = voucherNumber
+                this.form.currency = currency
+                this.form.userName = userName
+                this.form.goldLogo = goldLogo
+            }
+
+            if(sessionStorage.getItem('nomCurrentTransferPassword')) {
+                this.form.drawPassword = sessionStorage.getItem('nomCurrentTransferPassword')
+            }
+
+
             const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,57,65'
             const cardArr = {
                 // 94: 'nomCurrentTransferCard',
@@ -213,7 +233,8 @@ export default{
     ...mapMutations({
         changeShowGoods: 'system/changeShowGoods',
         setDataFlow: 'system/setDataFlow',
-        setNeedsModule: 'system/setNeedsModule'
+        setNeedsModule: 'system/setNeedsModule',
+        setPopId: 'system/setPopId'
     }),
     //提交表单
     submitForm(){
@@ -244,10 +265,18 @@ export default{
         this.setNeedsModule(moduleName)
     },
     popUp(text) {
-        this.$store.commit('system/changePop',{show:true,text, id: 65})
+        // this.$store.commit('system/changePop',{show:true,text, id: 65})
+
+        this.$message.warning('请刷银行卡');
+        this.setPopId('65')
+        this.$router.push('/counter/list/')
     },
     popUp2(text) {
-        this.$store.commit('system/changePop',{show:true,text, id: 99})
+        // this.$store.commit('system/changePop',{show:true,text, id: 99})
+
+        this.$message.warning('请在密码器输入密码');
+        this.setPopId('99')
+        this.$router.push('/counter/list/')
     },
     ismoney: ismoney,
     checkHanzi: checkHanzi,
diff --git a/src/pages/manage/list/personal/currentAccount/withdrawal.vue b/src/pages/manage/list/personal/currentAccount/withdrawal.vue
index 8758e4e..483ac73 100644
--- a/src/pages/manage/list/personal/currentAccount/withdrawal.vue
+++ b/src/pages/manage/list/personal/currentAccount/withdrawal.vue
@@ -21,10 +21,10 @@
                         <el-input :value="form.money" @input="val => ismoney(val, form, 'money')"></el-input>
                     </el-form-item>
                     <el-form-item label="支取密码" required>
-                        <div v-if='!form.drawPassword' class="idCard" @click="popUp('密码器')">
+                        <div v-if='!form.drawPassword' class="idCard" @click="popUp2('密码器')">
                             <p>请输入密码</p>
                         </div>
-                        <div v-else @click="popUp('密码器')">
+                        <div v-else @click="popUp2('密码器')">
                             <el-input :value="form.drawPassword" ref="drawPassword" type="password"></el-input>
                         </div>
                     </el-form-item>
@@ -83,8 +83,22 @@ export default{
     created() {
         if(this.inMyWork(moduleName)) {
             if(this.needsModule(moduleName) === '') {
+                if(sessionStorage.getItem('nomCurrentWithdrawalCard')) {
+                    this.cardNumberJudge = true
+                    const { currency, userName, goldLogo, serviceCharge, chargeWay, voucherNumber } = this.dataFlow
+                    this.form.currency = currency
+                    this.form.userName = userName
+                    this.form.goldLogo = goldLogo
+                    this.form.serviceCharge = serviceCharge
+                    this.form.chargeWay = chargeWay
+                    this.form.cardNumber = voucherNumber
+                }
+
+                if(sessionStorage.getItem('nomCurrentWithdrawalPassword')) {
+                    this.form.drawPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword')
+                }
+
                 this.getFormData()
-                this.$refs.userName.focus();
             }else {
                 this.isNeedBefore = true
                 this.needBefore = this.needsModule(moduleName)
@@ -156,7 +170,8 @@ export default{
         ...mapMutations({
             changeShowGoods: 'system/changeShowGoods',
             setDataFlow: 'system/setDataFlow',
-            setNeedsModule: 'system/setNeedsModule'
+            setNeedsModule: 'system/setNeedsModule',
+            setPopId: 'system/setPopId'
         }),
       getFormData(){
           let param= {
@@ -239,7 +254,14 @@ export default{
         }
     },
     popUp(text) {
-        this.$store.commit('system/changePop',{show:true,text,id:'64'})
+        this.$message.warning('请刷银行卡');
+        this.setPopId('64')
+        this.$router.push('/counter/list/')
+    },
+    popUp2(text) {
+        this.$message.warning('请输入密码');
+        this.setPopId('64,2')
+        this.$router.push('/counter/list/')
     },
     ismoney: ismoney,
     checkName: checkName,
diff --git a/src/pages/manage/list/personal/timeDeposit/deposit.vue b/src/pages/manage/list/personal/timeDeposit/deposit.vue
index 12a20c7..48bf654 100644
--- a/src/pages/manage/list/personal/timeDeposit/deposit.vue
+++ b/src/pages/manage/list/personal/timeDeposit/deposit.vue
@@ -5,7 +5,7 @@
             <el-form ref="form" :model="form" label-width="120px" :rules="rules">
                 <el-col :span="10" :offset="1">
                     <el-form-item label="凭证号码" required>
-                        <div v-if='!cardNumberJudge' class="idCard" @click="popUp2('刷卡器')">
+                        <div v-if='!cardNumberJudge' class="idCard" @click="popUp('刷卡器')">
                             <p>请刷卡</p>
                         </div>
                         <div v-else>
@@ -60,10 +60,10 @@
                         </el-radio-group>
                     </el-form-item>
                     <el-form-item label="支取密码" required>
-                        <div v-if='!form.drawPassword' class="idCard" @click="popUp('密码器')">
+                        <div v-if='!form.drawPassword' class="idCard" @click="popUp2('密码器')">
                             <p>请输入密码</p>
                         </div>
-                        <div v-else @click="popUp('密码器')">
+                        <div v-else @click="popUp2('密码器')">
                             <el-input :value="form.drawPassword" ref="drawPassword" type="password"></el-input>
                         </div>
                     </el-form-item>
@@ -270,8 +270,24 @@ export default{
     created() {
         if(this.inMyWork(moduleName)) {
             if(this.needsModule(moduleName) === '') {
+                // nomtimeDepositlPassword, nomtimeDeposit1
+                if(sessionStorage.getItem('nomtimeDeposit1')) {
+                    this.cardNumberJudge = true
+                    const { userName, currency, goldLogo, voucherNumber } = this.dataFlow
+                    this.form.customerName = userName
+                    this.form.currency = currency
+                    this.form.currencyMark = goldLogo
+                    this.form.voucherNumber = voucherNumber
+                }
+                console.log('mxxx')
+                console.log(sessionStorage.getItem('nomtimeDepositlPassword'))
+                if(sessionStorage.getItem('nomtimeDepositlPassword')) {
+                    
+                    this.form.drawPassword = sessionStorage.getItem('nomtimeDepositlPassword')
+                }
+
+
                 this.getFormData()
-                this.$refs.customerName.focus()
             }else {
                 this.isNeedBefore = true
                 this.needBefore = this.needsModule(moduleName)
@@ -289,14 +305,15 @@ export default{
         ...mapMutations({
             changeShowGoods: 'system/changeShowGoods',
             setDataFlow: 'system/setDataFlow',
-            setNeedsModule: 'system/setNeedsModule'
+            setNeedsModule: 'system/setNeedsModule',
+            setPopId: 'system/setPopId'
         }),
         getDataBlur() {
             if(this.form.voucherNumber) {
-                const { userName, currency, goldLogo } = this.dataFlow
-                this.form.customerName = userName
-                this.form.currency = currency
-                this.form.currencyMark = goldLogo
+                // const { userName, currency, goldLogo } = this.dataFlow
+                // this.form.customerName = userName
+                // this.form.currency = currency
+                // this.form.currencyMark = goldLogo
             }
         },
         getFormData(){
@@ -316,10 +333,18 @@ export default{
             autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cards, callback)
         },
         popUp(text) {
-            this.$store.commit('system/changePop',{show:true,text, id: '131'})
+            // this.$store.commit('system/changePop',{show:true,text, id: '131'})
+
+            this.$message.warning('请刷银行卡');
+            this.setPopId('131')
+            this.$router.push('/counter/list/')
         },
         popUp2(text) {
-            this.$store.commit('system/changePop',{show:true,text, id: '140'})
+            // this.$store.commit('system/changePop',{show:true,text, id: '140'})
+
+            this.$message.warning('请在密码器输入密码');
+            this.setPopId('140')
+            this.$router.push('/counter/list/')
         },
         submitForm() {
             this.$refs.form.validate(myValidate(() => {
@@ -337,7 +362,7 @@ export default{
                 //     131: nomtimeDeposit1
                 // },
                 // {
-                //     140: nomtimeDepositlPassword,
+                //     140: nomtimeDepositlPassword, 
                 //     "subjectId": 17,
                 // }
             ]
diff --git a/src/pages/manage/list/personal/timeDeposit/openAccount.vue b/src/pages/manage/list/personal/timeDeposit/openAccount.vue
index dc13462..4259784 100644
--- a/src/pages/manage/list/personal/timeDeposit/openAccount.vue
+++ b/src/pages/manage/list/personal/timeDeposit/openAccount.vue
@@ -10,7 +10,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="客户号">
-                        <el-input ref="clientNumber" :value="form.clientNumber" @input="(val) => checkHanzi(val, form, 'clientNumber')"></el-input>
+                        <el-input ref="clientNumber" disabled maxlength="20" :value="form.clientNumber" @input="(val) => checkHanzi(val, form, 'clientNumber')"></el-input>
                     </el-form-item>
                     <el-form-item label="币种" prop="currency">
                         <el-select v-model="form.currency" placeholder="请选择" ref="currency">
@@ -34,11 +34,11 @@
                             <p>请刷身份证</p>
                         </div>
                         <div v-else>
-                            <el-input :value="form.idNumber" disabled ref="idNumber"></el-input>
+                            <el-input :value="form.idNumber" maxlength="20" disabled ref="idNumber"></el-input>
                         </div>
                     </el-form-item>
                     <el-form-item label="客户姓名"  prop="customerName">
-                        <el-input ref="customerName" :value="form.customerName" @input="(val) => checkName(val, form, 'customerName')"></el-input>
+                        <el-input ref="customerName" maxlength="20" :value="form.customerName" @input="(val) => checkName(val, form, 'customerName')"></el-input>
                     </el-form-item>
                     <el-form-item label="钞汇标识" prop="currencyMark">
                         <el-select v-model="form.currencyMark" placeholder="请选择" ref="currencyMark">
@@ -46,18 +46,18 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="凭证号码">
-                        <div v-if='!cardNumberJudge' class="idCard" @click="popUp('刷卡器')">
+                        <div v-if='!cardNumberJudge' class="idCard" @click="popUp2('刷卡器')">
                             <p>请刷卡</p>
                         </div>
                         <div v-else>
-                            <el-input @blur="getDataBlur" ref="voucherNumber" disabled :value="form.voucherNumber" @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
+                            <el-input @blur="getDataBlur" maxlength="20" ref="voucherNumber" disabled :value="form.voucherNumber" @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
                         </div>
                     </el-form-item>
                     <el-form-item label="支取密码" required>
-                        <div v-if='!form.drawPassword' class="idCard" @click="popUp('密码器')">
+                        <div v-if='!form.drawPassword' class="idCard" @click="popUp3('密码器')">
                             <p>请输入密码</p>
                         </div>
-                        <div v-else @click="popUp('密码器')">
+                        <div v-else @click="popUp3('密码器')">
                             <el-input :value="form.drawPassword" ref="drawPassword" type="password"></el-input>
                         </div>
                     </el-form-item>
@@ -219,6 +219,31 @@ export default{
         if(this.inMyWork(moduleName)) {
             if(this.needsModule(moduleName) === '') {
                 this.form.clientNumber = this.dataFlow.peopleNumber
+
+                if(sessionStorage.getItem('nomtimeOpenAccount1')) {
+                    const { idNumber, userName, currency, goldLogo } = this.dataFlow
+                    this.form.idNumber = idNumber
+                    this.form.customerName = userName
+                    this.form.currency = currency
+                    this.form.currencyMark = goldLogo
+
+                    this.idNumberJudge = true
+                    console.log(this.idNumberJudge)
+                }
+
+                if(sessionStorage.getItem('nomtimeOpenAccount2')) {
+                    const { voucherNumber } = this.dataFlow
+                    console.log('xs')
+                    console.log(voucherNumber)
+                    this.cardNumberJudge = true
+                    this.form.voucherNumber = voucherNumber
+                    console.log(this.form.voucherNumber)
+                }
+
+                if(sessionStorage.getItem('nomtimeOpenAccountPassword')) {
+                    this.form.drawPassword = sessionStorage.getItem('nomtimeOpenAccountPassword')
+                }
+
                 this.getFormData()
             }else {
                 this.isNeedBefore = true
@@ -236,7 +261,8 @@ export default{
         ...mapMutations({
             changeShowGoods: 'system/changeShowGoods',
             setDataFlow: 'system/setDataFlow',
-            setNeedsModule: 'system/setNeedsModule'
+            setNeedsModule: 'system/setNeedsModule',
+            setPopId: 'system/setPopId'
         }),
         getDataBlur() {
 
@@ -262,17 +288,26 @@ export default{
             }
             autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cards, callback)
         },
-        popUp1(text) {
-            this.$store.commit('system/changePop',{show:true,text, id: '118,1'})
-        },
-        popUp2(text) {
-            this.$store.commit('system/changePop',{show:true,text, id: '118,2'})
+        popUp1(text) { // 身份证扫描仪
+            // this.$store.commit('system/changePop',{show:true,text, id: '118,1'})
+
+            this.$message.warning('请刷身份证');
+            this.setPopId('118,1')
+            this.$router.push('/counter/list/')
         },
-        popUp3(text) {
-            this.$store.commit('system/changePop',{show:true,text, id: '118,1'})
+        popUp2(text) { // 刷卡器
+            // this.$store.commit('system/changePop',{show:true,text, id: '118,2'})
+
+            this.$message.warning('请刷银行卡');
+            this.setPopId('118,2')
+            this.$router.push('/counter/list/')
         },
-        popUp(text) {
-            this.$store.commit('system/changePop',{show:true,text, id: '129'})
+        popUp3(text) { // 密码器
+            // this.$store.commit('system/changePop',{show:true,text, id: '129'})
+
+            this.$message.warning('请在密码器输入密码');
+            this.setPopId('129')
+            this.$router.push('/counter/list/')
         },
         submitForm() {
             this.$refs.form.validate(myValidate(() => {
diff --git a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
index daa87e5..5d40fef 100644
--- a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
+++ b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
@@ -5,7 +5,7 @@
             <el-form ref="form" :model="form" label-width="120px" :rules="rules">
                 <el-col :span="10" :offset="1">
                     <el-form-item label="凭证号码" required>
-                        <div v-if='!cardNumberJudge' class="idCard" @click="popUp2('刷卡器')">
+                        <div v-if='!cardNumberJudge' class="idCard" @click="popUp('刷卡器')">
                             <p>请刷卡</p>
                         </div>
                         <div v-else>
@@ -23,14 +23,14 @@
                     <el-form-item label="支取金额" prop="withdrawAmount">
                         <el-input  :value="form.withdrawAmount" @input="val => ismoney(val, form, 'withdrawAmount')" ref="withdrawAmount"></el-input>
                     </el-form-item>
-                    <el-form-item label="利息（%）" prop="interest">
+                    <el-form-item label="利息" prop="interest">
                         <el-input :value="form.interest" @input="(val) => rateListen(val, form, 'interest')" ref="interest"></el-input>
                     </el-form-item>
                     <el-form-item label="支取密码" required>
-                        <div v-if='!form.drawPassword' class="idCard" @click="popUp('密码器')">
+                        <div v-if='!form.drawPassword' class="idCard" @click="popUp2('密码器')">
                             <p>请输入密码</p>
                         </div>
-                        <div v-else>
+                        <div v-else @click="popUp2('密码器')">
                             <el-input :value="form.drawPassword" ref="drawPassword" type="password"></el-input>
                         </div>
                     </el-form-item>
@@ -85,6 +85,26 @@ export default{
     created() {
         if(this.inMyWork(moduleName)) {
             if(this.needsModule(moduleName) === '') {
+                if(sessionStorage.getItem('nomtimeDepositWithdrawal1')) {
+                    this.cardNumberJudge = true
+                    const { userName, currency, goldLogo, interest, depositNumber, capital, withdrawType, withdrawWay, voucherNumber } = this.dataFlow
+                    console.log('voucherNumber')
+                    console.log(voucherNumber)
+                    this.form.voucherNumber = voucherNumber
+                    this.form.customerName = userName
+                    this.form.currencyType = currency
+                    this.form.currencyMark = goldLogo
+                    this.form.interest = interest
+                    this.form.depositNumber = depositNumber
+                    this.form.capital = capital
+                    this.form.withdrawType = withdrawType
+                    this.form.withdrawWay = withdrawWay
+                }
+
+                if(sessionStorage.getItem('nomtimeDepositWithdrawalPassword')) {
+                    this.form.drawPassword = sessionStorage.getItem('nomtimeDepositWithdrawalPassword')
+                }
+
                 this.getFormData()
                 // this.$nextTick(() => {
                 //     this.$refs.depositNumber.focus()
@@ -226,7 +246,8 @@ export default{
         ...mapMutations({
             changeShowGoods: 'system/changeShowGoods',
             setDataFlow: 'system/setDataFlow',
-            setNeedsModule: 'system/setNeedsModule'
+            setNeedsModule: 'system/setNeedsModule',
+            setPopId: 'system/setPopId'
         }),
         getDataBlur() {
             // 客户姓名、币种、钞汇标识、定存编号（0912）、本金（开户时存的业务中的金额）、支取类别（现金）、支取方式（密码）
@@ -247,10 +268,18 @@ export default{
             autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cards, callback)
         },
         popUp(text) {
-            this.$store.commit('system/changePop',{show:true,text, id: '144,1'})
+            // this.$store.commit('system/changePop',{show:true,text, id: '144,1'})
+
+            this.$message.warning('请刷银行卡');
+            this.setPopId('144,1')
+            this.$router.push('/counter/list/')
         },
         popUp2(text) {
-            this.$store.commit('system/changePop',{show:true,text, id: '154'})
+            // this.$store.commit('system/changePop',{show:true,text, id: '154'})
+
+            this.$message.warning('请在密码器输入密码');
+            this.setPopId('154')
+            this.$router.push('/counter/list/')
         },
         submitIt() {
             this.$refs.form.validate(myValidate(() => {
diff --git a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
index 01b0c4a..4604b7d 100644
--- a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
@@ -14,7 +14,7 @@
                             <p>请刷卡</p>
                         </div>
                         <div v-else>
-                            <el-input disabled ref="voucherNumber" :value="form.voucherNumber" @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
+                            <el-input disabled ref="voucherNumber" maxlength="20" :value="form.voucherNumber" @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
                         </div>
                     </el-form-item>
                     <el-form-item label="币种" prop="currency">
@@ -25,7 +25,7 @@
                     <el-form-item label="定存编号" prop="depositNumber">
                         <el-input :value="form.depositNumber" @input="(val) => checkHanzi(val, form, 'depositNumber')" ref="depositNumber"></el-input>
                     </el-form-item>
-                    <el-form-item label="利率（%）" prop="interestRate">
+                    <el-form-item label="利率" prop="interestRate">
                         <el-input :value="form.interestRate" @input="(val) => checkHanzi(val, form, 'interestRate')" ref="interestRate"></el-input>
                     </el-form-item>
                     <el-form-item label="利息" prop="interest">
@@ -113,7 +113,34 @@ export default{
     },
     created() {
         if(this.inMyWork(moduleName)) {
+            // 180: 'nomUsefulPhrasesClosed',
+            // 181: 'nomUsefulPhrasesClosed2',
+            // 192: 'nomUsefulPhrasesClosedPassword'
+
             if(this.needsModule(moduleName) === '') {
+                if(sessionStorage.getItem('nomUsefulPhrasesClosed')) {
+                    this.idNumberJudge = true
+                    const { idNumber } = this.dataFlow
+                    this.form.idNumber = idNumber
+                }
+                if(sessionStorage.getItem('nomUsefulPhrasesClosed2')) {
+                    this.cardNumberJudge = true
+                    const { currency, userName, depositNumber, goldLogo, capital, interestRate, interest, totalMoney, signDate, voucherNumber } = this.dataFlow
+                    this.form.currency = currency
+                    this.form.customerName = userName
+                    this.form.depositNumber = depositNumber
+                    this.form.currencyMark = goldLogo
+                    this.form.capital = capital
+                    this.form.interestRate = interestRate
+                    this.form.interest = interest
+                    this.form.totalMoney = totalMoney
+                    this.form.signDate = signDate
+                    this.form.voucherNumber = voucherNumber
+                }
+                if(sessionStorage.getItem('nomUsefulPhrasesClosedPassword')) {
+                    this.form.drawPassword = sessionStorage.getItem('nomUsefulPhrasesClosedPassword')
+                }
+
                 this.getFormData()
             }else {
                 this.isNeedBefore = true
@@ -273,7 +300,8 @@ export default{
         ...mapMutations({
             changeShowGoods: 'system/changeShowGoods',
             setDataFlow: 'system/setDataFlow',
-            setNeedsModule: 'system/setNeedsModule'
+            setNeedsModule: 'system/setNeedsModule',
+            setPopId: 'system/setPopId'
         }),
         getFormData(){
             const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,59,157'
@@ -293,17 +321,30 @@ export default{
             autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cards, callback)
         },
         popUp(text) {
-            this.$store.commit('system/changePop',{show:true,text, id: '181'})
+            // this.$store.commit('system/changePop',{show:true,text, id: '181'})
+
+            this.$message.warning('请刷银行卡');
+            this.setPopId('181')
+            this.$router.push('/counter/list/')
         },
         popUp2(text) {
-            this.$store.commit('system/changePop',{show:true,text, id: '192'})
+            // this.$store.commit('system/changePop',{show:true,text, id: '192'})
+
+            this.$message.warning('请在密码器输入密码');
+            this.setPopId('192')
+            this.$router.push('/counter/list/')
         },
         popUp3(text) {
-            this.$store.commit('system/changePop',{show:true,text, id: '180'})
+            // this.$store.commit('system/changePop',{show:true,text, id: '180'})
+
+            this.$message.warning('请刷身份证');
+            this.setPopId('180')
+            this.$router.push('/counter/list/')
         },
         submitForm() {
             this.$refs.form.validate(myValidate(() => {
                 // 验证通过逻辑写在这
+                this.form.signDate = this.form.signDate.slice(0, 10)
                 this.visible = true;
             }, this.$refs));
         },
@@ -325,6 +366,7 @@ export default{
                 //     "subjectId": 32,
                 // }
             ]
+            
             autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
             this.setNeedsModule(moduleName)
         },
diff --git a/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue b/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue
index a4a8f0b..4823b79 100644
--- a/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue
@@ -9,7 +9,7 @@
                             <p>请刷卡</p>
                         </div>
                         <div v-else>
-                            <el-input @blur="getDataBlur" disabled ref="voucherNumber" :value="form.voucherNumber" @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
+                            <el-input @blur="getDataBlur" disabled maxlength="20" ref="voucherNumber" :value="form.voucherNumber" @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
                         </div>
                     </el-form-item>
                     <el-form-item label="定存编号" prop="depositNumber">
@@ -74,6 +74,22 @@ export default{
     created() {
         if(this.inMyWork(moduleName)) {
             if(this.needsModule(moduleName) === '') {
+                // 171: 'nomUsefulPhrasesContinueCard',
+                // 178: 'nomUsefulPhrasesContinuePassword'
+                if(sessionStorage.getItem('nomUsefulPhrasesContinueCard')) {
+                    this.cardNumberJudge = true
+                    const { voucherNumber, userName, depositNumber, currency, goldLogo, depositTerm, monthDeposit } = this.dataFlow
+                    this.form.voucherNumber = voucherNumber
+                    this.form.customerName = userName
+                    this.form.currency = currency
+                    this.form.depositTerm = depositTerm
+                    this.form.depositNumber = depositNumber
+                    this.form.moneyTarget = goldLogo
+                    this.form.monthDeposit = monthDeposit
+                }
+                if(sessionStorage.getItem('nomUsefulPhrasesContinuePassword')) {
+                    this.form.drawPassword = sessionStorage.getItem('nomUsefulPhrasesContinuePassword')
+                }
                 this.getFormData()
             }else {
                 this.isNeedBefore = true
@@ -185,7 +201,8 @@ export default{
         ...mapMutations({
             changeShowGoods: 'system/changeShowGoods',
             setDataFlow: 'system/setDataFlow',
-            setNeedsModule: 'system/setNeedsModule'
+            setNeedsModule: 'system/setNeedsModule',
+            setPopId: 'system/setPopId'
         }),
         getDataBlur() {
             
@@ -205,10 +222,17 @@ export default{
             autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cards, callback)
         },
         popUp(text) {
-            this.$store.commit('system/changePop',{show:true,text, id: '171'})
+            // this.$store.commit('system/changePop',{show:true,text, id: '171'})
+            this.$message.warning('请刷银行卡');
+            this.setPopId('171')
+            this.$router.push('/counter/list/')
         },
         popUp2(text) {
-            this.$store.commit('system/changePop',{show:true,text, id: '178'})
+            // this.$store.commit('system/changePop',{show:true,text, id: '178'})
+
+            this.$message.warning('请在密码器输入密码');
+            this.setPopId('178')
+            this.$router.push('/counter/list/')
         },
         submitForm() {
             this.$refs.form.validate(myValidate(() => {
diff --git a/src/pages/manage/list/personal/usefulPhrases/openAccount.vue b/src/pages/manage/list/personal/usefulPhrases/openAccount.vue
index 8abb31c..6f698f4 100644
--- a/src/pages/manage/list/personal/usefulPhrases/openAccount.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/openAccount.vue
@@ -26,7 +26,7 @@
                         <div v-if='!form.drawPassword' class="idCard" @click="popUp3('密码器')">
                             <p>请输入密码</p>
                         </div>
-                        <div v-else>
+                        <div v-else @click="popUp3('密码器')">
                             <el-input :value="form.drawPassword" ref="drawPassword" type="password"></el-input>
                         </div>
                     </el-form-item>
@@ -61,7 +61,7 @@
                             <p>请刷卡</p>
                         </div>
                         <div v-else>
-                            <el-input @blur="getDataBlur" ref="voucherNumber" :value="form.voucherNumber" @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
+                            <el-input @blur="getDataBlur" ref="voucherNumber" disabled :value="form.voucherNumber" @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
                         </div>
                     </el-form-item>
                     <el-form-item label="月存金额" prop="monthDeposit">
@@ -97,6 +97,28 @@ export default{
     created() {
         if(this.inMyWork(moduleName)) {
             if(this.needsModule(moduleName) === '') {
+                // 1399: 'nomUsefulPhrasesOpenCard2',
+                // 166: 'nomUsefulPhrasesOpenCard',
+                // 167: 'nomUsefulPhrasesOpenPassword'
+                if(sessionStorage.getItem('nomUsefulPhrasesOpenCard2')) {
+                    this.idNumberJudge = true
+                    // 身份证号码、客户姓名、币种（人民币）、钞汇标识（钞户）
+                    const { idNumber, userName, peopleNumber, currency, goldLogo } = this.dataFlow
+                    this.form.clientNumber = peopleNumber
+                    this.form.idNumber = idNumber
+                    this.form.customerName = userName
+                    this.form.currency = currency
+                    this.form.currencyMark = goldLogo
+                }
+                if(sessionStorage.getItem('nomUsefulPhrasesOpenCard')) {
+                    this.cardNumberJudge = true
+                    const { voucherNumber } = this.dataFlow
+                    this.form.voucherNumber = voucherNumber
+                }
+                if(sessionStorage.getItem('nomUsefulPhrasesOpenPassword')) {
+                    this.form.drawPassword = sessionStorage.getItem('nomUsefulPhrasesOpenPassword')
+                }
+
                 this.getFormData()
         
                 // this.$refs.clientNumber.focus()
@@ -275,19 +297,26 @@ export default{
         ...mapMutations({
             changeShowGoods: 'system/changeShowGoods',
             setDataFlow: 'system/setDataFlow',
-            setNeedsModule: 'system/setNeedsModule'
+            setNeedsModule: 'system/setNeedsModule',
+            setPopId: 'system/setPopId'
         }),
         getDataBlur() {
             console.log('???')
         },
         popUp1(text) {
-            this.$store.commit('system/changePop',{show:true,text, id: 1399})
+            this.$message.warning('请刷身份证');
+            this.setPopId('1399')
+            this.$router.push('/counter/list/')
         },
         popUp2(text) {
-            this.$store.commit('system/changePop',{show:true,text, id: 166})
+            this.$message.warning('请刷银行卡');
+            this.setPopId('166')
+            this.$router.push('/counter/list/')
         },
         popUp3(text) {
-            this.$store.commit('system/changePop',{show:true,text, id: 167})
+            this.$message.warning('请在密码器输入密码');
+            this.setPopId('167')
+            this.$router.push('/counter/list/')
         },
         getFormData(){
             const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,59,155'
diff --git a/src/store/modules/system.js b/src/store/modules/system.js
index a5a1b98..c06bab6 100644
--- a/src/store/modules/system.js
+++ b/src/store/modules/system.js
@@ -829,7 +829,8 @@ export default {
                     userName,
                     currency:'CNY人民币',
                     goldLogo:'钞户',
-                    peopleNumber
+                    peopleNumber,
+                    voucherNumber
                 }
             },
             '项目四': {
@@ -867,6 +868,7 @@ export default {
                 dataFlowPassword: 0,
                 dataFlow: {
                     // 客户姓名、币种、钞汇标识、定存编号（0912）、本金（开户时存的业务中的金额）、支取类别（现金）、支取方式（密码）
+                    voucherNumber,
                     userName,
                     currency:'CNY人民币',
                     goldLogo:'钞户',
@@ -1042,7 +1044,7 @@ export default {
                     depositTerm: '1年',
                     interest: 1.6,
                     totalMoney: 101.6,
-                    signDate: 3,
+                    signDate: '2001-03-01',
                     voucherNumber
                 }
             },
@@ -1797,7 +1799,7 @@ export default {
         changePop:(state,val)=>{
             state.showPop = val.show
             state.popText = val.text? val.text: ''
-            state.id = val.id
+            state.id = val.id? val.id: state.id
             if(!state.popText.includes('密码') && state.showPop && state.popText) {
                 state.showGoods = true;
             }