From a7121e13857472f02a680d4f80267a2a6f2277fa Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Wed, 19 Jan 2022 18:28:31 +0800
Subject: [PATCH] update

---
 src/pages/counter/list/index.vue              |  25 +-
 src/pages/counter/list/myConfig.js            |  33 ++-
 .../manage/list/client/consumerClient.vue     |   8 -
 .../manage/list/client/corporateClient.vue    |   1 -
 .../personal/callDeposits/accountClosed.vue   | 216 ++++++++++++++----
 .../personal/callDeposits/openAccount.vue     | 116 ++++++++--
 .../currentAccount/accountCancellation.vue    |  24 --
 .../list/personal/currentAccount/deposit.vue  |  11 -
 .../list/personal/currentAccount/index.vue    |   4 +-
 .../personal/currentAccount/openAccount.vue   |  30 ---
 .../list/personal/currentAccount/settle.vue   |  30 +--
 .../currentAccount/transferAccounts.vue       |  19 --
 .../personal/currentAccount/withdrawal.vue    |  17 --
 .../list/personal/timeDeposit/deposit.vue     |  16 --
 .../list/personal/timeDeposit/openAccount.vue |  26 ---
 .../list/personal/timeDeposit/withdrawal.vue  |  23 --
 .../personal/usefulPhrases/accountClosed.vue  |  34 ---
 .../usefulPhrases/continueDeposit.vue         |  32 ---
 .../personal/usefulPhrases/openAccount.vue    |  29 ---
 src/store/modules/system.js                   | 103 +++++----
 20 files changed, 370 insertions(+), 427 deletions(-)

diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index 1c77e92..074324b 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -217,6 +217,13 @@
 <!--            <div :style="{'background':'url('+imgSrc+')','height':'500px','background-repeat': 'no-repeat',-->
 <!--            'background-size': '100% 100%'}" class="imgPop">-->
 <!--            </div>-->
+<!-- 银行卡 -->
+<div v-if="magnifyData.id == 16" style="position: absolute;top:0;width: 634px">
+                <div style='position: relative;top: 220px;left: 70px;width:250px;font-size: 24px;color: #fff'>
+                    {{magnifyData.cardNub}}
+                </div>
+            </div>
+            <!-- 身份证 -->
             <div v-if="magnifyData.id == 13" style="position: absolute;top:0;width: 634px">
                 <div style='position: relative;top: 73px;left: 80px;width:220px'>
                     {{magnifyData.userName}}
@@ -319,7 +326,7 @@ export default {
                   idCardNo:'465852346854168479'},
               {name:'开户申请书', src:require('@/assets/img/goods/khsqs.png'), id:14},
               {name:'现金', src:require('@/assets/img/goods/cash-sm.png'), id:15},
-              {name:'银行卡', src:require('@/assets/img/goods/bankCard.png'), id:16},
+              {name:'银行卡', src:require('@/assets/img/goods/bankCard.png'), id:16,cardNub:'1865 3549 5675 5589'},
               {name:'身份证复印件', src:require('@/assets/img/idCard-copy-sm.png'), id:23},
           ],
           //打印资料 //客户签字 //印章盒
@@ -335,7 +342,7 @@ export default {
                   idCardNo:'465852346854168479'},
               {name:'开户申请书', src:require('@/assets/img/goods/khsqs.png'), id:14},
               {name:'现金', src:require('@/assets/img/goods/cash-sm.png'), id:15},
-              {name:'银行卡', src:require('@/assets/img/goods/bankCard.png'), id:16},
+              {name:'银行卡', src:require('@/assets/img/goods/bankCard.png'), id:16,cardNub:'1865 3549 5675 5589'},
               {name:'存款凭条', src:require('@/assets/img/goods/ckpt.png'), id:17},
               {name:'身份证复印件', src:require('@/assets/img/idCard-copy-sm.png'), id:23},
           ],
@@ -368,7 +375,7 @@ export default {
             // goods:[/* 物品栏物品 */
             // ],
             popArr:[/* 弹窗展示的物品 */
-                {name:'银行卡',src:require('@/assets/img/goods/bankCard.png'),id:16},
+                {name:'银行卡',src:require('@/assets/img/goods/bankCard.png'),id:16,cardNub:'1865 3549 5675 5589'},
                 {name:'定期存单',src:require('@/assets/img/seal/paid.png'),id:19},
                 {name:'预留印鉴卡',src:require('@/assets/img/seal/paid.png'),id:439},
                 {name:'转账支票',src:require('@/assets/img/goods/xd-zzzp.png'),id:412},
@@ -449,7 +456,7 @@ export default {
                 {name:'转讫章',src:require('@/assets/img/seal/Transfer.png'),id:'转讫章'},
             ],
             importanceArr:[/* 重要空白凭证 */
-                {name:'银行卡',src:require('@/assets/img/goods/bankCard.png'),id:16},
+                {name:'银行卡',src:require('@/assets/img/goods/bankCard.png'),id:16,cardNub:'1865 3549 5675 5589'},
                 {name:'定期存单',src:require('@/assets/img/seal/paid.png'),id:19},
                 {name:'预留印鉴卡',src:require('@/assets/img/seal/paid.png'),id:439},
                 {name:'转账支票',src:require('@/assets/img/goods/xd-zzzp.png'),id:412},
@@ -1131,9 +1138,6 @@ export default {
     },
     methods: {
         ...mapMutations({
-            callChangeCard: 'system/callChangeCard',
-            callChangeId: 'system/callChangeId',
-            callChangePassword: 'system/callChangePassword',
             replaceThingsGoods: 'system/replaceThingsGoods',
             replaceThings: 'system/replaceThings',
             setShowBusiness: 'system/setShowBusiness',
@@ -1353,7 +1357,9 @@ export default {
         },
         showManage() {// 展示系统管理
             this.manageVisible = true;
+            // this.$router.push('/counter/list/manage/consumerClient');
             this.$router.push('/counter/list/manage/consumerClient');
+            
         },
         popSure(){/* 弹框-确定 */
             // 拦截 由于下面太多没拦截的，所以在这拦截舒服
@@ -1369,7 +1375,6 @@ export default {
                         return
                     }
                 }
-                this.callChangeCard()
             }
 
             if(this.popText.includes('身份证扫描')) {
@@ -1384,10 +1389,6 @@ export default {
                         return
                     }
                 }
-                this.callChangeId()
-            }
-            if(this.popText.includes('密码器') && this.nbm !== 8 && this.passwordForm.passwordAgain) {
-                this.callChangePassword()
             }
 
             if(this.popText === '身份证扫描仪' || this.popText === '刷卡器' || this.popText === '密码器') {
diff --git a/src/pages/counter/list/myConfig.js b/src/pages/counter/list/myConfig.js
index 4ac70ef..957dcaa 100644
--- a/src/pages/counter/list/myConfig.js
+++ b/src/pages/counter/list/myConfig.js
@@ -112,7 +112,8 @@ const myConfig = {
         nbm: 193,
         name: 'nomCallDepositOpen2',
         parentId: '285,287,5,26,60,193',
-        isPassword: false
+        isPassword: false,
+        machine: '身份证扫描仪'
     },
     '203': {
         nbm: 203,
@@ -172,13 +173,15 @@ const myConfig = {
         nbm: 291,
         name: 'nomCallDepositOpen2',
         parentId: '285,287,5,26,38,288',
-        isPassword: false
+        isPassword: false,
+        machine: '身份证扫描仪'
     },
     '297': {
         nbm: 297,
-        name: 'servicesPasswordRelievePassword',
+        name: 'nomCallDepositOpen3',
         parentId: '285,287,5,26,38,288',
-        isPassword: false
+        isPassword: false,
+        machine: '刷卡器'
     },
     '301': {
         nbm: 301,
@@ -217,7 +220,27 @@ const myConfig = {
         parentId: '285,287,5,26,59,157',
         isPassword: false,
         machine: '身份证扫描仪'
-    }
+    },
+    '302': {
+        nbm: 302,
+        name: 'nomCallDepositClosedCard',
+        parentId: '285,287,5,26,38,289',
+        isPassword: false,
+        machine: '刷卡器'
+    },
+    '392': {
+        nbm: 180,
+        name: 'nomCallDepositClosedCard2',
+        parentId: '285,287,5,26,38,289',
+        isPassword: false,
+        machine: '身份证扫描仪'
+    },
+    '394': {
+        nbm: 180,
+        name: 'nomCallDepositClosedPassword',
+        parentId: '285,287,5,26,38,289',
+        isPassword: true,
+    },
 }
 
 export {
diff --git a/src/pages/manage/list/client/consumerClient.vue b/src/pages/manage/list/client/consumerClient.vue
index 08b5160..b3a2d41 100644
--- a/src/pages/manage/list/client/consumerClient.vue
+++ b/src/pages/manage/list/client/consumerClient.vue
@@ -401,19 +401,11 @@ export default {
     computed: {
         ...mapGetters({
             dataFlow: 'system/dataFlow',
-            dataFlowId: 'system/dataFlowId',
             inMyWork: 'system/inMyWork',
             needsModule: 'system/needsModule',
             popId: 'system/popId'
         })
     },
-    
-    watch: {
-        dataFlowId(newVal) {
-            this.idNumberJudge = true
-            
-        }
-    }
 };
 </script>
 
diff --git a/src/pages/manage/list/client/corporateClient.vue b/src/pages/manage/list/client/corporateClient.vue
index 0510c80..67bd87a 100644
--- a/src/pages/manage/list/client/corporateClient.vue
+++ b/src/pages/manage/list/client/corporateClient.vue
@@ -258,7 +258,6 @@ export default {
     computed: {
         ...mapGetters({
             dataFlow: 'system/dataFlow',
-            dataFlowId: 'system/dataFlowId',
             inMyWork: 'system/inMyWork',
             needsModule: 'system/needsModule',
         })
diff --git a/src/pages/manage/list/personal/callDeposits/accountClosed.vue b/src/pages/manage/list/personal/callDeposits/accountClosed.vue
index f542058..3dbd93c 100644
--- a/src/pages/manage/list/personal/callDeposits/accountClosed.vue
+++ b/src/pages/manage/list/personal/callDeposits/accountClosed.vue
@@ -1,16 +1,16 @@
 // 销户
 <template>
-    <div class="body">
+    <div class="body" v-if="!isNeedBefore">
         <el-row :gutter="20" style="margin: 0">
             <el-form ref="form" :model="form" label-width="120px" :rules="rules">
                 <el-col :span="10" :offset="1">
                     <el-form-item label="凭证号码" required="">
-                        <div class="idCard" @click="popUp('银行卡扫描器')">
-                            <p>请填凭证号</p>
+                        <div v-if='!cardNumberJudge' class="idCard" @click="popUp('刷卡器')">
+                            <p>请刷卡</p>
+                        </div>
+                        <div v-else>
+                            <el-input ref="voucherNumber" disabled :value="form.voucherNumber" @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
                         </div>
-                        <!-- <el-select v-model="form.voucherNumber" placeholder="请选择" ref="voucherNumber">
-                            <el-option  label="存单" value="存单"> </el-option>
-                        </el-select> -->
                     </el-form-item>
                     <el-form-item label="客户号" prop="customerNumber">
                         <el-input v-model="form.customerNumber"></el-input>
@@ -26,7 +26,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="起息日期" prop="breathDate">
-                        <el-input v-model="breathDate"></el-input>
+                        <el-input v-model="form.breathDate"></el-input>
                     </el-form-item>
                     <el-form-item label="利息" prop="interest">
                         <el-input :value="form.interest" @input="val => ismoney(val, form, 'interest')" ref="interest"></el-input>
@@ -42,22 +42,14 @@
                         </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>
-                    </el-form-item>
-
+                        <div v-else>
+                            <el-input :value="form.drawPassword" disabled ref="drawPassword" type="password"></el-input>
+                        </div>
 
-                    
-                    
-                    
-                    
-                    <!-- <el-form-item label="利率（%）"  prop="interestRate">
-                        <el-input :value="form.interestRate" @input="(val) => checkHanzi(val, form, 'interestRate')" ref="interestRate"></el-input>
-                    </el-form-item> -->
-                    
-                    
-                    
+                    </el-form-item>
                 </el-col>
                 <el-col :span="10" :offset="1">
                     <el-form-item label="凭证类型" prop="depositDate">
@@ -94,9 +86,12 @@
                     </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 :value="form.idNumber" disabled ref="idNumber"></el-input>
+                        </div>
                     </el-form-item>
                     <!-- <el-form-item label="续存标识" required>
                         <el-select disabled v-model="form.identification" placeholder="请选择">
@@ -111,19 +106,39 @@
             </el-form>
         </el-row>
         <el-button @click="submitForm" type="primary" class="submitBtn">提交</el-button>
+        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
     </div>
+    <need-before v-else :moduleName='needBefore' :unNeed="unNeed" />
 </template>
 <script>
 import { ratePattern, vercustomer } from '@/utils/verify.js'
 import { myValidate, checkHanzi, checkName, ismoney, autoPlay, autoPlay2 } from '@/utils/utilFunction.js'
+
+import { mapMutations, mapGetters } from 'vuex'
+import NeedBefore from '@/components/needBefore'
+import MyDialog from '@/components/dialog'
+const moduleName = 'callDeposits/accountClosed'
 export default{
     name:'',
     props:{},
+    components: {
+        NeedBefore,
+        MyDialog
+    },
     data(){
         return{
+            idNumberJudge: false,
+            cardNumberJudge: false,
+            visible: false,
+            unNeed: false,
+            isNeedBefore: '',
+            needBefore: '',
             form:{
                 // 必填项
                 payMoney: '', // 支取金额(未对标)
+                idNumber: '', // 身份证号码
+                voucherNumber: '', // 凭证号码
+                drawPassword: '', // 支付密码
                 // 非必填项
                 // voucherNumber: '', // 凭证号码
                 currency: 'CNY人民币', // 币种
@@ -140,10 +155,31 @@ export default{
                 customerNumber: '', // 客户号(未对标)
                 noticeType: '', // 通知类型(未对标)
                 payType: '', // 支取类别(未对标)
-                
                 voucherType: '', // 凭证类型(未对标)
-
-                
+            },
+            formName:{
+                // 必填项
+                payMoney: '支取金额', // (未对标)
+                idNumber: '身份证号码', // 
+                voucherNumber: '凭证号码', // 
+                drawPassword: '支付密码', // 
+                // 非必填项
+                // voucherNumber: '', // 凭证号码
+                currency: '币种', // 
+                clientName: '客户姓名', // 
+                currencyMark: '钞汇标识', // 
+                depositNumber: '定存编号', // 
+                capital: '本金', // 
+                interestRate: '利率', // 
+                depositDate: '存期', // 
+                interest: '利息', // 
+                totalMoney: '总金额', // 
+                certificateType: '证件类型', //
+                breathDate: '起息日期', // 
+                customerNumber: '客户号', // (未对标)
+                noticeType: '通知类型', // (未对标)
+                payType: '支取类别', // (未对标)
+                voucherType: '凭证类型', // (未对标)
             },
             rules: {
                 clientName: {
@@ -255,25 +291,105 @@ export default{
             },
         }
     },
-    mounted() {
-        this.$refs.clientName.focus()
-        const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,38,289'
-        const cards = {
-            302: 'nomCallDepositCard',
-            392: 'nomCallDepositCard2',
-            394: 'nomCallDepositClosedPassword'
-        }
-        autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cards)
+    created() {
+        if(this.inMyWork(moduleName)) {
+                if(this.needsModule(moduleName) === '') {
+                    // idNumber: '', // 身份证号码
+                    // voucherNumber: '', // 凭证号码
+                    // drawPassword: '', // 支付密码
+
+                    // depositDate: '存单',
+                    // noticeType: '1天',
+                    // depositNumber: '0816',
+                    // capital: 100,
+                    // interest: 2.8,
+                    // totalMoney: 102.8,
+                    // payType: '现金',
+                    // payMoney: 102.8,
+                    // idNumber,
+                    // peopleNumber,
+                    // userName,
+                    // currency:'CNY人民币',
+                    // goldLogo:'钞户',
+                    // voucherNumber
+                    console.log('nomCallDepositClosedCard --------------')
+                    console.log(sessionStorage.getItem('nomCallDepositClosedCard'))
+                    if(sessionStorage.getItem('nomCallDepositClosedCard')) {
+                        this.cardNumberJudge = true
+                        const { depositDate, noticeType, depositNumber, capital, interest, totalMoney, payType, idNumber, 
+                                peopleNumber, userName, currency, goldLogo, voucherNumber, payMoney, voucherType } = this.dataFlow
+                        this.form.depositDate = depositDate
+                        this.form.noticeType = noticeType
+                        this.form.depositNumber = depositNumber
+                        this.form.capital = capital
+                        this.form.interest = interest
+                        this.form.totalMoney = totalMoney
+                        this.form.payType = payType
+                        this.form.idNumber = idNumber
+                        this.form.clientNumber = peopleNumber
+                        this.form.clientName = userName
+                        this.form.customerNumber = peopleNumber
+                        this.form.currency = currency
+                        this.form.currencyMark = goldLogo
+                        this.form.voucherNumber = voucherNumber
+                        this.form.payMoney = payMoney
+                        this.form.voucherType = voucherType
+                        // this.form.idNumber = 
+                    }
+
+                    if(sessionStorage.getItem('nomCallDepositClosedCard2')) {
+                        this.idNumberJudge = true
+                        const { idNumber } = this.dataFlow
+                        this.form.idNumber = idNumber
+                    }
+
+                    if(sessionStorage.getItem('nomCallDepositClosedPassword')) {
+                        this.form.drawPassword = sessionStorage.getItem('nomCallDepositClosedPassword')
+                    }
+
+                    const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,38,289'
+                    const cards = {
+                        // 302: 'nomCallDepositClosedCard',
+                        // 392: 'nomCallDepositClosedCard2',
+                        // 394: 'nomCallDepositClosedPassword'
+                    }
+                    autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cards)
+                }else {
+                    this.isNeedBefore = true
+                    this.needBefore = this.needsModule(moduleName)
+                }
+            }else {
+                this.isNeedBefore = true
+                this.unNeed = true
+            }
     },
     methods: {
+        ...mapMutations({
+            changeShowGoods: 'system/changeShowGoods',
+            setDataFlow: 'system/setDataFlow',
+            setNeedsModule: 'system/setNeedsModule',
+            setPopId: 'system/setPopId'
+        }),
         popUp(text) {
-            this.$store.commit('system/changePop',{show:true,text, id: '302'})
+            // this.$store.commit('system/changePop',{show:true,text, id: '302'})
+
+            this.$message.warning('请刷银行卡');
+            this.setPopId('302')
+            this.$router.push('/counter/list/')
         },
         popUp2(text) {
-            this.$store.commit('system/changePop',{show:true,text, id: '392'})
+            // this.$store.commit('system/changePop',{show:true,text, id: '392'})
+
+            this.$message.warning('请刷身份证');
+            this.setPopId('392')
+            this.$router.push('/counter/list/')
         },
         popUp3(text) {
-            this.$store.commit('system/changePop',{show:true,text, id: '394'})
+            // this.$store.commit('system/changePop',{show:true,text, id: '394'})
+
+            this.$message.warning('请在密码器输入密码');
+            this.setPopId('394')
+            this.$router.push('/counter/list/')
         },
         submitForm() {
             this.$refs.form.validate(myValidate(() => {
@@ -284,16 +400,16 @@ export default{
                 const nomCallDepositCard2 = sessionStorage.getItem('nomCallDepositCard2')
                 const nomCallDepositClosedPassword = sessionStorage.getItem('nomCallDepositClosedPassword')
                 const cards = [
-                    {
-                        302: nomCallDepositCard
-                    },
-                    {
-                        392: nomCallDepositCard2
-                    },
-                    {
-                        394: nomCallDepositClosedPassword,
-                      "subjectId": 17,
-                    }
+                    // {
+                    //     302: nomCallDepositCard
+                    // },
+                    // {
+                    //     392: nomCallDepositCard2
+                    // },
+                    // {
+                    //     394: nomCallDepositClosedPassword,
+                    //   "subjectId": 17,
+                    // }
                 ]
                 autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
             }, this.$refs));
@@ -301,6 +417,14 @@ export default{
         ismoney: ismoney,
         checkHanzi: checkHanzi,
         checkName: checkName
+    },
+    computed: {
+        ...mapGetters({
+            dataFlow: 'system/dataFlow',
+            needsModule: 'system/needsModule',
+            idCardNumber: 'system/idCardNumber',
+            inMyWork: 'system/inMyWork',
+        })
     }
 }
 </script>
diff --git a/src/pages/manage/list/personal/callDeposits/openAccount.vue b/src/pages/manage/list/personal/callDeposits/openAccount.vue
index 64685a9..2ca4a03 100644
--- a/src/pages/manage/list/personal/callDeposits/openAccount.vue
+++ b/src/pages/manage/list/personal/callDeposits/openAccount.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="证件类型" prop="certificateType">
-                        <el-select disabled v-model="form.certificateType" placeholder="请选择" ref="certificateType">
+                        <el-select v-model="form.certificateType" placeholder="请选择" ref="certificateType">
                             <el-option label="身份证" value="身份证"> </el-option>
                         </el-select>
                     </el-form-item>
@@ -24,7 +24,8 @@
                     </el-form-item>
                     <el-form-item label="通知类型" prop="noticeType">
                         <el-select v-model="form.noticeType" placeholder="请选择" ref="noticeType">
-                            <el-option  label="1年" value="1年"> </el-option>
+                            <el-option  label="1天" value="1天"> </el-option>
+                            <el-option  label="7天" value="7天"> </el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="金额" prop="money">
@@ -33,9 +34,12 @@
                 </el-col>
                 <el-col :span="10" :offset="1">
                     <el-form-item label="身份证" required>
-                        <div class="idCard" @click="popUp('身份证扫描器')">
+                        <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="customerName">
                         <el-input :value="form.customerName" @input="(val) => checkName(val, form, 'customerName')" ref="customerName"></el-input>
@@ -46,8 +50,11 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="凭证号码" required>
-                        <div class="idCard" @click="popUp2('刷卡器')">
-                            <p>请填凭证号码</p>
+                        <div v-if='!cardNumberJudge' class="idCard" @click="popUp2('刷卡器')">
+                            <p>请刷卡</p>
+                        </div>
+                        <div v-else>
+                            <el-input ref="voucherNumber" disabled :value="form.voucherNumber" @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
                         </div>
                     </el-form-item>
                     <el-form-item label="存款类别" prop="depositType">
@@ -56,9 +63,12 @@
                         </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>
+                            <el-input :value="form.drawPassword" disabled ref="drawPassword" type="password"></el-input>
+                        </div>
                     </el-form-item>
                 </el-col>
             </el-form>
@@ -75,26 +85,54 @@ import { myValidate, checkHanzi, checkName, ismoney, autoPlay2, autoPlay } from
 import { mapMutations, mapGetters } from 'vuex'
 import NeedBefore from '@/components/needBefore'
 import MyDialog from '@/components/dialog'
+
+const moduleName = 'callDeposits/openAccount'
 export default{
     name:'',
     props:{},
+    components: {
+        NeedBefore,
+        MyDialog
+    },
     data(){
         return{
+            idNumberJudge: false,
+            cardNumberJudge: false,
+            visible: false,
+            unNeed: false,
+            isNeedBefore: '',
+            needBefore: '',
+
             form:{
                 // 必填项
                 // identityCard: '', // 身份证
+                idNumber: '', // 身份证号码
+                voucherNumber: '', // 凭证号码
+                drawPassword: '', // 支付密码
                 customerName: '', // 客户姓名
-                currency: 'CNY人民币', // 币种
+                currency: 'CYN人民币', // 币种
                 currencyMark: '钞户', // 钞汇标识
                 voucherType: '存单', // 凭证类型
-                noticeType: '后台没有这个', // 通知类型
+                noticeType: '', // 通知类型
                 depositType: '', // '存款类别'
                 money: '', // 金额
-                // voucherNumber: '', // 凭证号码
-                // paymentCode: '', // 支付密码
                 // 非必填项
                 clientNumber: '' // 客户号
             },
+            formName: {
+                idNumber: '身份证号码', // 
+                voucherNumber: '凭证号码', // 
+                drawPassword: '支付密码', // 
+                customerName: '客户姓名', // 
+                currency: '币种', // 
+                currencyMark: '钞汇标识', // 
+                voucherType: '凭证类型', // 
+                noticeType: '通知类型', // 
+                depositType: '存款类别', // ''
+                money: '金额', // 
+                // 非必填项
+                clientNumber: '客户号' // 
+            },
             rules: {
                 customerName: vercustomer,
                 currency: [
@@ -219,9 +257,22 @@ export default{
                 // 297: 'nomCallDepositOpen3',
                 // 301: 'nomCallDepositOpenPassword'
                 if(sessionStorage.getItem('nomCallDepositOpen2')) {
-
+                    this.idNumberJudge = true
+                    const { idNumber, peopleNumber, userName, currency, goldLogo } = this.dataFlow
+                    this.form.idNumber = idNumber
+                    this.form.clientNumber = peopleNumber
+                    this.form.customerName = userName
+                    this.form.currency = currency
+                    this.form.currencyMark = goldLogo
+                }
+                if(sessionStorage.getItem('nomCallDepositOpen3')) {
+                    const { voucherNumber } = this.dataFlow
+                    this.cardNumberJudge = true
+                    this.form.voucherNumber = voucherNumber
+                }
+                if(sessionStorage.getItem('nomCallDepositOpenPassword')) {
+                    this.form.drawPassword = sessionStorage.getItem('nomCallDepositOpenPassword')
                 }
-
                 this.getFormData()
             }else {
                 this.isNeedBefore = true
@@ -232,9 +283,13 @@ export default{
             this.unNeed = true
         }
     },
-    mounted() {
-    },
     methods: {
+        ...mapMutations({
+            changeShowGoods: 'system/changeShowGoods',
+            setDataFlow: 'system/setDataFlow',
+            setNeedsModule: 'system/setNeedsModule',
+            setPopId: 'system/setPopId'
+        }),
         getFormData(){
             const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,38,288'
             const cards = {    
@@ -242,16 +297,30 @@ export default{
                 // 297: 'nomCallDepositOpen3',
                 // 301: 'nomCallDepositOpenPassword'
             }
-            autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cards)
+            const callback = () => {
+                if(this.form.idNumber) {
+                    this.idNumberJudge = true
+                }
+                if(this.form.voucherNumber) {
+                    this.cardNumberJudge = true
+                }
+            }
+            autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cards, callback)
         },
         popUp(text) {
-            this.$store.commit('system/changePop',{show:true,text, id:'291'})
+            this.$message.warning('请刷身份证');
+            this.setPopId('291')
+            this.$router.push('/counter/list/')
         },
         popUp2(text) {
-            this.$store.commit('system/changePop',{show:true,text, id:'297'})
+            this.$message.warning('请刷银行卡');
+            this.setPopId('297')
+            this.$router.push('/counter/list/')
         },
         popUp3(text) {
-            this.$store.commit('system/changePop',{show:true,text, id:'301'})
+            this.$message.warning('请在密码器输入密码');
+            this.setPopId('301')
+            this.$router.push('/counter/list/')
         },
         submitForm() {
             this.$refs.form.validate(myValidate(() => {
@@ -267,11 +336,22 @@ export default{
             const nomCallDepositOpenPassword = sessionStorage.getItem('nomCallDepositOpenPassword')
             const cards = [
             ]
+
             autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
+            this.setNeedsModule(moduleName)
         },
         ismoney: ismoney,
         checkHanzi: checkHanzi,
         checkName: checkName
+    },
+    computed: {
+        
+        ...mapGetters({
+            dataFlow: 'system/dataFlow',
+            needsModule: 'system/needsModule',
+            idCardNumber: 'system/idCardNumber',
+            inMyWork: 'system/inMyWork',
+        })
     }
 }
 </script>
diff --git a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
index 37dcbce..c8248db 100644
--- a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
+++ b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
@@ -225,36 +225,12 @@ export default{
     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 606b850..05b8c32 100644
--- a/src/pages/manage/list/personal/currentAccount/deposit.vue
+++ b/src/pages/manage/list/personal/currentAccount/deposit.vue
@@ -225,23 +225,12 @@ export default{
   computed: {
     ...mapGetters({
         dataFlow: 'system/dataFlow',
-        dataFlowCard: 'system/dataFlowCard',
         dataFlowPassword: 'system/dataFlowPassword',
         needsModule: 'system/needsModule',
         idCardNumber: 'system/idCardNumber',
         inMyWork: 'system/inMyWork'
     })	
   },
-  watch: {
-      dataFlowCard(val) {
-          const { userName, goldLogo, currency, voucherNumber } = this.dataFlow
-          this.form.userName = userName
-          this.form.goldLogo = goldLogo // goldLogo // 13是什么鬼
-          this.form.currency = currency
-          this.form.idCardNumber = voucherNumber
-          this.cardNumberJudge = true
-      }
-  }
 }
 </script>
 <style lang='scss' scoped>
diff --git a/src/pages/manage/list/personal/currentAccount/index.vue b/src/pages/manage/list/personal/currentAccount/index.vue
index 7b51518..9a6005c 100644
--- a/src/pages/manage/list/personal/currentAccount/index.vue
+++ b/src/pages/manage/list/personal/currentAccount/index.vue
@@ -107,10 +107,12 @@ export default {
     created() {
         this.handleSelect('1')
     },
+    destroyed() {
+        // sessionStorage.setItem('currentAccountIndex', )
+    },
     methods: {
         handleSelect(val){
             console.log(typeof(val),this.activeIndex,'xuanze');
-            
             this.text = this.textObj[val]
             this.activeIndex = val
         },
diff --git a/src/pages/manage/list/personal/currentAccount/openAccount.vue b/src/pages/manage/list/personal/currentAccount/openAccount.vue
index 56e2517..374ef65 100644
--- a/src/pages/manage/list/personal/currentAccount/openAccount.vue
+++ b/src/pages/manage/list/personal/currentAccount/openAccount.vue
@@ -759,40 +759,10 @@ export default {
     computed: {
         ...mapGetters({
             dataFlow: 'system/dataFlow',
-            dataFlowCard: 'system/dataFlowCard',
-            dataFlowPassword: 'system/dataFlowPassword',
             needsModule: 'system/needsModule',
             idCardNumber: 'system/idCardNumber',
             inMyWork: 'system/inMyWork'
         })
-    },
-    watch: {
-      dataFlowCard(newVal) {
-          const { voucherNumber } = this.dataFlow
-          
-          if(this.cardNumberTag === 1) {
-            this.form.cardNumber = voucherNumber
-            this.cardNumberJudge = true
-          }else if(this.cardNumberTag === 2) {
-            this.form.cardNumber2 = voucherNumber
-            this.cardNumberJudge2 = true
-          }else if(this.cardNumberTag === 3) {
-            this.form.cardNumber3 = voucherNumber
-            this.cardNumberJudge3 = true
-          }
-      },
-      dataFlowPassword(newVal) { 
-          if(this.passwordTag === 1) {
-            const accountPassword = sessionStorage.getItem('accountPassword')
-            this.form.drawPassword = accountPassword
-          }else if(this.passwordTag === 2) {
-            let accountPasswordTwo = sessionStorage.getItem('accountPasswordTwo')
-            this.form.drawPassword2 = accountPasswordTwo
-          }else if(this.passwordTag === 3) {
-            let accountPasswordThree = sessionStorage.getItem('accountPasswordThree')
-            this.form.drawPassword3 = accountPasswordThree
-          }
-      }
     }
 };
 </script>
diff --git a/src/pages/manage/list/personal/currentAccount/settle.vue b/src/pages/manage/list/personal/currentAccount/settle.vue
index 72e819d..d7a09da 100644
--- a/src/pages/manage/list/personal/currentAccount/settle.vue
+++ b/src/pages/manage/list/personal/currentAccount/settle.vue
@@ -9,7 +9,7 @@
                             <p>请刷卡</p>
                         </div>
                         <div v-else>
-                            <el-input @blur="getDataBlur" ref="cardNumber" disabled v-model="form.cardNumber" @input="(val) => inputListen(val, form, 'cardNumber')"></el-input>
+                            <el-input 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">
@@ -229,9 +229,6 @@ export default{
             setPopId: 'system/setPopId'
         }),
 //提交表单
-      getDataBlur() {
-
-      },
       submitForm(){
         this.$refs.form.validate(myValidate(() => {
             // 验证通过逻辑写在这
@@ -278,36 +275,11 @@ export default{
     computed: {
         ...mapGetters({
             dataFlow: 'system/dataFlow',
-            dataFlowCard: 'system/dataFlowCard',
-            dataFlowPassword: 'system/dataFlowPassword',
             needsModule: 'system/needsModule',
             idCardNumber: 'system/idCardNumber',
             inMyWork: 'system/inMyWork',
         })	
     },
-    watch: {
-      dataFlowCard(newVal) {
-          
-          this.$nextTick(() => {
-            this.$refs.cardNumber.focus()
-          })
-
-          // this.form.cardNumber = this.idCardNumber
-
-          this.cardNumberJudge = true
-          const { currency, userName, goldLogo, serviceCharge, chargeWay, interest } = this.dataFlow
-          this.form.currency = currency
-          this.form.userName = userName
-          this.form.goldLogo = goldLogo
-          this.form.serviceCharge = serviceCharge
-          this.form.chargeWay = chargeWay
-          this.form.interest = interest
-      },
-      dataFlowPassword(newVal) {
-        const nomCurrentSettlePassword = sessionStorage.getItem('nomCurrentSettlePassword')
-        this.form.drawPassword = nomCurrentSettlePassword
-      }
-    }
 }
 </script>
 <style lang='scss' scoped>
diff --git a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
index 06d03c1..7ef3db1 100644
--- a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
+++ b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
@@ -285,30 +285,11 @@ export default{
   computed: {
     ...mapGetters({
         dataFlow: 'system/dataFlow',
-        dataFlowCard: 'system/dataFlowCard',
-        dataFlowPassword: 'system/dataFlowPassword',
         needsModule: 'system/needsModule',
         idCardNumber: 'system/idCardNumber',
         inMyWork: 'system/inMyWork',
     })	
   },
-    watch: {
-        dataFlowCard(newVal) {
-            // 默认带出客户姓名、币种、钞汇标识、支付方式（密码）、手续费（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
-            this.form.serviceCharge = serviceCharge
-            this.form.chargeWay = chargeWay
-        },
-        dataFlowPassword(newVal) {
-            const nomCurrentTransferPassword = sessionStorage.getItem('nomCurrentTransferPassword')
-            this.form.drawPassword = nomCurrentTransferPassword
-        },
-    }
 }
 </script>
 <style lang='scss' scoped>
diff --git a/src/pages/manage/list/personal/currentAccount/withdrawal.vue b/src/pages/manage/list/personal/currentAccount/withdrawal.vue
index 483ac73..fd97363 100644
--- a/src/pages/manage/list/personal/currentAccount/withdrawal.vue
+++ b/src/pages/manage/list/personal/currentAccount/withdrawal.vue
@@ -270,28 +270,11 @@ export default{
   computed: {
     ...mapGetters({
         dataFlow: 'system/dataFlow',
-        dataFlowCard: 'system/dataFlowCard',
-        dataFlowPassword: 'system/dataFlowPassword',
         needsModule: 'system/needsModule',
         idCardNumber: 'system/idCardNumber',
         inMyWork: 'system/inMyWork'
     })	
   },
-  watch: {
-      dataFlowCard(newVal) {
-          this.form.cardNumber = this.idCardNumber
-          const { currency, userName, goldLogo, serviceCharge, chargeWay } = this.dataFlow
-          this.form.currency = currency
-          this.form.userName = userName
-          this.form.goldLogo = goldLogo
-          this.form.serviceCharge = serviceCharge
-          this.form.chargeWay = chargeWay
-      },
-      dataFlowPassword(newVal) {
-        const nomCurrentWithdrawalPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword')
-        this.form.drawPassword = nomCurrentWithdrawalPassword
-      }
-  }
 }
 </script>
 <style lang='scss' scoped>
diff --git a/src/pages/manage/list/personal/timeDeposit/deposit.vue b/src/pages/manage/list/personal/timeDeposit/deposit.vue
index 48bf654..eae174e 100644
--- a/src/pages/manage/list/personal/timeDeposit/deposit.vue
+++ b/src/pages/manage/list/personal/timeDeposit/deposit.vue
@@ -376,27 +376,11 @@ export default{
     computed: {
         ...mapGetters({
             dataFlow: 'system/dataFlow',
-            dataFlowCard: 'system/dataFlowCard',
-            dataFlowId: 'system/dataFlowId',
-            dataFlowPassword: 'system/dataFlowPassword',
             needsModule: 'system/needsModule',
             idCardNumber: 'system/idCardNumber',
             inMyWork: 'system/inMyWork',
         })
     },
-    watch: {
-        // cardNumberJudge
-      dataFlowCard(newVal) {
-        this.cardNumberJudge = true
-        this.$nextTick(() => {
-              this.$refs.voucherNumber.focus()
-          })
-      },
-      dataFlowPassword(newVal) {
-        const nomtimeDepositlPassword = sessionStorage.getItem('nomtimeDepositlPassword')
-        this.form.drawPassword = nomtimeDepositlPassword
-      }
-    }
 }
 </script>
 <style lang='scss' scoped>
diff --git a/src/pages/manage/list/personal/timeDeposit/openAccount.vue b/src/pages/manage/list/personal/timeDeposit/openAccount.vue
index 4259784..39d86bd 100644
--- a/src/pages/manage/list/personal/timeDeposit/openAccount.vue
+++ b/src/pages/manage/list/personal/timeDeposit/openAccount.vue
@@ -343,37 +343,11 @@ export default{
     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
-        this.$nextTick(() => {
-            this.$refs.voucherNumber.focus()
-        })
-      },
-      dataFlowPassword(newVal) {
-        const nomtimeOpenAccountPassword = sessionStorage.getItem('nomtimeOpenAccountPassword')
-        this.form.drawPassword = nomtimeOpenAccountPassword
-      },
-      dataFlowId(newVal) {
-          // 身份证号码、客户姓名、币种（人民币）、钞汇标识（钞户）
-          const { idNumber, userName, currency, goldLogo } = this.dataFlow
-          this.form.idNumber = idNumber
-          this.form.customerName = userName
-          this.form.currency = currency
-          this.form.currencyMark = goldLogo
-
-          this.idNumberJudge = true
-          console.log(this.idNumberJudge)
-      }
-  }
 }
 </script>
 <style lang='scss' scoped>
diff --git a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
index 5d40fef..092fe04 100644
--- a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
+++ b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
@@ -312,34 +312,11 @@ export default{
     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
-        const { userName, currency, goldLogo, interest, depositNumber, capital, withdrawType, withdrawWay, voucherNumber } = this.dataFlow
-        this.form.voucherNumber = voucherNumber
-        this.form.customerName = userName
-        this.form.currencyType = currency
-        this.form.currencyMark = goldLogo
-        this.form.interest = interest
-        this.form.depositNumber = depositNumber
-        this.form.capital = capital
-        this.form.withdrawType = withdrawType
-        this.form.withdrawWay = withdrawWay
-      },
-      dataFlowPassword(newVal) {
-        const nomtimeDepositWithdrawalPassword = sessionStorage.getItem('nomtimeDepositWithdrawalPassword')
-        this.form.drawPassword = nomtimeDepositWithdrawalPassword
-      }
-      // cardNumberJudge
-    }
 }
 </script>
 <style lang='scss' scoped>
diff --git a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
index 4604b7d..aea1a67 100644
--- a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
@@ -377,45 +377,11 @@ export default{
     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
-            const { currency, userName, depositNumber, goldLogo, capital, interestRate, interest, totalMoney, signDate, voucherNumber } = this.dataFlow
-            this.form.currency = currency
-            this.form.customerName = userName
-            this.form.depositNumber = depositNumber
-            this.form.currencyMark = goldLogo
-            this.form.capital = capital
-            this.form.interestRate = interestRate
-            this.form.interest = interest
-            this.form.totalMoney = totalMoney
-            this.form.signDate = signDate
-            this.form.voucherNumber = voucherNumber
-            this.$nextTick(() => {
-                this.$refs.voucherNumber.focus()
-            })
-        },
-        dataFlowPassword(newVal) {
-            const nomUsefulPhrasesClosedPassword = sessionStorage.getItem('nomUsefulPhrasesClosedPassword')
-            this.form.drawPassword = nomUsefulPhrasesClosedPassword
-        },
-        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/usefulPhrases/continueDeposit.vue b/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue
index 4823b79..39e960d 100644
--- a/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue
@@ -265,43 +265,11 @@ export default{
     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.form.cardNumber = this.idCardNumber
-        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')
-        console.log(nomUsefulPhrasesContinuePassword)
-        this.form.drawPassword = nomUsefulPhrasesContinuePassword
-      },
-      dataFlowId(newVal) {
-          // 身份证号码、客户姓名、币种（人民币）、钞汇标识（钞户）
-          const { currency, userName, depositNumber, goldLogo, depositTerm, monthDeposit } = this.dataFlow
-          this.form.currency = currency
-          this.form.userName = userName
-          this.form.goldLogo = goldLogo
-          this.form.depositNumber = depositNumber
-          this.form.depositTerm = depositTerm
-          this.form.monthDeposit = monthDeposit
-      }
-    }
 }
 </script>
 <style lang='scss' scoped>
diff --git a/src/pages/manage/list/personal/usefulPhrases/openAccount.vue b/src/pages/manage/list/personal/usefulPhrases/openAccount.vue
index 6f698f4..7e2b3f2 100644
--- a/src/pages/manage/list/personal/usefulPhrases/openAccount.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/openAccount.vue
@@ -374,40 +374,11 @@ export default{
     computed: {
         ...mapGetters({
             dataFlow: 'system/dataFlow',
-            dataFlowCard: 'system/dataFlowCard',
-            dataFlowId: 'system/dataFlowId',
-            dataFlowPassword: 'system/dataFlowPassword',
             needsModule: 'system/needsModule',
             idCardNumber: 'system/idCardNumber',
             inMyWork: 'system/inMyWork',
         })
     },
-    watch: {
-      dataFlowId(newVal) {
-          this.idNumberJudge = true
-          console.log(this.idNumberJudge)
-          // 身份证号码、客户姓名、币种（人民币）、钞汇标识（钞户）
-          const { idNumber, userName, peopleNumber, currency, goldLogo } = this.dataFlow
-          this.form.clientNumber = peopleNumber
-          this.form.idNumber = idNumber
-          this.form.customerName = userName
-          this.form.currency = currency
-          this.form.currencyMark = goldLogo
-          // 'currencyMark',//钞汇标识 currency
-      },
-      dataFlowCard(newVal) {
-          this.cardNumberJudge = true
-          const { voucherNumber } = this.dataFlow
-          this.form.voucherNumber = voucherNumber
-          this.$nextTick(() => {
-              this.$refs.voucherNumber.focus()
-          })
-      },
-      dataFlowPassword(newVal) {
-        let nomUsefulPhrasesOpenPassword = sessionStorage.getItem('nomUsefulPhrasesOpenPassword')
-        this.form.drawPassword = nomUsefulPhrasesOpenPassword
-      }
-    }
 }
 </script>
 <style lang='scss' scoped>
diff --git a/src/store/modules/system.js b/src/store/modules/system.js
index 8450d7f..fc543ce 100644
--- a/src/store/modules/system.js
+++ b/src/store/modules/system.js
@@ -720,9 +720,6 @@ export default {
                     'currentAccount/deposit': false,
                 },
                 // dataFlowGo: 0,
-                dataFlowCard: 0,
-                dataFlowId: 0,
-                dataFlowPassword: 0,
                 dataFlow: {
                     peopleNumber,
                     userName,//用户名字
@@ -769,9 +766,6 @@ export default {
                     'currentAccount/Cancell': false
                 },
                 // dataFlowGo: 0,
-                dataFlowCard: 0,
-                dataFlowId: 0,
-                dataFlowPassword: 0,
                 dataFlow: {
                     peopleNumber,
                     userName,//用户名字
@@ -819,9 +813,6 @@ export default {
                     'timeDeposit/openAccount': false,
                     'timeDeposit/deposit': false
                 },
-                dataFlowCard: 0,
-                dataFlowId: 0,
-                dataFlowPassword: 0,
                 dataFlow: {
                     idNumber,
                     userName,
@@ -861,9 +852,6 @@ export default {
                 needsModule: {
                     'timeDeposit/withdrawal': false
                 },
-                dataFlowCard: 0,
-                dataFlowId: 0,
-                dataFlowPassword: 0,
                 dataFlow: {
                     // 客户姓名、币种、钞汇标识、定存编号（0912）、本金（开户时存的业务中的金额）、支取类别（现金）、支取方式（密码）
                     voucherNumber,
@@ -905,9 +893,6 @@ export default {
                  needsModule: {
                     'timeDeposit/withdrawal': false
                 },
-                dataFlowCard: 0,
-                dataFlowId: 0,
-                dataFlowPassword: 0,
                 dataFlow: {
                     // 客户姓名、币种、钞汇标识、定存编号（0912）、本金（开户时存的业务中的金额）、支取类别（现金）、支取方式（密码）
                     userName,
@@ -949,9 +934,6 @@ export default {
                 needsModule: {
                     'usefulPhrases/openAccount': false
                 },
-                dataFlowCard: 0,
-                dataFlowId: 0,
-                dataFlowPassword: 0,
                 dataFlow: {
                     // 身份证号码、客户号、客户姓名、币种（人民币）、钞汇标识（钞户）
                     currency:'CNY人民币',
@@ -988,9 +970,6 @@ export default {
                 needsModule: {
                     'usefulPhrases/continueDeposit': false
                 },
-                dataFlowCard: 0,
-                dataFlowId: 0,
-                dataFlowPassword: 0,
                 dataFlow: {
                     // 客户姓名、定存编号（0816）、币种、钞汇标识、存期（显示上一业务选中的存期）、月存金额
                     userName,
@@ -1028,9 +1007,6 @@ export default {
                 needsModule: {
                     'usefulPhrases/accoumtClosed': false
                 },
-                dataFlowCard: 0,
-                dataFlowId: 0,
-                dataFlowPassword: 0,
                 dataFlow: {
                     idNumber,
                     userName,
@@ -1047,7 +1023,7 @@ export default {
                 }
             },
             '项目九': {
-                id: '',
+                id: 497,
                 data: [ 15, 13, 23, 14 ], // 现金、身份证原件、复印件、开户申请书
                 needs: [ 19, 17 ], // 定期存单 存款凭条
                 isStamp: { 
@@ -1068,9 +1044,32 @@ export default {
 
                 importanceArr: [], // 重要空白凭证箱
                 commonArr: [], // 普通凭证箱
+
+                // 以下为数据流:
+                needsModule: {
+                    'callDeposits/openAccount': false
+                },
+                dataFlow: {
+                    // 身份证号码、客户号（根据案例展示）、客户姓名、币种（人民币）、钞汇标识（钞户）
+                    idNumber,
+                    peopleNumber,
+                    userName,
+                    currency:'CNY人民币',
+                    goldLogo:'钞户',
+                    voucherNumber
+                    // depositNumber: '0816',
+                    
+                    // capital: 100,
+                    // interestRate: 1.85,
+                    // depositTerm: '1年',
+                    // interest: 1.6,
+                    // totalMoney: 101.6,
+                    // signDate: '2001-03-01',
+                    // voucherNumber
+                }
             },
             '项目十': {
-                id: '',
+                id: 498,
                 data: [ 13, 23, 19 ], // 身份证原件、复印件、定期存单
                 needs: [ 425, 427, 15 ], // 多了取款凭条、利息清单 现金
                 isStamp: { 
@@ -1091,9 +1090,40 @@ export default {
 
                 importanceArr: [], // 重要空白凭证箱
                 commonArr: [], // 普通凭证箱
+
+                needsModule: {
+                    'callDeposits/accountClosed': false
+                },
+                dataFlow: {
+                    // 凭证类型（存单）、客户号（根据案例展示）、客户姓名、币种（CNY人民币）、钞汇标识（钞户）、通知类型（根据案例展示）、定存编号（根据开户时的定存编号展示）、本金（开户时存的金额）、利息（2.8）、、总金额（利息+本金）、支取类别（现金）、支取金额（等于总金额）证件类型（身份证）
+                    // 身份证号码、客户号（根据案例展示）、客户姓名、币种（人民币）、钞汇标识（钞户）
+                    voucherType: '存单',
+                    noticeType: '1天',
+                    depositNumber: '0816',
+                    capital: 100,
+                    interest: 2.8,
+                    totalMoney: 102.8,
+                    payType: '现金',
+                    payMoney: 102.8,
+                    idNumber,
+                    peopleNumber,
+                    userName,
+                    currency:'CNY人民币',
+                    goldLogo:'钞户',
+                    voucherNumber
+                    // depositNumber: '0816',
+                    
+                    // capital: 100,
+                    // interestRate: 1.85,
+                    // depositTerm: '1年',
+                    // interest: 1.6,
+                    // totalMoney: 101.6,
+                    // signDate: '2001-03-01',
+                    // voucherNumber
+                }
             },
             '项目十一': {
-                id: '',
+                id: 499,
                 data: [ 442, 431, 432, 434, 435, 436, 437 ], 
                 needs: [ 438, 439 ], // 多了普通空白凭证， 预留印鉴卡
                 isStamp: { 
@@ -1498,16 +1528,6 @@ export default {
         setNeedsModule(state, name) {
             state.businessSelect[state.businessKey].needsModule[name] = true
         },
-        // this.callChangeCard() this.callChangeId()this.callChangePassword()
-        callChangeCard(state) {
-            state.businessSelect[state.businessKey].dataFlowCard += 1
-        },
-        callChangeId(state) {
-            state.businessSelect[state.businessKey].dataFlowId += 1
-        },
-        callChangePassword(state) {
-            state.businessSelect[state.businessKey].dataFlowPassword += 1
-        },
         setDataFlow(state, obj) {
             for(let key in obj) {
                 state.businessSelect[state.businessKey].dataFlow[key] = obj[key]
@@ -1877,15 +1897,6 @@ export default {
         // dataFlowGo(state) {
         //     return state.businessSelect[state.businessKey].dataFlowGo
         // },
-        dataFlowCard(state) {
-            return state.businessSelect[state.businessKey].dataFlowCard
-        },
-        dataFlowId(state) {
-            return state.businessSelect[state.businessKey].dataFlowId
-        },
-        dataFlowPassword(state) {
-            return state.businessSelect[state.businessKey].dataFlowPassword
-        },
         goods2(state) {
             // 调试容错采用if-else
             const arr = []