diff --git a/src/components/case/index.vue b/src/components/case/index.vue
index 26b2e82..cfc8584 100644
--- a/src/components/case/index.vue
+++ b/src/components/case/index.vue
@@ -132,7 +132,18 @@
     <!-- 遮罩层 -->
     <div class="absolute z-50 w-screen h-screen bg-transparent inset-0" v-show="showIt"></div> 
 
-     
+    <el-dialog
+      title="提示"
+      :visible.sync="closePaneJudge"
+      width="30%"
+      center>
+      <h4 class="antialiased text-center text-2xl">请选择你将进行的操作</h4>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="closePane()">再试一次</el-button>
+        <el-button type="primary" @click="closePane()">其他业务</el-button>
+      </span>
+    </el-dialog>
+    
   </div>
   
 </template>
@@ -168,6 +179,8 @@ export default {
   },
   data() {
     return {
+      closePaneJudge: false,
+      lockIt: false,
       intervalJudge: {},
       systemId: Setting.systemId,
       workbench: [],
@@ -341,6 +354,10 @@ export default {
     ...mapMutations({
       initState: 'system/initState'
     }),
+    closePane(){
+      this.closePaneJudge = false
+      this.reload()
+    },
     getQueryVariable(name) {
         var reg = new RegExp('(^|&)'+name+'=([^&]*)(&|$)')
         if(window.location.href.split('?')[1]){
@@ -529,6 +546,7 @@ export default {
             cancelButtonText: '取消',
             type: 'warning'
         }).then(() => {
+
             this.sureSubmit(true)
         }).catch(() => {
               this.$message({
@@ -537,7 +555,7 @@ export default {
               });
         });
     },
-      sureSubmit(judge){
+    sureSubmit(judge){
         // 初始化vuex中的state
         // this.initState();
         this.actEndTime = new Date().getTime();
@@ -585,6 +603,7 @@ export default {
                 sessionStorage.setItem('cid', cid)
                 sessionStorage.setItem('systemId', systemId)
                 sessionStorage.setItem('projectId', projectId)
+                this.lockIt = true
                 if(firstLoad) {
                   sessionStorage.setItem('firstLoad', firstLoad)
                 }
@@ -642,13 +661,13 @@ export default {
       }
     },
       //倒计时
-      countDown(timestamp){
-          this.timestamp = timestamp
-          this.sss = 1;
-          this.globalTimer = null;
-          clearInterval(this.globalTimer);
-          this.startCountFn()
-      },
+    countDown(timestamp){
+        this.timestamp = timestamp
+        this.sss = 1;
+        this.globalTimer = null;
+        clearInterval(this.globalTimer);
+        this.startCountFn()
+    },
     counterFn(counterTime) {
         if (this.timestamp){
             let countDown = (new Date(counterTime).getTime() - new Date().getTime()) / 1000
@@ -721,6 +740,8 @@ export default {
         sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
         sessionStorage.setItem('accountVoucher', JSON.stringify(formList))
         sessionStorage.setItem('accountPasswordAll', '')
+        // 初始化vuex中的state
+        this.initState();
         let params = {
             "projectId":projectId,
         }
@@ -802,7 +823,12 @@ export default {
       return param < 10 ? "0" + param : param;
     },
     toggleCase() {
-      this.$emit('update:showIt', !this.showIt)
+      if(!this.lockIt) {
+        this.$emit('update:showIt', !this.showIt)
+      }else {
+        this.closePaneJudge = true
+      }
+      
       // this.caseVisible = !this.caseVisible
     },
     collapse(){
diff --git a/src/components/dialog/index.vue b/src/components/dialog/index.vue
index 6f6d0e0..623efdc 100644
--- a/src/components/dialog/index.vue
+++ b/src/components/dialog/index.vue
@@ -26,7 +26,7 @@
                 <h2 class="text-red-500 text-2xl">提交后将不可更改，您确定要提交吗？</h2>
             </div>
             <div class="popBody" v-else-if="flow === 2">
-                <el-form ref="form2" :model="disForm" label-width="150px" >
+                <el-form ref="form2" :model="disForm" label-width="200px" >
                         <el-form-item label="授权柜员">
                         <el-input disabled v-model="disForm.name"></el-input>
                     </el-form-item>
@@ -37,7 +37,7 @@
             </div>
             <div class="popBody w-full" v-else>
                 <el-row :gutter="20">
-                    <el-form label-width="100px">
+                    <el-form label-width="200px">
                         <el-col :span="12">
                             <el-form-item v-for="(val, key) in leftObj" :key="key" :label="key + ':'">
                                 <div>{{ val }}</div>
@@ -481,6 +481,8 @@ export default {
             font-weight: 400;
         }
         .el-form-item__content{
+            padding-left: 30px;
+            text-align: left;
             font-family: PingFangSC-Semibold;
             font-size: 20px;
             color: #000000;
diff --git a/src/mixins/tipsBefore/index.js b/src/mixins/tipsBefore/index.js
index 69c7ef5..4d8021a 100644
--- a/src/mixins/tipsBefore/index.js
+++ b/src/mixins/tipsBefore/index.js
@@ -30,7 +30,12 @@ export default {
         
     },
     created() {
-
+        if(sessionStorage.getItem(this.moduleName)) {
+            const getBeforeData = JSON.parse(sessionStorage.getItem(this.moduleName))
+            for(const key in getBeforeData) {
+                this.form[key] = Number(getBeforeData[key])? Number(getBeforeData[key]): getBeforeData[key]
+            }
+        }
         if(this.inMyWork(this.moduleName)) {
             if(this.needsModule(this.moduleName)) {
                 this.isNeedBefore = true
@@ -47,12 +52,12 @@ export default {
             }
             
             // 这个业务是我们需要的，所以我们拿存的数据
-            if(sessionStorage.getItem(this.moduleName)) {
-                const getBeforeData = JSON.parse(sessionStorage.getItem(this.moduleName))
-                for(const key in getBeforeData) {
-                    this.form[key] = Number(getBeforeData[key])? Number(getBeforeData[key]): getBeforeData[key]
-                }
-            }
+            // if(sessionStorage.getItem(this.moduleName)) {
+            //     const getBeforeData = JSON.parse(sessionStorage.getItem(this.moduleName))
+            //     for(const key in getBeforeData) {
+            //         this.form[key] = Number(getBeforeData[key])? Number(getBeforeData[key]): getBeforeData[key]
+            //     }
+            // }
             
             
 
@@ -74,14 +79,23 @@ export default {
         // this.myTipBefore = null
 
         // 这个业务是我们需要的，所以我们存数据
-        if(!this.unNeed) {
-            let tmpForm = {}
-            for(const key in this.form) {
-                if(this.form[key] !== '') {
-                    tmpForm[key] = this.form[key]
-                }
+
+        let tmpForm = {}
+        for(const key in this.form) {
+            if(this.form[key] !== '') {
+                tmpForm[key] = this.form[key]
             }
-            sessionStorage.setItem(this.moduleName, JSON.stringify(tmpForm))
+        }
+        sessionStorage.setItem(this.moduleName, JSON.stringify(tmpForm))
+
+        if(!this.unNeed) {
+            // let tmpForm = {}
+            // for(const key in this.form) {
+            //     if(this.form[key] !== '') {
+            //         tmpForm[key] = this.form[key]
+            //     }
+            // }
+            // sessionStorage.setItem(this.moduleName, JSON.stringify(tmpForm))
         }
         
         if(this.tipsNefore) {
diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index fad40f0..d0622ac 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -62,7 +62,7 @@
 <!--        点击打开打印机-->
         <el-tooltip placement="top" popper-class="sth-popper" offset="-400">
             <div slot="content">
-                <img v-lazy="lazyImg[17]" class="contentHeight" alt="" />
+                <img v-lazy="lazyImg[17]" style="height: 50px;" alt="" />
             </div>
             <img class="sth printer cp" v-lazy="lazyImg[18]" alt="" @click="showData('打印机',7)" />
         </el-tooltip>
@@ -136,7 +136,7 @@
 
             <!-- 动画开始 -->
             <div v-if="popText==='密码器'"   style="width:800px;padding-right:150px;padding-top:80px">
-                <el-form :model="passwordForm" :rules="passwordRules" ref="form" label-width="180px">
+                <el-form :model="passwordForm" :rules="passwordRules" ref="form" label-width="180px" key="passwordFormpasswordAgain">
                     <el-form-item label="密码" prop="passwordAgain">
                         <el-input v-focus show-password v-model="passwordForm.passwordAgain" maxlength="6" onkeyup="{this.value=this.value.replace(/\D/g,'')}" autocomplete="off"></el-input>
                     </el-form-item>
@@ -144,7 +144,7 @@
                         <el-input show-password v-model="passwordForm.password"  maxlength="6" onkeyup="this.value=this.value.replace(/\D/g,'')" autocomplete="off"></el-input>
                     </el-form-item> -->
                     <!-- <el-form-item label="确认密码" prop="password2" v-if="systemId == '62,1' || systemId == '62,2' || systemId == '62,3'"> -->
-                    <el-form-item label="确认密码" prop="password2">
+                    <el-form-item label="确认密码" prop="password2" key="passwordFormpassword2" v-if="id == '62,1' || id == '62,2' || id == '62,3'">
                         <el-input show-password v-model="passwordForm.password2"  maxlength="6" onkeyup="this.value=this.value.replace(/\D/g,'')" autocomplete="off"></el-input>
                     </el-form-item>
                 </el-form>
@@ -308,10 +308,10 @@
 
         <!-- 图片查看器 -->
         <el-dialog
-            custom-class="data-dia imgIndex"
-            class=""
+            custom-class="data-dia "
+            class="imgIndex"
             :visible.sync="showImg"
-            width="634px"
+            width="850px"
             >
             <img :src="imgSrc" class="imgPop imgIndex min-w-full " alt="">
 <!--            <div :style="{'background':'url('+imgSrc+')','height':'500px','background-repeat': 'no-repeat',-->
@@ -357,12 +357,26 @@
             :visible.sync="peopleJudge"
             custom-class="2xl:w-7/12 xl:w-9/12 lg:w-full h-auto rounded-2xl border-2 border-gray-600"
             center>
-            <h3 class="text-4xl antialiased text-center">客户: 你好。</h3>
+            <h3 class="text-2xl antialiased text-center">请选择客户签字或返还资料</h3>
             <span slot="footer" class="dialog-footer">
-                <el-button @click="peopleDoing(1)">客户签字</el-button>
-                <el-button type="primary" @click="peopleDoing(2)">返还资料</el-button>
+                <el-button @click="peopleDoing(1)" class="w-52 h-14">客户签字</el-button>
+                <el-button type="primary" @click="peopleDoing(2)" class="w-52 h-14">返还资料</el-button>
             </span>
         </el-dialog>
+        
+        <el-dialog
+            title="提示"
+            :visible.sync="voucherCardGet"
+            width="30%"
+            center>
+            <h3 class="text-2xl antialiased text-center">请问需要取出几张银行卡</h3>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="voucherCardGetIt(1)">取出一张</el-button>
+                <el-button type="primary" @click="voucherCardGetIt(2)">取出两张</el-button>
+            </span>
+        </el-dialog>
+
+
     </div>
 </template>
 
@@ -409,6 +423,9 @@ export default {
             }
         };
         return {
+            voucherCardGet: false,
+            voucherCardNumber: 0,
+            
             // 方便操作的数据：调整弹出框高度
             fit: 'scale-down',
             controlGoodsDblClickFn: null,
@@ -434,7 +451,7 @@ export default {
                   dateBirthYear:'1994',
                   dateBirthMonth:'4',
                   dateBirthDay:'1',
-                  address:'奥斯卡巅峰计划拉水电费啥地方',
+                  address:'在山的那边海的那边',
                   idCardNo:'465852346854168479'},
               {name:'开户申请书', src:require('@/assets/img/goods/khsqs.png'), id:14},
               {name:'现金', src:require('@/assets/img/goods/cash-sm.png'), id:15},
@@ -1344,6 +1361,12 @@ export default {
             outThingsGoods: 'system/outThingsGoods',
             setTipsOperate: 'system/setTipsOperate'
         }),
+        voucherCardGetIt(number) {
+            if(number === 2) {
+                
+            }
+            this.voucherCardGet = false
+        },
         changePeopleJudge() {
             this.peopleJudge = true;
         },
@@ -1573,15 +1596,15 @@ export default {
             }else if(this.popText.includes('密码器')) {
                 // if(this.systemId == '62,1' || this.systemId == '62,2' || this.systemId == '62,3') {
                 //     if(this.passwordForm.password2 !== this.passwordForm.passwordAgain) {
-                //         this.setTipsOperate('您输入的密码和确认密码不一致!')
+                //         this.setTipsOperate('两次输入密码不一致')
                 //         return
                 //     }
                 // }
                 if(this.passwordForm.passwordAgain.length !== 6) {
                     this.setTipsOperate('您输入的密码不足6位!')
                     return
-                }else if(this.passwordForm.password2 !== this.passwordForm.passwordAgain) {
-                    this.setTipsOperate('您输入的密码和确认密码不一致!')
+                }else if((this.id == '62,1' || this.id == '62,2' || this.id == '62,3') && this.passwordForm.password2 !== this.passwordForm.passwordAgain) {
+                    this.setTipsOperate('两次输入密码不一致')
                     return
                 }
             }else if(this.popText.includes('身份证扫描')) {
@@ -2030,7 +2053,7 @@ export default {
                     // that.outThingsGoods([that.goodsShelfTotalData[evt.oldIndex].id])
                 }else if (this.nbm == 7){ //打印机
                     if(this.goodState.length === 0) {
-                        this.setTipsOperate('请放入证件!')
+                        this.setTipsOperate('请放入打印资料')
                         return
                     }
                     let projectId = sessionStorage.getItem('projectId')
@@ -2061,7 +2084,7 @@ export default {
                             }
                         }
                     }else{
-                        this.setTipsOperate('您输入的密码和确认密码不一致!')
+                        this.setTipsOperate('两次输入密码不一致!')
                     }
                 }else if (this.nbm == 9){//资料
                     if(this.goodState.length === 0) {
@@ -2141,7 +2164,24 @@ export default {
             const targetDom = this.$refs.goods.getBoundingClientRect()
             return evt.originalEvent.pageX<targetDom.right&&evt.originalEvent.pageX>targetDom.left && evt.originalEvent.pageY<targetDom.bottom&&evt.originalEvent.pageY>targetDom.top
         },
-
+        // inputListenCard(val, prop) {
+        //     const tmpCheck = val.substr(val.length-1, 1);
+        //     if(tmpCheck === ' ') {
+        //         return;
+        //     }
+        //     if(val === '') {
+        //         this[prop] = val;
+        //         return;
+        //     }
+        //     const tmpGet = Number(val.replace(/\D+/, ''))
+        //     if(tmpGet <= 2 && tmpGet>0) {
+        //         this[prop] = tmpGet
+        //     }else {
+        //         this.setTipsOperate('最多只能取出两张')
+        //         this[prop] = 2
+        //     }
+            
+        // }
     }
 };
 </script>
diff --git a/src/pages/lobbyManager/list/index.vue b/src/pages/lobbyManager/list/index.vue
index 7293477..5011892 100644
--- a/src/pages/lobbyManager/list/index.vue
+++ b/src/pages/lobbyManager/list/index.vue
@@ -366,7 +366,7 @@ export default {
             }).catch((error)=>{
                 this.$message({
                     showClose: true,
-                    message: '网络可能有问题哦,取号失败',
+                    message: '网络可能有问题,取号失败',
                     type: 'warning',
                     center: true
                 });
@@ -417,7 +417,7 @@ export default {
             }).catch((error)=>{
                 this.$message({
                     showClose: true,
-                    message: '网络可能有问题哦,填单失败',
+                    message: '网络可能有问题,填单失败',
                     type: 'warning',
                     center: true
                 });
@@ -518,7 +518,7 @@ export default {
             }).catch((error)=>{
                 this.$message({
                     showClose: true,
-                    message: '网络可能有问题哦,填单失败',
+                    message: '网络可能有问题,填单失败',
                     type: 'warning',
                     center: true
                 });
diff --git a/src/pages/manage/list/client/consumerClient.vue b/src/pages/manage/list/client/consumerClient.vue
index a14d7ab..33133fd 100644
--- a/src/pages/manage/list/client/consumerClient.vue
+++ b/src/pages/manage/list/client/consumerClient.vue
@@ -239,8 +239,8 @@ export default {
             // }
             this.form.sex = sex
             this.form.birthday = birthday
-            this.form.nationality = nationality
-            this.form.mailbox = mailbox
+            // this.form.nationality = nationality
+            // this.form.mailbox = mailbox
         }
         this.getFormData()
     },
diff --git a/src/pages/manage/list/client/corporateClient.vue b/src/pages/manage/list/client/corporateClient.vue
index 1c6adda..2b697a7 100644
--- a/src/pages/manage/list/client/corporateClient.vue
+++ b/src/pages/manage/list/client/corporateClient.vue
@@ -148,6 +148,10 @@ export default {
     created() {
         // firmClientIdentity
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('firmClientIdentity')) {
+                this.idNumberJudge = true
+                this.form.idNumber = this.dataFlow.idNumber || '441515199812064569'
+            }
             return
         }
         if(sessionStorage.getItem('firmClientIdentity')) {
diff --git a/src/pages/manage/list/dayEnd/branchDayEnd.vue b/src/pages/manage/list/dayEnd/branchDayEnd.vue
index a35b5b2..1c95801 100644
--- a/src/pages/manage/list/dayEnd/branchDayEnd.vue
+++ b/src/pages/manage/list/dayEnd/branchDayEnd.vue
@@ -77,7 +77,6 @@ export default {
     
     .myPadding {
         padding: 24px 0 24px 24px;
-        background-color: red;
     }
 
     /deep/.el-input input {
diff --git a/src/pages/manage/list/personal/callDeposits/accountClosed.vue b/src/pages/manage/list/personal/callDeposits/accountClosed.vue
index b32ebc5..dac760a 100644
--- a/src/pages/manage/list/personal/callDeposits/accountClosed.vue
+++ b/src/pages/manage/list/personal/callDeposits/accountClosed.vue
@@ -280,10 +280,21 @@ export default{
         }
     },
     created() {
+        if(sessionStorage.getItem('nomCallDepositClosedPassword')) {
+            this.form.drawPassword = sessionStorage.getItem('nomCallDepositClosedPassword')
+        }
+
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('nomCallDepositClosedCard')) {
+                this.cardNumberJudge = true
+                this.form.voucherNumber = this.dataFlow.voucherNumber || '159753'
+            }
+            if(sessionStorage.getItem('nomCallDepositClosedCard2')) {
+                this.idNumberJudge = true
+                this.form.idNumber = this.dataFlow.idNumber || '441515199812064569'
+            }
             return
         }
-        console.log('???')
         if(sessionStorage.getItem('nomCallDepositClosedCard')) {
             this.cardNumberJudge = true
             const { noticeType, depositNumber, capital, interest, totalMoney, idNumber, 
@@ -315,9 +326,7 @@ export default{
             this.form.idNumber = idNumber
         }
 
-        if(sessionStorage.getItem('nomCallDepositClosedPassword')) {
-            this.form.drawPassword = sessionStorage.getItem('nomCallDepositClosedPassword')
-        }
+        
 
         const parentId =  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,26,38,289'
         const cards = {
diff --git a/src/pages/manage/list/personal/callDeposits/openAccount.vue b/src/pages/manage/list/personal/callDeposits/openAccount.vue
index 237dbff..8749b27 100644
--- a/src/pages/manage/list/personal/callDeposits/openAccount.vue
+++ b/src/pages/manage/list/personal/callDeposits/openAccount.vue
@@ -268,7 +268,19 @@ export default{
         }
     },
     created() {
+        if(sessionStorage.getItem('nomCallDepositOpenPassword')) {
+            this.form.drawPassword = sessionStorage.getItem('nomCallDepositOpenPassword')
+        }
+
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('nomCallDepositOpen2')) {
+                this.idNumberJudge = true
+                this.form.idNumber = this.dataFlow.idNumber || '441515199812064569'
+            }
+            if(sessionStorage.getItem('nomCallDepositOpen3')) {
+                this.cardNumberJudge = true
+                this.form.voucherNumber = this.dataFlow.voucherNumber || '159753'
+            }
             return
         }
         if(sessionStorage.getItem('nomCallDepositOpen2')) {
@@ -286,9 +298,7 @@ export default{
             this.cardNumberJudge = true
             this.form.voucherNumber = voucherNumber
         }
-        if(sessionStorage.getItem('nomCallDepositOpenPassword')) {
-            this.form.drawPassword = sessionStorage.getItem('nomCallDepositOpenPassword')
-        }
+        
         this.getFormData()
     },
     methods: {
diff --git a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
index 34b7c03..668de1c 100644
--- a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
+++ b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
@@ -116,7 +116,17 @@ export default{
     created() {
         // 混入函数判定，如果不需要则不执行初始化代码
 
+        if(sessionStorage.getItem('nomCurrentCancellPassword')) {
+            this.form.drawPassword = sessionStorage.getItem('nomCurrentCancellPassword')
+        }
+
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('nomCurrentCancellCard2')) {
+                this.idNumberJudge = true
+                const tmpId = this.dataFlow.idNumber || '441421198656412356'
+                this.form.idNumber = tmpId
+            }
+            
             return
         }
 
@@ -129,9 +139,7 @@ export default{
             this.form.idNumber = idNumber
         }
 
-        if(sessionStorage.getItem('nomCurrentCancellPassword')) {
-            this.form.drawPassword = sessionStorage.getItem('nomCurrentCancellPassword')
-        }
+        
 
 
         const parentId =  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,26,57,67'
diff --git a/src/pages/manage/list/personal/currentAccount/deposit.vue b/src/pages/manage/list/personal/currentAccount/deposit.vue
index 343f640..316c692 100644
--- a/src/pages/manage/list/personal/currentAccount/deposit.vue
+++ b/src/pages/manage/list/personal/currentAccount/deposit.vue
@@ -4,7 +4,7 @@
             <el-row :gutter="20" style="margin: 0">
                 <el-form ref="form" :model="form" label-width="120px" :rules="rules">
                     <el-col :span="10" :offset="1">
-                        <el-form-item label="卡号">
+                        <el-form-item label="卡号" required>
 
                             <div v-if='!cardNumberJudge' class="idCard" @click="popUp('刷卡器')">
                                 <p>请刷卡</p>
@@ -123,6 +123,11 @@ export default{
   created() {
 
     if(this.isNeedBefore) {
+        if(sessionStorage.getItem('nomBusinessDepositCard')) {
+            this.cardNumberJudge = true
+            const tmpVoucher = this.dataFlow.voucherNumber || '159753'
+            this.form.voucherNumber = tmpVoucher
+        }
         return
     }
 
diff --git a/src/pages/manage/list/personal/currentAccount/openAccount.vue b/src/pages/manage/list/personal/currentAccount/openAccount.vue
index d920756..caf4ef3 100644
--- a/src/pages/manage/list/personal/currentAccount/openAccount.vue
+++ b/src/pages/manage/list/personal/currentAccount/openAccount.vue
@@ -10,7 +10,7 @@
                         <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>
+                        <el-select v-model="form.currency" placeholder="请选择" ref="currency">
                             <el-option label='CNY人民币' :value="12" :key="12">CNY人民币</el-option>
                         </el-select>
                     </el-form-item>
@@ -64,8 +64,8 @@
                               100: '资本临时户' -->
                                 <el-option label="一类户" :value="16"> </el-option>
                                 <el-option label="二类户" :value="17"> </el-option>
-                                <el-option label="结算户" :value="97"> </el-option>
-                                <el-option label="委托保障金户" :value="100"> </el-option>
+                                <!-- <el-option label="结算户" :value="97"> </el-option>
+                                <el-option label="委托保障金户" :value="100"> </el-option> -->
                             </el-select>
                         </el-form-item>
                         <el-form-item label="支取方式" prop="drawWay">
@@ -124,8 +124,8 @@
                 <el-select v-model="form.accountTypesTwo" placeholder="请选择">
                   <el-option label="一类户" :value="16"> </el-option>
                   <el-option label="二类户" :value="17"> </el-option>
-                  <el-option label="结算户" :value="97"> </el-option>
-                  <el-option label="委托保障金户" :value="100"> </el-option>
+                  <!-- <el-option label="结算户" :value="97"> </el-option>
+                  <el-option label="委托保障金户" :value="100"> </el-option> -->
                 </el-select>
               </el-form-item>
               <el-form-item label="支取方式" required>
@@ -184,8 +184,8 @@
                 <el-select v-model="form.accountTypesThree"  placeholder="请选择">
                   <el-option label="一类户" :value="16"> </el-option>
                   <el-option label="二类户" :value="17"> </el-option>
-                  <el-option label="结算户" :value="97"> </el-option>
-                  <el-option label="委托保障金户" :value="100"> </el-option>
+                  <!-- <el-option label="结算户" :value="97"> </el-option>
+                  <el-option label="委托保障金户" :value="100"> </el-option> -->
                 </el-select>
               </el-form-item>
               <el-form-item label="支取方式" required>
@@ -267,7 +267,7 @@ export default {
               drawPassword2: '', // 支取密码2
               drawPassword3: '', // 支取密码3
               userNumber: '', // 客户号
-              currency: 12, // 币种
+              currency: '', // 币种
               userName: '', // 客户姓名
               goldLogo: '', // 钞汇标识
               accountQuality: '', // 账户性质
@@ -401,9 +401,6 @@ export default {
         return
       }
 
-      console.log('s..asdasd')
-      
-
       const { peopleNumber, userName } = this.dataFlow
       this.form.userNumber = peopleNumber
       this.form.userName = userName
@@ -507,16 +504,16 @@ export default {
                             else if (list[i].answerId == '77') {
                               this.form.drawPassword = list[i].emptyTwo
                             }
-                            else if (list[i].answerId == '270') {
-                              this.form.accountQualitysTwo = +list[i].emptyTwo
-                            }
-                            else if (list[i].answerId == '271') {this.form.voucherTypesTwo = +list[i].emptyTwo}
-                            else if (list[i].answerId == '272') {this.form.accountTypesTwo = +list[i].emptyTwo}
-                            else if (list[i].answerId == '274') {this.form.drawWaysTwo = +list[i].emptyTwo}
-                            else if (list[i].answerId == '276') {this.form.accountQualitysThree = +list[i].emptyTwo}
-                            else if (list[i].answerId == '277') {this.form.voucherTypesThree = +list[i].emptyTwo}
-                            else if (list[i].answerId == '278') {this.form.accountTypesThree = +list[i].emptyTwo}
-                            else if (list[i].answerId == '280') {this.form.drawWaysThree = +list[i].emptyTwo}
+                            // else if (list[i].answerId == '270') {
+                            //   this.form.accountQualitysTwo = +list[i].emptyTwo
+                            // }
+                            // else if (list[i].answerId == '271') {this.form.voucherTypesTwo = +list[i].emptyTwo}
+                            // else if (list[i].answerId == '272') {this.form.accountTypesTwo = +list[i].emptyTwo}
+                            // else if (list[i].answerId == '274') {this.form.drawWaysTwo = +list[i].emptyTwo}
+                            // else if (list[i].answerId == '276') {this.form.accountQualitysThree = +list[i].emptyTwo}
+                            // else if (list[i].answerId == '277') {this.form.voucherTypesThree = +list[i].emptyTwo}
+                            // else if (list[i].answerId == '278') {this.form.accountTypesThree = +list[i].emptyTwo}
+                            // else if (list[i].answerId == '280') {this.form.drawWaysThree = +list[i].emptyTwo}
                         }
                         if(sessionStorage.getItem('accountPassword')) {
                             this.form.drawPassword = sessionStorage.getItem('accountPassword')
@@ -669,6 +666,7 @@ export default {
           //   });
           //   return;
           // }
+          console.log(this.form)
           this.$refs.form.validate(myValidate(() => {
                 
 
@@ -815,8 +813,16 @@ export default {
               this.count = this.count-1;
               sessionStorage.setItem('openAccountCount', this.count)
               if (this.count < 1){this.count = 0}
-              if (this.count == 0){this.formTwo = false}
-              if (this.count == 1){this.formThree = false}
+              if (this.count == 0){
+                sessionStorage.removeItem('accountPasswordTwo')
+                sessionStorage.removeItem('accountVoucherTwo')
+                this.formTwo = false
+              }
+              if (this.count == 1){
+                sessionStorage.removeItem('accountVoucherThree')
+                sessionStorage.removeItem('accountPasswordThree')
+                this.formThree = false
+              }
                 // this.second.splice(index,1)
                 this.setTipsOperate('删除成功!')
             }).catch(() => {
@@ -891,9 +897,31 @@ export default {
         })
     },
     watch: {
-      count(newVal) {
-        console.log(newVal)
+      formTwo: {
+        handler(newVal) {
+          if(!newVal) {
+            this.form.drawWaysTwo = ''
+            this.form.accountQualitysTwo = ''
+            this.form.voucherTypesTwo = ''
+            this.form.accountTypesTwo = ''
+            this.form.drawPassword2 = ''
+          }
+        },
+        immediate: true
+      },
+      formThree: {
+        handler(newVal) {
+          if(!newVal) {
+            this.form.drawWaysThree = ''
+            this.form.accountQualitysThree = ''
+            this.form.voucherTypesThree = ''
+            this.form.accountTypesThree = ''
+            this.form.drawPassword3 = ''
+          }
+        },
+        immediate: true
       }
+      
     },
 
 };
diff --git a/src/pages/manage/list/personal/currentAccount/settle.vue b/src/pages/manage/list/personal/currentAccount/settle.vue
index 628b1a9..3a36dc1 100644
--- a/src/pages/manage/list/personal/currentAccount/settle.vue
+++ b/src/pages/manage/list/personal/currentAccount/settle.vue
@@ -177,7 +177,15 @@ export default{
         }
     },
     created() {
+        if(sessionStorage.getItem('nomCurrentSettlePassword')) {
+            this.form.drawPassword = sessionStorage.getItem('nomCurrentSettlePassword')
+        }
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('nomCurrentSettleCard')) {
+                this.cardNumberJudge = true
+                const tmpCardNumber = this.dataFlow.voucherNumber || '159753'
+                this.form.cardNumber = tmpCardNumber
+            }
             return
         }
         if(sessionStorage.getItem('nomCurrentSettleCard')) {
@@ -193,11 +201,6 @@ export default{
             this.form.totalMoney = totalMoney
         }
 
-        if(sessionStorage.getItem('nomCurrentSettlePassword')) {
-            this.form.drawPassword = sessionStorage.getItem('nomCurrentSettlePassword')
-        }
-        
-
         const parentId =  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,26,57,66'
         const cardArr = {
             // 103: 'nomCurrentSettleCard',
diff --git a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
index 209cb50..a8111e1 100644
--- a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
+++ b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
@@ -189,11 +189,19 @@ export default{
         }
     },
    created() {
+    if(sessionStorage.getItem('nomCurrentTransferPassword')) {
+        this.form.drawPassword = sessionStorage.getItem('nomCurrentTransferPassword')
+    }
     if(this.isNeedBefore) {
+        if(sessionStorage.getItem('nomCurrentTransferCard')) {
+            this.cardNumberJudge = true
+            this.form.cardNumber = this.dataFlow.voucherNumber || '159753'
+
+        }
         return
     }
     if(sessionStorage.getItem('nomCurrentTransferCard')) {
-        this.cardNumberJudge = true
+        
         const { currency, userName, goldLogo, voucherNumber } = this.dataFlow
         this.form.cardNumber = voucherNumber
         this.form.currency = currency
@@ -201,9 +209,7 @@ export default{
         this.form.goldLogo = goldLogo
     }
 
-    if(sessionStorage.getItem('nomCurrentTransferPassword')) {
-        this.form.drawPassword = sessionStorage.getItem('nomCurrentTransferPassword')
-    }
+    
 
     const parentId =  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,26,57,65'
     const cardArr = {
diff --git a/src/pages/manage/list/personal/currentAccount/withdrawal.vue b/src/pages/manage/list/personal/currentAccount/withdrawal.vue
index 0ea34e5..5603f38 100644
--- a/src/pages/manage/list/personal/currentAccount/withdrawal.vue
+++ b/src/pages/manage/list/personal/currentAccount/withdrawal.vue
@@ -84,7 +84,14 @@ export default{
         NeedBefore
     },
     created() {
+        if(sessionStorage.getItem('nomCurrentWithdrawalPassword')) {
+            this.form.drawPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword')
+        }
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('nomCurrentWithdrawalCard')) {
+                this.cardNumberJudge = true
+                this.form.cardNumber = this.dataFlow.voucherNumber || '159753'
+            }
             return
         }
         if(sessionStorage.getItem('nomCurrentWithdrawalCard')) {
@@ -98,9 +105,7 @@ export default{
             this.form.cardNumber = voucherNumber
         }
 
-        if(sessionStorage.getItem('nomCurrentWithdrawalPassword')) {
-            this.form.drawPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword')
-        }
+        
         this.getFormData()
         
     },
diff --git a/src/pages/manage/list/personal/timeDeposit/deposit.vue b/src/pages/manage/list/personal/timeDeposit/deposit.vue
index abe9cd5..b55e4c2 100644
--- a/src/pages/manage/list/personal/timeDeposit/deposit.vue
+++ b/src/pages/manage/list/personal/timeDeposit/deposit.vue
@@ -270,7 +270,15 @@ export default{
         }
     },
     created() {
+        if(sessionStorage.getItem('nomtimeDepositlPassword')) {
+            this.form.drawPassword = sessionStorage.getItem('nomtimeDepositlPassword')
+        }
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('nomtimeDeposit1')) {
+                this.cardNumberJudge = true
+                this.form.voucherNumber = this.dataFlow.voucherNumber || '159753'
+            }
+            
             return
         }
         if(sessionStorage.getItem('nomtimeDeposit1')) {
@@ -282,9 +290,7 @@ export default{
             this.form.voucherNumber = voucherNumber
         }
         
-        if(sessionStorage.getItem('nomtimeDepositlPassword')) {
-            this.form.drawPassword = sessionStorage.getItem('nomtimeDepositlPassword')
-        }
+        
 
 
         this.getFormData()
diff --git a/src/pages/manage/list/personal/timeDeposit/openAccount.vue b/src/pages/manage/list/personal/timeDeposit/openAccount.vue
index c98c351..726e2cc 100644
--- a/src/pages/manage/list/personal/timeDeposit/openAccount.vue
+++ b/src/pages/manage/list/personal/timeDeposit/openAccount.vue
@@ -221,7 +221,20 @@ export default{
         }
     },
     created() {
+        if(sessionStorage.getItem('nomtimeOpenAccountPassword')) {
+            this.form.drawPassword = sessionStorage.getItem('nomtimeOpenAccountPassword')
+        }
+
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('nomtimeOpenAccount1')) {
+                this.idNumberJudge = true
+                this.form.idNumber = this.dataFlow.idNumber || '441515199812064569'
+            }
+            if(sessionStorage.getItem('nomtimeOpenAccount2')) {
+                this.cardNumberJudge = true
+                this.form.voucherNumber = this.dataFlow.voucherNumber || '159753'
+            }
+
             return
         }
         this.form.clientNumber = this.dataFlow.peopleNumber
@@ -243,9 +256,7 @@ export default{
             this.form.voucherNumber = voucherNumber
         }
 
-        if(sessionStorage.getItem('nomtimeOpenAccountPassword')) {
-            this.form.drawPassword = sessionStorage.getItem('nomtimeOpenAccountPassword')
-        }
+        
         this.getFormData()
   },
     mounted() {
diff --git a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
index 71c5b06..61cd200 100644
--- a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
+++ b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
@@ -86,7 +86,16 @@ export default{
         MyDialog
     },
     created() {
+        if(sessionStorage.getItem('nomtimeDepositWithdrawalPassword2')) {
+            this.form.drawPassword = sessionStorage.getItem('nomtimeDepositWithdrawalPassword2')
+        }
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('nomtimeDepositWithdrawal1')) {
+                this.cardNumberJudge = true
+                this.form.voucherNumber = this.dataFlow.voucherNumber || '159753'
+            }
+            
+
             return
         }
         const { withdrawWay } = this.dataFlow
@@ -108,9 +117,7 @@ export default{
                 // this.form.withdrawWay = withdrawWay
             }
 
-            if(sessionStorage.getItem('nomtimeDepositWithdrawalPassword2')) {
-                this.form.drawPassword = sessionStorage.getItem('nomtimeDepositWithdrawalPassword2')
-            }
+            
         }else {
             this.form.interest = 0.00
 
@@ -353,12 +360,17 @@ export default{
         },
         popUp(text) {
             // this.$store.commit('system/changePop',{show:true,text, id: '144,1'})
-            const { withdrawWay } = this.dataFlow
-            if(withdrawWay === 126) {
-                this.setPopId('144,2')
-            }else {
+            if(this.isNeedBefore) {
                 this.setPopId('144,1')
+            }else {
+                const { withdrawWay } = this.dataFlow
+                if(withdrawWay === 126) {
+                    this.setPopId('144,2')
+                }else {
+                    this.setPopId('144,1')
+                }
             }
+            
             this.setTipsOperate('请刷银行卡');
             
             
@@ -367,12 +379,17 @@ export default{
         },
         popUp2(text) {
             // this.$store.commit('system/changePop',{show:true,text, id: '154'})
-            const { withdrawWay } = this.dataFlow
-            if(withdrawWay === 126) {
-                this.setPopId('154,2')
-            }else {
+            if(this.isNeedBefore) {
                 this.setPopId('154')
+            }else {
+                const { withdrawWay } = this.dataFlow
+                if(withdrawWay === 126) {
+                    this.setPopId('154,2')
+                }else {
+                    this.setPopId('154')
+                }
             }
+            
             this.setTipsOperate('请在密码器输入密码');
             
             sessionStorage.setItem('computerPath', this.$route.fullPath)
diff --git a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
index 26e082e..b8291c9 100644
--- a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
@@ -117,7 +117,18 @@ export default{
     },
     mixins: [ TipsBefore ],
     created() {
+        if(sessionStorage.getItem('nomUsefulPhrasesClosedPassword')) {
+            this.form.drawPassword = sessionStorage.getItem('nomUsefulPhrasesClosedPassword')
+        }
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('nomUsefulPhrasesClosed')) {
+                this.idNumberJudge = true
+                this.form.idNumber = this.dataFlow.idNumber || '441515199812064569'
+            }
+            if(sessionStorage.getItem('nomUsefulPhrasesClosed2')) {
+                this.cardNumberJudge = true
+                this.form.voucherNumber = this.dataFlow.voucherNumber || '159753'
+            }
             return
         }
         if(sessionStorage.getItem('nomUsefulPhrasesClosed')) {
@@ -141,9 +152,7 @@ export default{
             this.form.depositTerm = depositTerm
             console.log(depositTerm)
         }
-        if(sessionStorage.getItem('nomUsefulPhrasesClosedPassword')) {
-            this.form.drawPassword = sessionStorage.getItem('nomUsefulPhrasesClosedPassword')
-        }
+        
 
         this.getFormData()
     },
diff --git a/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue b/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue
index 7bd5c90..5ef6869 100644
--- a/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue
@@ -74,7 +74,14 @@ export default{
         MyDialog
     },
     created() {
+        if(sessionStorage.getItem('nomUsefulPhrasesContinuePassword')) {
+            this.form.drawPassword = sessionStorage.getItem('nomUsefulPhrasesContinuePassword')
+        }
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('nomUsefulPhrasesContinueCard')) {
+                this.cardNumberJudge = true
+                this.form.voucherNumber = this.dataFlow.voucherNumber
+            }
             return
         }
         if(sessionStorage.getItem('nomUsefulPhrasesContinueCard')) {
@@ -88,9 +95,7 @@ export default{
             this.form.goldLogo = goldLogo
             this.form.monthDeposit = monthDeposit
         }
-        if(sessionStorage.getItem('nomUsefulPhrasesContinuePassword')) {
-            this.form.drawPassword = sessionStorage.getItem('nomUsefulPhrasesContinuePassword')
-        }
+        
         this.getFormData()
     },
     data(){
diff --git a/src/pages/manage/list/personal/usefulPhrases/openAccount.vue b/src/pages/manage/list/personal/usefulPhrases/openAccount.vue
index 1fbc92b..828d697 100644
--- a/src/pages/manage/list/personal/usefulPhrases/openAccount.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/openAccount.vue
@@ -104,7 +104,19 @@ export default{
     },
     mixins: [ TipsBefore ],
     created() {
+        if(sessionStorage.getItem('nomUsefulPhrasesOpenPassword')) {
+            this.form.drawPassword = sessionStorage.getItem('nomUsefulPhrasesOpenPassword')
+        }
+
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('nomUsefulPhrasesOpenCard2')) {
+                this.idNumberJudge = true
+                this.form.idNumber = this.dataFlow.idNumber || '441515199812064569'
+            }
+            if(sessionStorage.getItem('nomUsefulPhrasesOpenCard')) {
+                this.cardNumberJudge = true
+                this.form.voucherNumber = this.dataFlow.voucherNumber || '159753'
+            }
             return
         }
         if(sessionStorage.getItem('nomUsefulPhrasesOpenCard2')) {
@@ -123,9 +135,7 @@ export default{
             const { voucherNumber } = this.dataFlow
             this.form.voucherNumber = voucherNumber
         }
-        if(sessionStorage.getItem('nomUsefulPhrasesOpenPassword')) {
-            this.form.drawPassword = sessionStorage.getItem('nomUsefulPhrasesOpenPassword')
-        }
+        
 
         this.getFormData()
         
diff --git a/src/pages/manage/list/servicesAccount/passwordChange.vue b/src/pages/manage/list/servicesAccount/passwordChange.vue
index 8368d47..0f44776 100644
--- a/src/pages/manage/list/servicesAccount/passwordChange.vue
+++ b/src/pages/manage/list/servicesAccount/passwordChange.vue
@@ -162,7 +162,22 @@ export default{
         }
     },
     created() {
+        if(sessionStorage.getItem('servicesPasswordChange3')) {
+            this.form.payPassword = sessionStorage.getItem('servicesPasswordChange3')
+        }
+        if(sessionStorage.getItem('servicesPasswordChange4')) {
+            this.form.newPayPassword = sessionStorage.getItem('servicesPasswordChange4')
+        }
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('servicesPasswordChange')) {
+                this.idNumberJudge = true
+                this.form.idNumber = this.dataFlow.idNumber || '441515199812064569'
+            }
+            if(sessionStorage.getItem('servicesPasswordChange2')) {
+                this.cardNumberJudge = true
+                this.form.voucherNumber = this.dataFlow.voucherNumber || '159753'
+            }
+
             return
         }
         if(sessionStorage.getItem('servicesPasswordChange')) {
@@ -175,12 +190,7 @@ export default{
             const { voucherNumber } = this.dataFlow
             this.form.voucherNumber = voucherNumber
         }
-        if(sessionStorage.getItem('servicesPasswordChange3')) {
-            this.form.payPassword = sessionStorage.getItem('servicesPasswordChange3')
-        }
-        if(sessionStorage.getItem('servicesPasswordChange4')) {
-            this.form.newPayPassword = sessionStorage.getItem('servicesPasswordChange4')
-        }
+        
         
 
         const parentId =  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,28,316'
diff --git a/src/pages/manage/list/servicesAccount/passwordLost.vue b/src/pages/manage/list/servicesAccount/passwordLost.vue
index 9ffc192..d6a3f1c 100644
--- a/src/pages/manage/list/servicesAccount/passwordLost.vue
+++ b/src/pages/manage/list/servicesAccount/passwordLost.vue
@@ -114,6 +114,14 @@ export default{
     },
     created() {
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('servicesPasswordLost')) {
+                this.cardNumberJudge = true
+                this.form.voucherNumber = this.dataFlow.voucherNumber || '159753'
+            }
+            if(sessionStorage.getItem('servicesPasswordLost2')) {
+                this.idNumberJudge = true
+                this.form.idNumber = this.dataFlow.idNumber || '441515199812064569'
+            }
             return
         }
         if(sessionStorage.getItem('servicesPasswordLost')) {
diff --git a/src/pages/manage/list/servicesAccount/relieveLost.vue b/src/pages/manage/list/servicesAccount/relieveLost.vue
index 88df197..8d85ac1 100644
--- a/src/pages/manage/list/servicesAccount/relieveLost.vue
+++ b/src/pages/manage/list/servicesAccount/relieveLost.vue
@@ -206,7 +206,18 @@ export default{
         // 341: 'servicesPasswordRelieveLost',
             // 337: 'servicesPasswordRelieveLost2',
             // 343: 'servicesPasswordRelievePassword',
+        if(sessionStorage.getItem('servicesPasswordRelievePassword')) {
+            this.form.payPassword = sessionStorage.getItem('servicesPasswordRelievePassword')
+        }
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('servicesPasswordRelieveLost')) {
+                this.idNumberJudge = true
+                this.form.idNumber = this.dataFlow.idNumber || '441515199812064569'
+            }
+            if(sessionStorage.getItem('servicesPasswordRelieveLost2')) {
+                this.cardNumberJudge = true
+                this.form.voucherNumber = this.dataFlow.voucherNumber || '159753'
+            }
             return
         }
         if(sessionStorage.getItem('servicesPasswordRelieveLost')) {
@@ -221,9 +232,7 @@ export default{
             this.form.voucherNumber = voucherNumber
             
         }
-        if(sessionStorage.getItem('servicesPasswordRelievePassword')) {
-            this.form.payPassword = sessionStorage.getItem('servicesPasswordRelievePassword')
-        }
+        
         
 
         const parentId =  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,28,336'