From 43d080331f6b5d50b53e914930992e4d8cea8802 Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Mon, 17 Jan 2022 18:16:57 +0800
Subject: [PATCH] update

---
 src/components/dialog/index.vue               |  16 +-
 src/components/needBefore/index.vue           |   3 +-
 .../manage/list/client/consumerClient.vue     | 112 +++++-------
 .../currentAccount/accountCancellation.vue    | 166 ++++++++++++++----
 .../list/personal/currentAccount/deposit.vue  |  22 ++-
 .../personal/currentAccount/openAccount.vue   |  58 ++++--
 .../list/personal/currentAccount/settle.vue   |  79 ++++++---
 .../currentAccount/transferAccounts.vue       |  67 ++++---
 .../personal/currentAccount/withdrawal.vue    |  30 ++--
 .../list/personal/timeDeposit/deposit.vue     |  11 +-
 .../list/personal/timeDeposit/openAccount.vue |  10 +-
 .../list/personal/timeDeposit/withdrawal.vue  |   2 +-
 .../personal/usefulPhrases/accountClosed.vue  |  13 +-
 .../usefulPhrases/continueDeposit.vue         |  32 ++--
 .../personal/usefulPhrases/openAccount.vue    |   2 +-
 src/store/modules/system.js                   |  26 ++-
 16 files changed, 424 insertions(+), 225 deletions(-)

diff --git a/src/components/dialog/index.vue b/src/components/dialog/index.vue
index 6c28bc8..c709290 100644
--- a/src/components/dialog/index.vue
+++ b/src/components/dialog/index.vue
@@ -3,7 +3,7 @@
         style="margin-top:10vh"
         :visible="visible"
         :modal="false"
-        width="50%"
+        width="55%"
         :close-on-click-modal="false" 
         :show-close="false" 
         custom-class="data-dia">
@@ -82,7 +82,16 @@ export default {
         this.leftObj['流水号'] = '2333333333333'
         this.leftObj['经办机构'] = '国税支行营业部'
         this.rightObj['经办柜员'] = '002110'
-        this.rightObj['会计时间'] = new Date()
+        const tmpFunc = () => {
+            const date = new Date()
+            var y = date.getFullYear();  
+            var m = date.getMonth() + 1;  
+            m = m < 10 ? '0' + m : m;  
+            var d = date.getDate();  
+            d = d < 10 ? ('0' + d) : d;  
+            return y + '-' + m + '-' + d; 
+        }
+        this.rightObj['会计时间'] = tmpFunc()
         // 流水号（研发自定义号码生成规则）、经办柜员（002110）、经办机构：国税支行营业部、会计时间：展示操作当日日期
     },
     data() {
@@ -131,4 +140,7 @@ export default {
     /deep/ .el-row {
         width: 100%;
     }
+    /deep/.popbody {
+        width: 100vw!important;
+    }
 </style>
\ No newline at end of file
diff --git a/src/components/needBefore/index.vue b/src/components/needBefore/index.vue
index 25bb3b8..24ad80b 100644
--- a/src/components/needBefore/index.vue
+++ b/src/components/needBefore/index.vue
@@ -16,7 +16,8 @@ const obj = {
     'currentAccount/deposit': '活期业务 -> 存款',
     'currentAccount/withdrawal': '活期业务 -> 取款',
     'currentAccount/transferAccounts': '活期业务 -> 转账',
-    'currentAccount/settle': '活期业务 -> 销户',
+    'currentAccount/settle': '活期业务 -> 结清',
+    'currentAccount/Cancell': '活期业务 -> 销户',
     'timeDeposit/openAccount': '整存整取 -> 开户',
     'timeDeposit/deposit': '整存整取 -> 存款',
     'timeDeposit/withdrawal': '整存整取 -> 取款',
diff --git a/src/pages/manage/list/client/consumerClient.vue b/src/pages/manage/list/client/consumerClient.vue
index 2d5c10e..4a39688 100644
--- a/src/pages/manage/list/client/consumerClient.vue
+++ b/src/pages/manage/list/client/consumerClient.vue
@@ -7,13 +7,19 @@
                 <el-form ref="form" :model="form" label-width="140px" :rules="rules">
                     <el-col :span="10"  :offset="1">
                         <el-form-item label="证件类型">
-                            <el-select v-model="form.idType" placeholder="请选择" ref="idType">
+                            <!-- <el-select v-model="form.idType" placeholder="请选择" ref="idType">
                                 <el-option
                                 v-for="(item,index) in papers"
                                 :key="index"
                                 :label="item.name"
                                 :value="item.id">
                                 </el-option>
+                            </el-select> -->
+                            <el-select v-model="form.idType" placeholder="请选择" ref="idType">
+                                <el-option
+                                label="身份证"
+                                value="身份证">
+                                </el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item label="客户姓名" prop="userName">
@@ -33,9 +39,12 @@
                     </el-col>
                     <el-col :span="10" :offset="1">
                         <el-form-item label="证件号码" required>
-                            <div class="idCard" @click="popUp">
-                                <p>请刷身份证</p>
-                            </div>
+                            <div class="idCard" @click="popUp('身份证扫描仪')" v-if='!idNumberJudge'>
+                            <p>请刷身份证</p>
+                        </div>
+                        <div v-else>
+                            <el-input :value="form.idNumber" disabled ref="idNumber"></el-input>
+                        </div>
                         </el-form-item>
                         <el-form-item label="性别" prop="sex">
                             <el-select v-model="form.sex" placeholder="请选择" ref='sex'>
@@ -69,38 +78,6 @@
         </div>
         
         <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2()" />
-        <!-- <el-dialog
-            style="margin-top:10vh"
-            :visible.sync="visible"
-            :modal="false"
-            width="40%"
-            :close-on-click-modal="false" 
-            :show-close="false" 
-            custom-class="data-dia">
-            <div slot="title" class="dia-header">
-                <div class="data-title">提交</div>
-            </div>
-            <div class="popBody" v-if="!authorization&&!success">
-                <h2>本业务需要授权</h2>
-            </div>
-            <div class="popBody" v-if="authorization&&!success">
-                <el-form ref="form2" :model="disForm" label-width="80px">
-                     <el-form-item label="授权柜员">
-                        <el-input disabled v-model="disForm.name"></el-input>
-                    </el-form-item>
-                    <el-form-item label="授权柜员">
-                        <el-input type="password" disabled v-model="disForm.pass"></el-input>
-                    </el-form-item>
-                </el-form>
-            </div>
-            <div class="popBody" v-if="success">
-                <h2>完成表单form</h2>
-            </div>
-            <div class="popBtns">
-                <el-button class="close btn" @click="[visible = false,authorization=false,success=false]">取 消</el-button>
-                <el-button class="sure btn" type="primary" @click="popSure">确 定</el-button>
-            </div>
-        </el-dialog> -->
     </div>
 </template>
 
@@ -112,17 +89,17 @@ import { mobPattern, namePattern, ratePattern, vercustomer  } from '@/utils/veri
 import { phoneListen, mailBoxListen, checkRequired, myValidate, checkName } from '@/utils/utilFunction.js'
 import MyTitle from '@/components/myTitle'
 import MyDialog from '@/components/dialog'
-// goodState: 'system/goodState',
 
 const moduleName = 'consumerClient'
 export default {
-    name: 'index',
+    name: 'consumerClient',
     data() {
         return {
-            dataFlowId2: 0, // 用来监听
+            idNumberJudge: false,
+            visible:false,// 表单
             form:{
-              idType:1,//证件类型
-              // idNumber:'',//证件号码
+              idType:'身份证',//证件类型
+              idNumber:'',//证件号码
               userName:'',//用户名字
               sex:'',//性别
               birthday:'',//出生日期
@@ -162,8 +139,7 @@ export default {
                 ],
                 
             },
-            disForm:{name:'002009' ,pass:'123456'},
-            visible:false,// 表单
+            
             authorization:false,// 切授权
             success:false,// 切成功
             papers:[
@@ -241,8 +217,6 @@ export default {
     },
     created() {
         console.log(moduleName)
-
-        this.dataFlowId2 = this.dataFlowId
     },
     mounted() {
         this.getFormData()
@@ -262,19 +236,26 @@ export default {
             getOperation(param).then((data)=>{
                 if(data.status == 200) {
                     var list = data.data.judgmentRuleReqs
+                    console.log(list)
                     for (var i = 0; i < list.length; i++) {
-                        if (list[i].answerId == '40') {this.form.idType = +list[i].emptyTwo}
-                        if (list[i].answerId == '41') {sessionStorage.setItem('nomClientIdentity', list[i].emptyTwo)}
+                        if (list[i].answerId == '40') {this.form.idType = list[i].emptyTwo}
+                        // if (list[i].answerId == '41') {sessionStorage.setItem('nomClientIdentity', list[i].emptyTwo)}
+                        if (list[i].answerId == '41') {
+                            this.form.idNumber = list[i].emptyTwo
+                            this.idNumberJudge = true
+                        }
                         if (list[i].answerId == '42') {this.form.userName = list[i].emptyTwo}
-                        if (list[i].answerId == '43') {this.form.sex = +list[i].emptyTwo}
+                        if (list[i].answerId == '43') {this.form.sex = list[i].emptyTwo}
                         if (list[i].answerId == '44') {this.form.birthday = list[i].emptyTwo}
-                        if (list[i].answerId == '45') {this.form.nationality = +list[i].emptyTwo}
+                        if (list[i].answerId == '45') {this.form.nationality = list[i].emptyTwo}
                         if (list[i].answerId == '46') {this.form.mailbox = list[i].emptyTwo}
                         if (list[i].answerId == '47') {this.form.phone = list[i].emptyTwo}
                     }
                 }
             }).catch((error)=>{
             })
+            console.log(this.form.idNumber)
+            
         },
         ...mapMutations({
             changeShowGoods: 'system/changeShowGoods',
@@ -291,11 +272,12 @@ export default {
             let consumerClientDragList = JSON.parse(nomClientIdentity);
             let nomClientIdentitys = JSON.parse(nomClientIdentity);
           this.$refs.form.validate(myValidate(() => {
-              if (nomClientIdentitys && nomClientIdentitys.length > 0){
-                  this.visible = true;
-              }else{
-                  this.$message.error('请刷身份证');
-              }
+              this.visible = true;
+            //   if (nomClientIdentitys && nomClientIdentitys.length > 0){
+            //       this.visible = true;
+            //   }else{
+            //       this.$message.error('请刷身份证');
+            //   }
                 
           } , this.$refs));
       },
@@ -308,7 +290,7 @@ export default {
               
                     let formList = [];
                     
-                  formList.push({"answerId":'41',"emptyOne": "", "emptyTwo": nomClientIdentity, "operationIds": "285,287,5,25,33,41","type": ""})
+                  formList.push({"answerId":'41',"emptyOne": "", "emptyTwo": this.form.idNumber, "operationIds": "285,287,5,25,33,41","type": ""})
                   if(this.form.sex){
                       formList.push({
                           "answerId":'43',
@@ -390,16 +372,16 @@ export default {
     
     watch: {
         dataFlowId(newVal) {
-            console.log('---newVal')
-            console.log(newVal)
-            if(this.dataFlowId2 !== newVal) {
-                this.dataFlowId2 = newVal
-                for(let key in this.form) {
-                    if(this.dataFlow[key]) {
-                        this.form[key] = this.dataFlow[key]
-                    }
-                }
-            }
+            this.idNumberJudge = true
+            const { idType, userName, sex, birthday, nationality, mailbox, phone, idNumber } = this.dataFlow
+            this.form.idNumber = idNumber
+            this.form.idType = idType
+            this.form.userName = userName
+            this.form.sex = sex
+            this.form.birthday = birthday
+            this.form.nationality = nationality
+            this.form.mailbox = mailbox
+            this.form.phone = phone
         }
     }
 };
diff --git a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
index e1d70bb..1bff2da 100644
--- a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
+++ b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
@@ -1,13 +1,11 @@
 /* 个人业务>活期业务>销户 */
 <template>
-    <div class="body">
+    <div class="body" v-if="!needBefore">
         <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="卡号" required>
-                        <div class="idCard" @click="popUp1('刷卡器')">
-                            <p>请刷卡</p>
-                        </div>
+                        <el-input ref="cardNumber" disabled :value="form.cardNumber" @input="(val) => inputListen(val, form, 'cardNumber')"></el-input>
                     </el-form-item>
                     <el-form-item label="证件类型">
                         <el-select v-model="form.idType" placeholder="请选择">
@@ -15,37 +13,70 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="支取密码" required>
-                        <div class="idCard" @click="popUp3('密码器')">
+                        <div v-if='!form.drawPassword' class="idCard" @click="popUp3('密码器')">
                             <p>请输入密码</p>
                         </div>
+                        <div v-else @click="popUp3('密码器')">
+                            <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">
-                        <el-input ref="userName" :value="form.userName" @input="(val) => checkName(val, form, 'userName')"></el-input>
+                        <el-input ref="userName" disabled :value="form.userName" @input="(val) => checkName(val, form, 'userName')"></el-input>
                     </el-form-item>
                     <el-form-item label="证件号码" required>
-                        <div class="idCard" @click="popUp2('身份证扫描仪')">
+                        <div class="idCard" @click="popUp2('身份证扫描仪')" v-if='!idNumberJudge'>
                             <p>请刷身份证</p>
                         </div>
+                        <div v-else>
+                            <el-input v-model="form.idNumber" ref="idNumber"></el-input>
+                        </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'>
+    </need-before>
 </template>
 <script>
 import { vercustomer  } from '@/utils/verify.js'
-import { myValidate, checkHanzi, checkName, autoPlay, autoPlay2 } from '@/utils/utilFunction.js'
+import { myValidate, checkHanzi, checkName, autoPlay, autoPlay2, inputListen } from '@/utils/utilFunction.js'
+
+import { mapMutations, mapGetters } from 'vuex'
+import NeedBefore from '@/components/needBefore'
+import MyDialog from '@/components/dialog'
+
+const moduleName = 'currentAccount/Cancell' // 开怀
 export default{
     name:'',
     props:{},
+    components: {
+        NeedBefore,
+        MyDialog
+    },
     data(){
         return{
+            visible: false,
+            needBefore: false,
+            idNumberJudge: false,
+            cardNumberJudge: false,
             form:{
-              idType:'',
+              idType:'身份证',
               userName:'',
+              cardNumber: '', // 卡号
+              drawPassword: '',
+              idNumber: '', // 证件号码
+            },
+            formName: {
+                idType:'身份证',
+                userName:'客户姓名',
+                cardNumber: '卡号', // 
+                drawPassword: '支取密码',
+                idNumber: '证件号码', // 
             },
             rules: {
                 userName: vercustomer 
@@ -58,56 +89,90 @@ export default{
                 }
             },
             myTable: {
+                113: {
+                    prop: 'cardNumber',
+                    type: '3',
+                },
                 114: {
                     prop: 'userName',
                     type: '3',
                     "subjectId": 7,
-                }
+                },
+                116: {
+                    prop: 'idNumber',
+                    type: '3',
+                },
+                117: {
+                    prop: 'drawPassword',
+                    type: '3',
+                },
+                // cardNumber
             }
         }
     },
     created() {
-      
+    // 这里开始！！！！！！！！！！！
+        if(this.inMyWork(moduleName)) {
+            if(this.needsModule(moduleName) === '') {
+                const { voucherNumber, userName } = this.dataFlow
+                this.form.cardNumber = voucherNumber
+                this.form.userName = userName
+            }else {
+            this.needBefore = this.needsModule(moduleName)
+            }
+        }
     },
     mounted() {
-        this.$refs.userName.focus()
         const parentId = '285,287,5,26,57,67'
         const cardArr = {
-            113: 'nomCurrentCancellCard1',
-            116: 'nomCurrentCancellCard2',
-            117: 'nomCurrentCancellPassword'
+            // 113: 'nomCurrentCancellCard1',
+            // 116: 'nomCurrentCancellCard2',
+            // 117: 'nomCurrentCancellPassword'
+        }
+        const callback = () => {
+            if(this.form.idNumber) {
+                this.idNumberJudge = true
+            }
         }
-        autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cardArr)
+        autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cardArr, callback)
     },
     methods: {
 //提交表单
+        ...mapMutations({
+            changeShowGoods: 'system/changeShowGoods',
+            setDataFlow: 'system/setDataFlow',
+            setNeedsModule: 'system/setNeedsModule'
+        }),
       submitForm(){
-        let nomCurrentCancellCard1 = sessionStorage.getItem('nomCurrentCancellCard1')
-        console.log(nomCurrentCancellCard1)
-        let nomCurrentCancellCard1s = JSON.parse(nomCurrentCancellCard1);
-        let nomCurrentCancellCard2 = sessionStorage.getItem('nomCurrentCancellCard2')
-        let nomCurrentCancellCard2s = JSON.parse(nomCurrentCancellCard2);
-        let nomCurrentCancellPassword = sessionStorage.getItem('nomCurrentCancellPassword')
-        let nomCurrentCancellPasswords = JSON.parse(nomCurrentCancellPassword);
+        this.visible = true
+      },
+      submitForm2() {
+        // let nomCurrentCancellCard1 = sessionStorage.getItem('nomCurrentCancellCard1')
+        // let nomCurrentCancellCard1s = JSON.parse(nomCurrentCancellCard1);
+        // let nomCurrentCancellCard2 = sessionStorage.getItem('nomCurrentCancellCard2')
+        // let nomCurrentCancellCard2s = JSON.parse(nomCurrentCancellCard2);
+        // let nomCurrentCancellPassword = sessionStorage.getItem('nomCurrentCancellPassword')
+        // let nomCurrentCancellPasswords = JSON.parse(nomCurrentCancellPassword);
         this.$refs.form.validate(myValidate(() => {
             // 验证通过逻辑写在这
             const cards = [
-                {
-                    113: nomCurrentCancellCard1
-                },
-                {
-                    116: nomCurrentCancellCard2
-                },  
-                {
-                    117: nomCurrentCancellPassword,
-                    "subjectId": 17,
-                }
+                // {
+                //     113: nomCurrentCancellCard1
+                // },
+                // {
+                //     116: nomCurrentCancellCard2
+                // },  
+                // {
+                //     117: nomCurrentCancellPassword,
+                //     "subjectId": 17,
+                // }
             ]
             // const passwords = [
             //     { 117: nomCurrentCancellPasswords }
             // ]
             const parentId = '285,287,5,26,57,67'
             autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
+            this.setNeedsModule(moduleName)
         }, this.$refs));
       },
         popUp1(text) {
@@ -121,8 +186,41 @@ export default{
             this.$store.commit('system/changePop',{show:true,text, id: '117'})
         },
         checkHanzi: checkHanzi,
-        checkName: checkName
+        checkName: checkName,
+        inputListen: inputListen
+    },
+    computed: {
+        ...mapGetters({
+            dataFlow: 'system/dataFlow',
+            dataFlowCard: 'system/dataFlowCard',
+            dataFlowId: 'system/dataFlowId',
+            dataFlowPassword: 'system/dataFlowPassword',
+            needsModule: 'system/needsModule',
+            idCardNumber: 'system/idCardNumber',
+            inMyWork: 'system/inMyWork',
+        })
     },
+    watch: {
+      dataFlowCard(newVal) {
+            this.cardNumberJudge = true
+            console.log('这里不用你刷的')
+            this.$nextTick(() => {
+                this.$refs.voucherNumber.focus()
+            })
+        },
+        dataFlowPassword(newVal) {
+            const nomCurrentCancellPassword = sessionStorage.getItem('nomCurrentCancellPassword')
+            this.form.drawPassword = nomCurrentCancellPassword
+        },
+        dataFlowId(newVal) {
+            this.idNumberJudge = true
+            const { idNumber } = this.dataFlow
+            this.form.idNumber = idNumber
+            this.$nextTick(() => {
+                this.$refs.idNumber.focus
+            })
+        }
+    }
 }
 </script>
 <style lang='scss' scoped>
diff --git a/src/pages/manage/list/personal/currentAccount/deposit.vue b/src/pages/manage/list/personal/currentAccount/deposit.vue
index 444980b..0757219 100644
--- a/src/pages/manage/list/personal/currentAccount/deposit.vue
+++ b/src/pages/manage/list/personal/currentAccount/deposit.vue
@@ -5,11 +5,12 @@
                 <el-form ref="form" :model="form" label-width="120px" :rules="rules">
                     <el-col :span="10" :offset="1">
                         <el-form-item label="卡号">
-                            <div class="idCard" @click="popUp('刷卡器')" v-if="!form.idCardNumber">
+
+                            <div v-if='!cardNumberJudge' class="idCard" @click="popUp('刷卡器')">
                                 <p>请刷卡</p>
                             </div>
                             <div v-else>
-                                <el-input ref="idCardNumber"  :value="form.idCardNumber" disabled></el-input>
+                                <el-input ref="idCardNumber" disabled :value="form.idCardNumber" @input="(val) => inputListen(val, form, 'idCardNumber')"></el-input>
                             </div>
                         </el-form-item>
                         <el-form-item label="币种" prop="currency">
@@ -42,7 +43,7 @@
                 </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" />
+            <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" :needAuth="false" />
     </div>
     <need-before v-else :moduleName='needBefore'>
     </need-before>
@@ -68,6 +69,7 @@ export default{
         return{
             visible: false,
             needBefore: '',
+            cardNumberJudge: false,
             form:{
               currency:'',
               money:'',
@@ -133,7 +135,11 @@ export default{
               if(data.status == 200) {
                   var list = data.data.judgmentRuleReqs
                   for (var i = 0; i < list.length; i++) {
-                      if (list[i].answerId == '78') {sessionStorage.setItem('nomBusinessDepositCard', list[i].emptyTwo)} //卡号
+                      // if (list[i].answerId == '78') {sessionStorage.setItem('nomBusinessDepositCard', list[i].emptyTwo)} //卡号
+                      if (list[i].answerId == '78') {
+                          this.form.idCardNumber = list[i].emptyTwo
+                          this.cardNumberJudge = true
+                      } //卡号
                       if (list[i].answerId == '79') {this.form.userName = list[i].emptyTwo} //客户姓名
                       if (list[i].answerId == '80') {this.form.currency = list[i].emptyTwo} //币种
                       if (list[i].answerId == '81') {this.form.goldLogo = list[i].emptyTwo} //钞汇标识
@@ -164,7 +170,8 @@ export default{
         let nomBusinessDepositCard = sessionStorage.getItem('nomBusinessDepositCard')
         let nomBusinessDepositCards = nomBusinessDepositCard // JSON.parse(nomBusinessDepositCard);
         if (nomBusinessDepositCards && nomBusinessDepositCards.length > 0){
-                formList.push({"answerId":78,"emptyOne": "", "emptyTwo": nomBusinessDepositCards, "operationIds": "285,287,5,26,57,63,78","type": ""})// 卡号
+                // formList.push({"answerId":78,"emptyOne": "", "emptyTwo": nomBusinessDepositCards, "operationIds": "285,287,5,26,57,63,78","type": ""})// 卡号
+                formList.push({"answerId":78,"emptyOne": "", "emptyTwo": this.form.idCardNumber, "operationIds": "285,287,5,26,57,63,78","type": ""})
             if(this.form.currency){
                 formList.push({ "answerId":'80', "emptyOne": "8", "emptyTwo": this.form.currency, "operationIds": "285,287,5,26,57,63,80", "type": "1" })//币种
             }
@@ -215,11 +222,12 @@ export default{
   },
   watch: {
       dataFlowCard(val) {
-          const { userName, goldLogo, currency } = this.dataFlow
+          const { userName, goldLogo, currency, voucherNumber } = this.dataFlow
           this.form.userName = userName
           this.form.goldLogo = goldLogo // goldLogo // 13是什么鬼
           this.form.currency = currency
-          this.form.idCardNumber = this.idCardNumber
+          this.form.idCardNumber = voucherNumber
+          this.cardNumberJudge = true
       }
   }
 }
diff --git a/src/pages/manage/list/personal/currentAccount/openAccount.vue b/src/pages/manage/list/personal/currentAccount/openAccount.vue
index 409b619..32a1cf8 100644
--- a/src/pages/manage/list/personal/currentAccount/openAccount.vue
+++ b/src/pages/manage/list/personal/currentAccount/openAccount.vue
@@ -59,12 +59,12 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="凭证号码" required>
-                            <div v-if='!form.cardNumber' class="idCard" @click="popUp('刷卡器')">
-                                <p>请刷卡</p>
-                            </div>
-                            <div v-else>
-                                <el-input :value="form.cardNumber" disabled ref="cardNumber"></el-input>
-                            </div>
+                          <div v-if='!cardNumberJudge' class="idCard" @click="popUp('刷卡器')">
+                            <p>请刷卡</p>
+                          </div>
+                          <div v-else>
+                              <el-input ref="cardNumber" :value="form.cardNumber" @input="(val) => inputListen(val, form, 'cardNumber')"></el-input>
+                          </div>
                         </el-form-item>
                         <el-form-item label="支取密码" required>
                             <div v-if='!form.drawPassword' class="idCard" @click="popUps('密码器')">
@@ -166,7 +166,7 @@
         
       <el-button @click="formSubmit" type="primary" class="submitBtn">提交</el-button>
     </div>
-    <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="popSure" />
+    <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="popSure" :needAuth="false" />
     <!-- <el-dialog
         style="margin-top:10vh"
         :visible.sync="visible"
@@ -198,7 +198,7 @@
 import {getSubjectInfo,addOperation,getOperation} from "@/api/http.js";
 import { mapMutations, mapGetters, mapState } from 'vuex'
 import { vercustomer  } from '@/utils/verify.js'
-import { myValidate, checkName, checkHanzi } from '@/utils/utilFunction.js'
+import { myValidate, checkName, checkHanzi, inputListen } from '@/utils/utilFunction.js'
 import NeedBefore from '@/components/needBefore'
 import MyDialog from '@/components/dialog'
 const moduleName = 'currentAccount/openAccount'
@@ -206,6 +206,7 @@ export default {
     data(){
         return{
             needBefore: '',
+            cardNumberJudge: false,
             form:{
               cardNumber: '', // 卡号
               drawPassword: '', // 支取密码
@@ -338,6 +339,8 @@ export default {
                 parentId: '285,287,5,26,57,62'
             }
             getOperation(param).then((data)=>{
+              console.log('need')
+              connsole.log(data)
                     if(data.status.status == 200) {
                         var list = data.data.judgmentRuleReqs
                         for (var i = 0; i < list.length; i++) {
@@ -348,8 +351,15 @@ export default {
                             if (list[i].answerId == '72') {this.form.accountQuality = +list[i].emptyTwo}
                             if (list[i].answerId == '73') {this.form.voucherType = +list[i].emptyTwo}
                             if (list[i].answerId == '74') {this.form.accountType = +list[i].emptyTwo}
+                            if (list[i].answerId == '75') {
+                              this.form.cardNumber = list[i].emptyTwo
+                              this.cardNumberJudge = true
+                            }
                             if (list[i].answerId == '76') {this.form.drawWay = +list[i].emptyTwo}
-                            if (list[i].answerId == '77') {sessionStorage.setItem('accountPasswordAll', list[i].emptyTwo)}
+                            // if (list[i].answerId == '77') {sessionStorage.setItem('accountPasswordAll', list[i].emptyTwo)}
+                            if (list[i].answerId == '77') {
+                              this.form.drawPassword = list[i].emptyTwo
+                            }
                             if (list[i].answerId == '270') {this.form.accountQualitysTwo = +list[i].emptyTwo}
                             if (list[i].answerId == '271') {this.form.voucherTypesTwo = +list[i].emptyTwo}
                             if (list[i].answerId == '272') {this.form.accountTypesTwo = +list[i].emptyTwo}
@@ -358,6 +368,7 @@ export default {
                             if (list[i].answerId == '277') {this.form.voucherTypesThree = +list[i].emptyTwo}
                             if (list[i].answerId == '278') {this.form.accountTypesThree = +list[i].emptyTwo}
                             if (list[i].answerId == '280') {this.form.drawWaysThree = +list[i].emptyTwo}
+                            
                         }
                     }else{
                         this.getFormData()
@@ -370,10 +381,16 @@ export default {
                 parentId: '285,287,5,25,33'
             }
             getOperation(param).then((data)=>{
+              console.log(data)
                 if(data.status == 200) {
                     var list = data.data.judgmentRuleReqs
                     for (var i = 0; i < list.length; i++) {
                         if (list[i].answerId == '42') {this.form.userName = list[i].emptyTwo}
+                        else if (list[i].answerId == '75') {
+                          console.log(list[i].emptyTwo)
+                          this.form.cardNumber = list[i].emptyTwo
+                          this.cardNumberJudge = true
+                        }
                     }
                 }
             }).catch((error)=>{
@@ -388,6 +405,8 @@ export default {
             }
             let dataList = [];
             getOperation(param).then((data)=>{
+              console.log('what>')
+                console.log(data)
                 if(data.status == 200){
                     let list = data.data.judgmentRuleReqs;
                     for(var i=0;i<list.length;i++){
@@ -519,10 +538,11 @@ export default {
           let paymentCodeTwo = accountPasswordTwo;
           let paymentCodeThree = accountPasswordThree;
           if(this.form.userName && this.form.currency && this.form.goldLogo && this.form.accountType && this.form.drawWay && this.form.voucherType && voucherNumber.length && paymentCode){
-              for (var i=0;i<voucherNumber.length;i++){
+              // for (var i=0;i<voucherNumber.length;i++){
                 
-                  formLists.push({"answerId":voucherNumber[i].id,"emptyOne": "", "emptyTwo": "", "operationIds": "285,287,5,26,57,62,75,"+voucherNumber[i].id,"type": ""})
-              }
+              //     formLists.push({"answerId":voucherNumber[i].id,"emptyOne": "", "emptyTwo": "", "operationIds": "285,287,5,26,57,62,75,"+voucherNumber[i].id,"type": ""})
+              // }
+              formLists.push({"answerId":75,"emptyOne": "", "emptyTwo": this.form.cardNumber, "operationIds": "285,287,5,26,57,62,75","type": "3"})
               let param= {
                   parentId: '285,287,5,26,57,62,75',
                   lcJudgmentRuleReq: formLists,
@@ -572,7 +592,8 @@ export default {
                   {"answerId":'71',"emptyOne": "9", "emptyTwo": this.form.goldLogo, "operationIds": "285,287,5,26,57,62,71","type": "1"},//钞汇标识
                   {"answerId":'74',"emptyOne": "12", "emptyTwo": this.form.accountType, "operationIds": "285,287,5,26,57,62,74","type": "1"}, //账户类型
                   {"answerId":'76',"emptyOne": "13", "emptyTwo": this.form.drawWay, "operationIds": "285,287,5,26,57,62,76", "type": "1"}, //支取方式
-                  {"answerId":'73',"emptyOne": "11", "emptyTwo": this.form.voucherType, "operationIds": "285,287,5,26,57,62,73", "type": "1"} //凭证类型
+                  {"answerId":'73',"emptyOne": "11", "emptyTwo": this.form.voucherType, "operationIds": "285,287,5,26,57,62,73", "type": "1"}, //凭证类型
+                  // {"answerId":'75',"emptyOne": "12", "emptyTwo": this.form.cardNumber, "operationIds": "285,287,5,26,57,62,75","type": "3"},
               )
               let params= {
                   parentId:'285,287,5,26,57,62',
@@ -632,7 +653,8 @@ export default {
         this.$store.commit('system/changePop',{show:true,text:'密码器',id:'62,3'})
       },
       checkName: checkName,
-      checkHanzi: checkHanzi
+      checkHanzi: checkHanzi,
+      inputListen: inputListen
     },
     computed: {
         ...mapGetters({
@@ -646,10 +668,14 @@ export default {
     },
     watch: {
       dataFlowCard(newVal) {
-          this.form.cardNumber = this.idCardNumber
+          const { voucherNumber } = this.dataFlow
+          this.form.cardNumber = voucherNumber
+          this.cardNumberJudge = true
       },
       dataFlowPassword(newVal) {
-        this.form.drawPassword = '******'
+        
+          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 10705a2..7fdfaae 100644
--- a/src/pages/manage/list/personal/currentAccount/settle.vue
+++ b/src/pages/manage/list/personal/currentAccount/settle.vue
@@ -5,11 +5,11 @@
             <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='!form.cardNumber' class="idCard" @click="popUp('刷卡器')">
+                        <div v-if='!cardNumberJudge' class="idCard" @click="popUp('刷卡器')">
                             <p>请刷卡</p>
                         </div>
                         <div v-else>
-                            <el-input :value="form.cardNumber" disabled ref="cardNumber"></el-input>
+                            <el-input @blur="getDataBlur" ref="cardNumber" disabled v-model="form.cardNumber" @input="(val) => inputListen(val, form, 'cardNumber')"></el-input>
                         </div>
                     </el-form-item>
                     <el-form-item label="币种" prop="currency">
@@ -18,17 +18,17 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="金额">
-                        <el-input disabled :value="form.money" @input="val => ismoney(val, form, 'money')"></el-input>
+                        <el-input :value="form.money" @input="val => ismoney(val, form, 'money')"></el-input>
                     </el-form-item>
                     <el-form-item label="总金额">
-                        <el-input disabled v-model="form.totalMoney" placeholder="显示余额加利息总额"></el-input>
+                        <el-input v-model="form.totalMoney" placeholder="显示余额加利息总额"></el-input>
                     </el-form-item>
                     <el-form-item label="支取密码" required>
                         <div v-if='!form.drawPassword' class="idCard" @click="popUp('密码器')">
                             <p>请输入密码</p>
                         </div>
-                        <div v-else>
-                            <el-input :value="form.drawPassword" disabled ref="drawPassword" type="password"></el-input>
+                        <div v-else @click="popUp('密码器')">
+                            <el-input :value="form.drawPassword" ref="drawPassword" type="password"></el-input>
                         </div>
                     </el-form-item>
                 </el-col>
@@ -42,7 +42,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="利息">
-                        <el-input v-model="form.interest" disabled></el-input>
+                        <el-input v-model="form.interest"></el-input>
                     </el-form-item>
                     <el-form-item label="支取方式" prop="chargeWay">
                         <el-select v-model="form.chargeWay" placeholder="请选择" ref="chargeWay">
@@ -65,7 +65,7 @@
 </template>
 <script>
 import { mobPattern, namePattern, ratePattern, vercustomer  } from '@/utils/verify.js'
-import { myValidate, checkHanzi, checkName, ismoney, autoPlay, autoPlay2 } from '@/utils/utilFunction.js'
+import { myValidate, checkHanzi, checkName, ismoney, autoPlay, autoPlay2, inputListen } from '@/utils/utilFunction.js'
 
 import { mapMutations, mapGetters } from 'vuex'
 import NeedBefore from '@/components/needBefore'
@@ -82,6 +82,7 @@ export default{
         return{
             visible: false,
             needBefore: '',
+            cardNumberJudge: false,
             form:{
               cardNumber: '',
               drawPassword: '',
@@ -100,7 +101,7 @@ export default{
               currency:'币种',
               money:'金额',
               totalMoney:'总金额',
-              userName:'客户姓名',
+              userName:'客户姓名', // 
               goldLogo:'钞汇标识',
               interest:'利息',
               chargeWay:'支取方式',
@@ -117,6 +118,10 @@ export default{
                 ]
             },
             myTable2: {
+                103: {
+                    prop: 'cardNumber',
+                    type: '3',
+                },
                 105: {
                     prop: 'currency',
                     type: '1',
@@ -142,6 +147,10 @@ export default{
                     type: '3',
                     "subjectId": 45,
                 },
+                111: {
+                    prop: 'drawPassword',
+                    type: '3'
+                },
                 112: {
                     prop: 'remark',
                     type: '3',
@@ -172,13 +181,22 @@ export default{
         }
     },
     mounted() {
-        this.$refs.userName.focus()
+        
         const parentId = '285,287,5,26,57,66'
         const cardArr = {
-            103: 'nomCurrentSettleCard',
-            111: 'nomCurrentSettlePassword'
+            // 103: 'nomCurrentSettleCard',
+            // 111: 'nomCurrentSettlePassword'
+        }
+        const callback = () => {
+            if(this.form.cardNumber) {
+                this.cardNumberJudge = true
+                this.setDataFlow({ voucherNumber: this.form.cardNumber })
+            }
+            if(this.form.userName) {
+                this.setDataFlow({ userName: this.form.userName })
+            }
         }
-        autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cardArr)
+        autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cardArr, callback)
     },
     methods: {
         ...mapMutations({
@@ -187,6 +205,9 @@ export default{
             setNeedsModule: 'system/setNeedsModule'
         }),
 //提交表单
+      getDataBlur() {
+
+      },
       submitForm(){
         this.$refs.form.validate(myValidate(() => {
             // 验证通过逻辑写在这
@@ -199,23 +220,27 @@ export default{
         let nomCurrentSettlePassword = sessionStorage.getItem('nomCurrentSettlePassword')
         let nomCurrentSettlePasswords = JSON.parse(nomCurrentSettlePassword);
         const cards = [
-            {
-                103: nomCurrentSettleCard
-            }, 
-            {
-                111: nomCurrentSettlePassword,
-                "subjectId": 17,
-            }
+            // {
+            //     103: nomCurrentSettleCard
+            // }, 
+            // {
+            //     111: nomCurrentSettlePassword,
+            //     "subjectId": 17,
+            // }
         ]
         const parentId = '285,287,5,26,57,66'
         autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
+        this.setNeedsModule(moduleName)
+        const { cardNumber, userName } = this.form
+        this.setDataFlow({ voucherNumber: cardNumber, userName })
       },
       popUp(text) {
         this.$store.commit('system/changePop',{show:true,text, id: 66})
       },
       ismoney: ismoney,
       checkHanzi: checkHanzi,
-      checkName: checkName
+      checkName: checkName,
+      inputListen: inputListen
     },
     computed: {
         ...mapGetters({
@@ -229,7 +254,14 @@ export default{
     },
     watch: {
       dataFlowCard(newVal) {
-          this.form.cardNumber = this.idCardNumber
+          this.cardNumberJudge = true
+          this.$nextTick(() => {
+            this.$refs.cardNumber.focus()
+          })
+
+          // this.form.cardNumber = this.idCardNumber
+
+
           const { currency, userName, goldLogo, serviceCharge, chargeWay, interest } = this.dataFlow
           this.form.currency = currency
           this.form.userName = userName
@@ -239,7 +271,8 @@ export default{
           this.form.interest = interest
       },
       dataFlowPassword(newVal) {
-        this.form.drawPassword = '******'
+        const nomCurrentSettlePassword = sessionStorage.getItem('nomCurrentSettlePassword')
+        this.form.drawPassword = nomCurrentSettlePassword
       }
     }
 }
diff --git a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
index 6a0b152..8c12498 100644
--- a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
+++ b/src/pages/manage/list/personal/currentAccount/transferAccounts.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='!form.cardNumber' class="idCard" @click="popUp('刷卡器')">
+                        <div v-if='!cardNumberJudge' class="idCard" @click="popUp('刷卡器')">
                             <p>请刷卡</p>
                         </div>
                         <div v-else>
@@ -26,7 +26,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')" disabled></el-input>
+                        <el-input :value="form.userName" @input="(val) => checkName(val, form, 'userName')"></el-input>
                     </el-form-item>
                     <el-form-item label="钞汇标识" prop="goldLogo">
                         <el-select v-model="form.goldLogo" placeholder="请选择" ref="goldLogo">
@@ -37,8 +37,8 @@
                         <div v-if='!form.drawPassword' class="idCard" @click="popUp('密码器')">
                             <p>请输入密码</p>
                         </div>
-                        <div v-else>
-                            <el-input :value="form.drawPassword" disabled ref="drawPassword" type="password"></el-input>
+                        <div v-else @click="popUp('密码器')">
+                            <el-input :value="form.drawPassword" ref="drawPassword" type="password"></el-input>
                         </div>
                     </el-form-item>
                     <el-form-item label="收款人名称" prop="payeeName" >
@@ -77,6 +77,7 @@ export default{
         return{
             visible: false,
             needBefore: '',
+            cardNumberJudge: false,
             form:{
               cardNumber: '',
               drawPassword: '',
@@ -89,8 +90,10 @@ export default{
               remark:'',
             },
             formName: {
+              cardNumber: '卡号',
               currency:'币种',
               money:'金额',
+              drawPassword: '支取密码',
               shroffAccount:'收款卡号',
               userName:'客户姓名',
               goldLogo:'钞汇标识',
@@ -126,11 +129,19 @@ export default{
                 ],
             },
             myTable2: {
+                94: {
+                    prop: 'cardNumber',
+                    type: '3'
+                },
                 96: {
                     prop: 'currency',
                     type: '1',
                     "subjectId": 8,
                 },
+                99: {
+                    prop: 'drawPassword',
+                    type: '3',
+                },
                 100: {
                     prop: 'shroffAccount',
                     type: '3',
@@ -170,19 +181,28 @@ export default{
    created() {
     if(this.inMyWork(moduleName)) {
         if(this.needsModule(moduleName) === '') {
+            const parentId = '285,287,5,26,57,65'
+            const cardArr = {
+                // 94: 'nomCurrentTransferCard',
+                // 99: 'nomCurrentTransferPassword'
+            }
+            const callback = () => {
+                if(this.form.cardNumber) {
+                    this.cardNumberJudge = true
+                }
+                if(this.form.drawPassword) {
+                    sessionStorage.setItem('nomCurrentTransferPassword', this.form.drawPassword)
+                }
+            }
+            autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cardArr, callback)
         }else {
         this.needBefore = this.needsModule(moduleName)
         }
     }
   },
   mounted() {
-      this.$refs.money.focus()
-      const parentId = '285,287,5,26,57,65'
-        const cardArr = {
-            94: 'nomCurrentTransferCard',
-            99: 'nomCurrentTransferPassword'
-        }
-        autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cardArr)
+      // this.$refs.money.focus()
+      
   },
   methods: {
     ...mapMutations({
@@ -205,13 +225,13 @@ export default{
         let nomCurrentTransferPassword = sessionStorage.getItem('nomCurrentTransferPassword')
         let nomCurrentTransferPasswords = JSON.parse(nomCurrentTransferPassword);
         const cards = [
-            {
-                94: nomCurrentTransferCard
-            }, 
-            {
-                99: nomCurrentTransferPassword,
-                "subjectId": 17,
-            }
+            // {
+            //     94: nomCurrentTransferCard
+            // }, 
+            // {
+            //     99: nomCurrentTransferPassword,
+            //     "subjectId": 17,
+            // }
         ]
         const parentId = '285,287,5,26,57,65'
         autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
@@ -240,8 +260,10 @@ export default{
   },
     watch: {
         dataFlowCard(newVal) {
-            this.form.cardNumber = this.idCardNumber
-            const { currency, userName, goldLogo, serviceCharge, chargeWay } = this.dataFlow
+            // 默认带出客户姓名、币种、钞汇标识、支付方式（密码）、手续费（0.00），输入上限20字符；
+            this.cardNumberJudge = true
+            const { currency, userName, goldLogo, serviceCharge, chargeWay, voucherNumber } = this.dataFlow
+            this.form.cardNumber = voucherNumber
             this.form.currency = currency
             this.form.userName = userName
             this.form.goldLogo = goldLogo
@@ -249,8 +271,9 @@ export default{
             this.form.chargeWay = chargeWay
         },
         dataFlowPassword(newVal) {
-            this.form.drawPassword = '******'
-        }
+            const nomCurrentTransferPassword = sessionStorage.getItem('nomCurrentTransferPassword')
+            this.form.drawPassword = nomCurrentTransferPassword
+        },
     }
 }
 </script>
diff --git a/src/pages/manage/list/personal/currentAccount/withdrawal.vue b/src/pages/manage/list/personal/currentAccount/withdrawal.vue
index e156104..c89ef8d 100644
--- a/src/pages/manage/list/personal/currentAccount/withdrawal.vue
+++ b/src/pages/manage/list/personal/currentAccount/withdrawal.vue
@@ -5,11 +5,11 @@
             <el-form ref="form" :rules="rules" :model="form" label-width="120px">
                 <el-col :span="10" :offset="1">
                     <el-form-item label="卡号" required>
-                        <div v-if='!form.cardNumber' class="idCard" @click="popUp('刷卡器')">
+                        <div v-if='!cardNumberJudge' class="idCard" @click="popUp('刷卡器')">
                             <p>请刷卡</p>
                         </div>
                         <div v-else>
-                            <el-input :value="form.cardNumber" disabled ref="cardNumber"></el-input>
+                            <el-input ref="cardNumber" disabled :value="form.cardNumber" @input="(val) => inputListen(val, form, 'cardNumber')"></el-input>
                         </div>
                     </el-form-item>
                     <el-form-item label="币种" prop="currency">
@@ -24,8 +24,8 @@
                         <div v-if='!form.drawPassword' class="idCard" @click="popUp('密码器')">
                             <p>请输入密码</p>
                         </div>
-                        <div v-else>
-                            <el-input :value="form.drawPassword" disabled ref="drawPassword" type="password"></el-input>
+                        <div v-else @click="popUp('密码器')">
+                            <el-input :value="form.drawPassword" ref="drawPassword" type="password"></el-input>
                         </div>
                     </el-form-item>
                 </el-col>
@@ -94,6 +94,7 @@ export default{
         return{
             visible: false,
             needBefore: '',
+            cardNumberJudge: false,
             form:{
               cardNumber: '',
               drawPassword: '',
@@ -163,7 +164,9 @@ export default{
                   var list = data.data.judgmentRuleReqs
                   for (var i = 0; i < list.length; i++) {
                       if (list[i].answerId == '85') {
-                          sessionStorage.setItem('nomCurrentWithdrawalCard', list[i].emptyTwo)
+                          // sessionStorage.setItem('nomCurrentWithdrawalCard', list[i].emptyTwo)
+                          this.form.cardNumber = list[i].emptyTwo
+                          this.cardNumberJudge = true
                           // console.log(list[i].emptyTwo)
                       } //卡号
                       if (list[i].answerId == '86') {this.form.userName = list[i].emptyTwo} //客户姓名
@@ -171,7 +174,10 @@ export default{
                       if (list[i].answerId == '88') {this.form.goldLogo = list[i].emptyTwo} //钞汇标识
                       if (list[i].answerId == '89') {this.form.money = list[i].emptyTwo} //金额
                       if (list[i].answerId == '90') {this.form.chargeWay = list[i].emptyTwo} //支取方式
-                      if (list[i].answerId == '91') {sessionStorage.setItem('nomCurrentWithdrawalPassword', list[i].emptyTwo)} //支取密码
+                      // if (list[i].answerId == '91') {sessionStorage.setItem('nomCurrentWithdrawalPassword', list[i].emptyTwo)} //支取密码
+                      if (list[i].answerId == '91') {
+                          this.form.drawPassword = list[i].emptyTwo
+                      }
                       if (list[i].answerId == '92') {this.form.serviceCharge = list[i].emptyTwo} //手续费
                       if (list[i].answerId == '93') {this.form.remark = list[i].emptyTwo} //摘要
                   }
@@ -193,9 +199,12 @@ export default{
         let nomCurrentWithdrawalPasswords = nomCurrentWithdrawalPassword // JSON.parse(nomCurrentWithdrawalPassword);
         let formList = [];
         // 验证通过逻辑写在这
-        if (nomCurrentWithdrawalCards && nomCurrentWithdrawalCards.length > 0 && nomCurrentWithdrawalPasswords){
-            formList.push({"answerId":85,"emptyOne": "", "emptyTwo": nomCurrentWithdrawalCards, "operationIds": "285,287,5,26,57,64,85","type": ""})// 卡号
-            formList.push({"answerId":91,"emptyOne": "", "emptyTwo": nomCurrentWithdrawalPassword, "operationIds": "285,287,5,26,57,64,91","type": ""})
+        // if (nomCurrentWithdrawalCards && nomCurrentWithdrawalCards.length > 0 && nomCurrentWithdrawalPasswords){
+        if (this.form.drawPassword && this.form.cardNumber){
+            // formList.push({"answerId":85,"emptyOne": "", "emptyTwo": nomCurrentWithdrawalCards, "operationIds": "285,287,5,26,57,64,85","type": ""})// 卡号
+            formList.push({"answerId":85,"emptyOne": "", "emptyTwo": this.form.cardNumber, "operationIds": "285,287,5,26,57,64,85","type": ""})
+            // formList.push({"answerId":91,"emptyOne": "", "emptyTwo": nomCurrentWithdrawalPassword, "operationIds": "285,287,5,26,57,64,91","type": ""})
+            formList.push({"answerId":91,"emptyOne": "", "emptyTwo": this.form.drawPassword, "operationIds": "285,287,5,26,57,64,91","type": "3"})
             if (this.form.currency){formList.push({"answerId":'87', "emptyOne": "8", "emptyTwo": this.form.currency, "operationIds": "285,287,5,26,57,64,87","type": "1"})}//币种
             if (this.form.money){formList.push({"answerId":'89', "emptyOne": "14", "emptyTwo": this.form.money, "operationIds": "285,287,5,26,57,64,89", "type": "3"})}//金额
             if (this.form.remark){formList.push({"answerId":'93', "emptyOne": "16", "emptyTwo": this.form.remark, "operationIds": "285,287,5,26,57,64,93", "type": "3"})}//摘要
@@ -253,7 +262,8 @@ export default{
           this.form.chargeWay = chargeWay
       },
       dataFlowPassword(newVal) {
-        this.form.drawPassword = '******'
+        const nomCurrentWithdrawalPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword')
+        this.form.drawPassword = nomCurrentWithdrawalPassword
       }
   }
 }
diff --git a/src/pages/manage/list/personal/timeDeposit/deposit.vue b/src/pages/manage/list/personal/timeDeposit/deposit.vue
index a77893c..4b61a15 100644
--- a/src/pages/manage/list/personal/timeDeposit/deposit.vue
+++ b/src/pages/manage/list/personal/timeDeposit/deposit.vue
@@ -9,7 +9,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="currency">
@@ -63,7 +63,7 @@
                         <div v-if='!form.drawPassword' class="idCard" @click="popUp('密码器')">
                             <p>请输入密码</p>
                         </div>
-                        <div v-else>
+                        <div v-else @click="popUp('密码器')">
                             <el-input :value="form.drawPassword" ref="drawPassword" type="password"></el-input>
                         </div>
                     </el-form-item>
@@ -303,6 +303,9 @@ export default{
                 if(this.form.voucherNumber) {
                     this.cardNumberJudge = true
                 }
+                if(this.form.drawPassword) {
+                    sessionStorage.setItem('nomtimeDepositlPassword', this.form.drawPassword)
+                }
             }
             autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cards, callback)
         },
@@ -320,8 +323,8 @@ export default{
 
         },
         submitForm2() {
-            let nomtimeDeposit1 = sessionStorage.getItem('nomtimeDeposit1')
-            let nomtimeDepositlPassword = sessionStorage.getItem('nomtimeDepositlPassword')
+            // let nomtimeDeposit1 = sessionStorage.getItem('nomtimeDeposit1')
+            // let nomtimeDepositlPassword = sessionStorage.getItem('nomtimeDepositlPassword')
             const parentId = '285,287,5,26,58,119'
             const cards = [
                 // {
diff --git a/src/pages/manage/list/personal/timeDeposit/openAccount.vue b/src/pages/manage/list/personal/timeDeposit/openAccount.vue
index 8c8a80f..a7c85b5 100644
--- a/src/pages/manage/list/personal/timeDeposit/openAccount.vue
+++ b/src/pages/manage/list/personal/timeDeposit/openAccount.vue
@@ -50,14 +50,14 @@
                             <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="支取密码" required>
                         <div v-if='!form.drawPassword' class="idCard" @click="popUp('密码器')">
                             <p>请输入密码</p>
                         </div>
-                        <div v-else>
+                        <div v-else @click="popUp('密码器')">
                             <el-input :value="form.drawPassword" ref="drawPassword" type="password"></el-input>
                         </div>
                     </el-form-item>
@@ -217,14 +217,15 @@ export default{
     created() {
     if(this.inMyWork(moduleName)) {
         if(this.needsModule(moduleName) === '') {
+            this.form.clientNumber = this.dataFlow.peopleNumber
+            this.getFormData()
         }else {
         this.needBefore = this.needsModule(moduleName)
         }
     }
   },
     mounted() {
-        this.getFormData()
-        this.$refs.clientNumber.focus()
+        
     },
     methods: {
         ...mapMutations({
@@ -249,6 +250,7 @@ export default{
                 if(this.form.voucherNumber) {
                     this.cardNumberJudge = true
                 }
+                
             }
             autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cards, callback)
         },
diff --git a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
index 51fb391..8f2f401 100644
--- a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
+++ b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
@@ -9,7 +9,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="currencyType">
diff --git a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
index 81b9998..e632c94 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 @blur="getDataBlur" ref="voucherNumber" :value="form.voucherNumber" @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
+                            <el-input disabled ref="voucherNumber" :value="form.voucherNumber" @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
                         </div>
                     </el-form-item>
                     <el-form-item label="币种" prop="currency">
@@ -47,7 +47,7 @@
                             <p>请刷身份证</p>
                         </div>
                         <div v-else>
-                            <el-input :value="form.idNumber" ref="idNumber"></el-input>
+                            <el-input :value="form.idNumber" disabled ref="idNumber"></el-input>
                         </div>
                     </el-form-item>
                     <el-form-item label="客户姓名" prop="customerName">
@@ -75,7 +75,7 @@
                         <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>
@@ -115,6 +115,7 @@ export default{
     created() {
         if(this.inMyWork(moduleName)) {
             if(this.needsModule(moduleName) === '') {
+                this.getFormData()
             }else {
             this.needBefore = this.needsModule(moduleName)
             }
@@ -261,9 +262,7 @@ export default{
         }
     },
     mounted() {
-        this.getFormData()
-
-        this.$refs.customerName.focus()
+        
     },
     methods: {
         ...mapMutations({
@@ -271,8 +270,6 @@ export default{
             setDataFlow: 'system/setDataFlow',
             setNeedsModule: 'system/setNeedsModule'
         }),
-        getDataBlur() {
-        },
         getFormData(){
             const parentId = '285,287,5,26,59,157'
             const cards = {    
diff --git a/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue b/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue
index 31861d1..300f64c 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" ref="voucherNumber" :value="form.voucherNumber" @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
+                            <el-input @blur="getDataBlur" disabled ref="voucherNumber" :value="form.voucherNumber" @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
                         </div>
                     </el-form-item>
                     <el-form-item label="定存编号" prop="depositNumber">
@@ -44,8 +44,8 @@
                         <div v-if='!form.drawPassword' class="idCard" @click="popUp2('密码器')">
                             <p>请输入密码</p>
                         </div>
-                        <div v-else>
-                            <el-input :value="form.drawPassword" disabled ref="drawPassword" type="password"></el-input>
+                        <div v-else @click="popUp2('密码器')">
+                            <el-input :value="form.drawPassword" ref="drawPassword" type="password"></el-input>
                         </div>
                     </el-form-item>
                 </el-col>
@@ -185,15 +185,7 @@ export default{
             setNeedsModule: 'system/setNeedsModule'
         }),
         getDataBlur() {
-            if(this.form.voucherNumber) {
-                const { userName, depositNumber, currency, goldLogo, depositTerm, monthDeposit } = this.dataFlow
-                this.form.customerName = userName
-                this.form.currency = currency
-                this.form.depositTerm = depositTerm
-                this.form.depositNumber = depositNumber
-                this.form.moneyTarget = goldLogo
-                this.form.monthDeposit = monthDeposit
-            }
+            
         },
         getFormData(){
             const parentId = '285,287,5,26,59,156'
@@ -205,6 +197,7 @@ export default{
                 if(this.form.voucherNumber) {
                     this.cardNumberJudge = true
                 }
+                
             }
             autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cards, callback)
         },
@@ -256,12 +249,15 @@ export default{
     watch: {
       dataFlowCard(newVal) {
           // this.form.cardNumber = this.idCardNumber
-          this.cardNumberJudge = true
-          const { voucherNumber } = this.dataFlow
-          this.form.voucherNumber = voucherNumber
-          this.$nextTick(() => {
-              this.$refs.voucherNumber.focus()
-          })
+        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
       },
       dataFlowPassword(newVal) {
         let nomUsefulPhrasesContinuePassword = sessionStorage.getItem('nomUsefulPhrasesContinuePassword')
diff --git a/src/pages/manage/list/personal/usefulPhrases/openAccount.vue b/src/pages/manage/list/personal/usefulPhrases/openAccount.vue
index 930b87f..d06db1c 100644
--- a/src/pages/manage/list/personal/usefulPhrases/openAccount.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/openAccount.vue
@@ -45,7 +45,7 @@
                             <p>请刷身份证</p>
                         </div>
                         <div v-else>
-                            <el-input :value="form.idNumber" ref="idNumber"></el-input>
+                            <el-input :value="form.idNumber" disabled ref="idNumber"></el-input>
                         </div>
                     </el-form-item>
                     <el-form-item label="客户姓名" prop="customerName">
diff --git a/src/store/modules/system.js b/src/store/modules/system.js
index c154961..bff004f 100644
--- a/src/store/modules/system.js
+++ b/src/store/modules/system.js
@@ -729,6 +729,8 @@ export default {
                     mailbox:'广东省深圳市阳光村',//通讯地址
                     phone:'13222223122',//联系电话
 
+                    voucherNumber
+
                 }
             },
             '项目二': {
@@ -759,21 +761,26 @@ export default {
                     'currentAccount/withdrawal': false,
                     'currentAccount/transferAccounts': false,
                     'currentAccount/settle': false,
+                    'currentAccount/Cancell': false
                 },
                 // dataFlowGo: 0,
                 dataFlowCard: 0,
                 dataFlowId: 0,
                 dataFlowPassword: 0,
                 dataFlow: {
-                    // peopleNumber,
-                    // userName:'肥仔',//用户名字
-                    // idType: '身份证',
-                    // idNumber,//证件号码
-                    // sex:'男',//性别
-                    // birthday:'2008',//出生日期
-                    // // nationality:'汉',//民族
-                    // mailbox:'肥仔无处不在',//通讯地址
-                    // phone:'13222223122',//联系电话
+                    peopleNumber,
+                    userName,//用户名字
+                    idType: '身份证',
+                    idNumber,//证件号码
+                    sex:'男',//性别
+                    birthday:'2008',//出生日期
+                    // nationality:'汉',//民族
+                    mailbox:'广东省深圳市阳光村',//通讯地址
+                    phone:'13222223122',//联系电话
+
+                    // cardNumber: '', // 卡号
+                    voucherNumber,
+                    idNumber,
                     currency:'CNY人民币',
                     userName,
                     goldLogo:'钞户',
@@ -816,6 +823,7 @@ export default {
                     userName,
                     currency:'CNY人民币',
                     goldLogo:'钞户',
+                    peopleNumber
                 }
             },
             '项目四': {