From 51baf5d9b0be15bf9eb0d1c6651532c2fcd7bd27 Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Fri, 14 Jan 2022 16:45:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=BA=86=E5=A5=BD=E5=A4=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dialog/index.vue               |   7 +
 src/components/needBefore/index.vue           |   2 +
 .../list/personal/timeDeposit/deposit.vue     | 147 ++++++++++++---
 .../list/personal/timeDeposit/openAccount.vue | 152 +++++++++++----
 .../list/personal/timeDeposit/withdrawal.vue  | 160 +++++++++++++---
 .../personal/usefulPhrases/accountClosed.vue  | 136 +++++++++++---
 .../usefulPhrases/continueDeposit.vue         | 145 ++++++++++++---
 .../personal/usefulPhrases/openAccount.vue    | 176 ++++++++++++++----
 src/store/modules/system.js                   | 161 ++++++++++++----
 src/utils/utilFunction.js                     |   3 +
 10 files changed, 882 insertions(+), 207 deletions(-)

diff --git a/src/components/dialog/index.vue b/src/components/dialog/index.vue
index 85616aa..6c28bc8 100644
--- a/src/components/dialog/index.vue
+++ b/src/components/dialog/index.vue
@@ -60,9 +60,16 @@ export default {
         formName: {
             type: Object,
             default: () => ({})
+        },
+        needAuth: {
+            type: Boolean,
+            default: true
         }
     },
     created() {
+        if(!this.needAuth) {
+            this.flow = 3
+        }
         let num = 0;
         for(const key in this.showForm) {
             if(num%2 === 0) {
diff --git a/src/components/needBefore/index.vue b/src/components/needBefore/index.vue
index 85d570b..33cdcef 100644
--- a/src/components/needBefore/index.vue
+++ b/src/components/needBefore/index.vue
@@ -17,6 +17,8 @@ const obj = {
     'currentAccount/withdrawal': '活期业务 -> 取款',
     'currentAccount/transferAccounts': '活期业务 -> 转账',
     'currentAccount/settle': '活期业务 -> 销户',
+    'timeDeposit/openAccount': '整存整取 -> 开户',
+    'timeDeposit/deposit': '整存整取 -> 存款',
 }
 
 import {mapGetters} from 'vuex'
diff --git a/src/pages/manage/list/personal/timeDeposit/deposit.vue b/src/pages/manage/list/personal/timeDeposit/deposit.vue
index fdebe80..cec8e6c 100644
--- a/src/pages/manage/list/personal/timeDeposit/deposit.vue
+++ b/src/pages/manage/list/personal/timeDeposit/deposit.vue
@@ -1,12 +1,15 @@
 // 整存整取 > 存款
 <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="popUp('身份证扫描仪')">
-                            <p>请输入凭证号</p>
+                        <div v-if='!cardNumberJudge' class="idCard" @click="popUp2('刷卡器')">
+                            <p>请刷卡</p>
+                        </div>
+                        <div v-else>
+                            <el-input @blur="getDataBlur" 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 +50,7 @@
                             <el-option  label="1年" value="1年"> </el-option>
                             <el-option  label="2年" value="2年"> </el-option>
                             <el-option  label="3年" value="3年"> </el-option>
-                            <el-option  label="五年" value="五年"> </el-option>
+                            <el-option  label="5年" value="5年"> </el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="续存" prop="extendPeriod">
@@ -57,9 +60,12 @@
                         </el-radio-group>
                     </el-form-item>
                     <el-form-item label="支取密码" required>
-                        <div class="idCard" @click="popUp2('密码器')">
+                        <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>
                     </el-form-item>
                     <el-form-item label="起息日" prop="valueDate">
                         <el-input ref="valueDate" :value="form.valueDate" @input="(val) => checkHanzi(val, form, 'valueDate')" ></el-input>
@@ -73,34 +79,66 @@
             </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 { myValidate, checkHanzi, checkName, ismoney, autoPlay, autoPlay2 } from '@/utils/utilFunction.js';
+import { myValidate, checkHanzi, checkName, ismoney, autoPlay, autoPlay2, inputListen } from '@/utils/utilFunction.js';
 import { mobPattern, namePattern, ratePattern, vercustomer  } from '@/utils/verify.js'
+
+const moduleName = 'timeDeposit/deposit'
+import { mapMutations, mapGetters } from 'vuex'
+import NeedBefore from '@/components/needBefore'
+import MyDialog from '@/components/dialog'
 export default{
     name:'',
     props:{},
+    components: {
+        NeedBefore,
+        MyDialog
+    },
     data(){
         return{
+            visible: false,
+            needBefore: '',
+            cardNumberJudge: false,
             form:{
                 // 必填项
                 // identityCard: '', // 身份证
                 customerName: '', // 客户姓名
-                currency: 'CYC人民币', // 币种
-                currencyMark: '钞户', // 钞汇标识
+                currency: '', // 币种
+                currencyMark: '', // 钞汇标识
                 depositTerm: '3个月', // 存期
                 extendPeriod: '', // 续存
                 certificateDeposit: '现金', // 存款类别
                 valueDate: '', // 起息日
-                // voucherNumber: '', // 凭证号码
-                // paymentCode: '', // 支付密码
+                voucherNumber: '', // 凭证号码
+                drawPassword: '', // 支付密码
                 // 非必填项
                 money: '', // 金额
                 interestRate: '', // 利率
                 withdrawingWay: '密码', // 支取方式
                 abstract: '' // 摘要
             },
+            formName:{
+                // 必填项
+                customerName: '客户姓名', // 
+                currency: '币种', // 
+                currencyMark: '钞汇标识', // 
+                depositTerm: '存期', // 
+                extendPeriod: '续存', // 
+                certificateDeposit: '存款类别', // 
+                valueDate: '起息日', // 
+                voucherNumber: '凭证号码', // 
+                drawPassword: '支付密码', // 
+                // 非必填项
+                money: '金额', // 
+                interestRate: '利率', // 
+                withdrawingWay: '支取方式', // 
+                abstract: '摘要' // 
+            },
             rules: {
                 customerName: vercustomer ,
                 currency: [
@@ -110,6 +148,13 @@ export default{
                         trigger: 'blur'
                     }
                 ],
+                voucherNumber: [
+                    {
+                        required: true, 
+                        message: '请输入凭证号码',
+                        trigger: 'blur'
+                    }
+                ],
                 currencyMark: [
                     { 
                         required: true, 
@@ -170,6 +215,10 @@ export default{
                 },
             },
             myTable2: {
+                131: {
+                    prop: 'voucherNumber', // 凭证号码
+                    type: '3'
+                },
                 132: {
                     prop: 'customerName',//客户姓名
                     type: '3',
@@ -213,15 +262,37 @@ export default{
             },
         }
     },
+    created() {
+        if(this.inMyWork(moduleName)) {
+            if(this.needsModule(moduleName) === '') {
+            }else {
+            this.needBefore = this.needsModule(moduleName)
+            }
+        }
+    },
     mounted() {
         this.getFormData()
         this.$refs.customerName.focus()
     },
     methods: {
+        // 客户星星、币种(CNY人民币)、钞汇标识（钞户）；
+        ...mapMutations({
+            changeShowGoods: 'system/changeShowGoods',
+            setDataFlow: 'system/setDataFlow',
+            setNeedsModule: 'system/setNeedsModule'
+        }),
+        getDataBlur() {
+            if(this.form.voucherNumber) {
+                const { userName, currency, goldLogo } = this.dataFlow
+                this.form.customerName = userName
+                this.form.currency = currency
+                this.form.currencyMark = goldLogo
+            }
+        },
         getFormData(){
             const parentId = '285,287,5,26,58,119'
             const cards = {    
-                131: 'nomtimeDeposit1',
+                // 131: 'nomtimeDeposit1',
                 140: 'nomtimeDepositlPassword'
             }
             autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cards)
@@ -233,28 +304,54 @@ export default{
             this.$store.commit('system/changePop',{show:true,text, id: '140'})
         },
         submitForm() {
-            let nomtimeDeposit1 = sessionStorage.getItem('nomtimeDeposit1')
-            let nomtimeDepositlPassword = sessionStorage.getItem('nomtimeDepositlPassword')
             this.$refs.form.validate(myValidate(() => {
                 // 验证通过逻辑写在这
                 this.visible = true;
-                const parentId = '285,287,5,26,58,119'
-                const cards = [
-                    {
-                        131: nomtimeDeposit1
-                    },
-                    {
-                        140: nomtimeDepositlPassword,
-                        "subjectId": 17,
-                    }
-                ]
-                autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
             }, this.$refs));
             
         },
+        submitForm2() {
+            let nomtimeDeposit1 = sessionStorage.getItem('nomtimeDeposit1')
+            let nomtimeDepositlPassword = sessionStorage.getItem('nomtimeDepositlPassword')
+            const parentId = '285,287,5,26,58,119'
+            const cards = [
+                // {
+                //     131: nomtimeDeposit1
+                // },
+                {
+                    140: nomtimeDepositlPassword,
+                    "subjectId": 17,
+                }
+            ]
+            autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
+        },
         ismoney: ismoney,
         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: {
+        // cardNumberJudge
+      dataFlowCard(newVal) {
+        this.cardNumberJudge = true
+        this.$nextTick(() => {
+              this.$refs.voucherNumber.focus()
+          })
+      },
+      dataFlowPassword(newVal) {
+        this.form.drawPassword = '******'
+      }
     }
 }
 </script>
diff --git a/src/pages/manage/list/personal/timeDeposit/openAccount.vue b/src/pages/manage/list/personal/timeDeposit/openAccount.vue
index 298f33c..123c09a 100644
--- a/src/pages/manage/list/personal/timeDeposit/openAccount.vue
+++ b/src/pages/manage/list/personal/timeDeposit/openAccount.vue
@@ -1,11 +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="证件类型">
-                        <el-select disabled v-model="form.certificateType" placeholder="请选择">
+                        <el-select v-model="form.certificateType" placeholder="请选择">
                             <el-option label="身份证" value="身份证"> </el-option>
                         </el-select>
                     </el-form-item>
@@ -18,21 +18,24 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="凭证类型" prop="voucherType">
-                        <el-select disabled v-model="form.voucherType" placeholder="请选择" ref="voucherType">
+                        <el-select v-model="form.voucherType" placeholder="请选择" ref="voucherType">
                             <el-option  label="存单" value="存单"> </el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="支取方式" prop="withdrawingWay">
-                        <el-select disabled v-model="form.withdrawingWay" placeholder="请选择" ref="withdrawingWay">
+                        <el-select v-model="form.withdrawingWay" placeholder="请选择" ref="withdrawingWay">
                             <el-option  label="密码" value="密码"> </el-option>
                         </el-select>
                     </el-form-item>
                 </el-col>
                 <el-col :span="10" :offset="1">
                     <el-form-item label="身份证" required>
-                        <div class="idCard" @click="popUp1('身份证扫描仪')">
+                        <div class="idCard" @click="popUp1('身份证扫描仪')" v-if='!form.idNumber'>
                             <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 ref="customerName" :value="form.customerName" @input="(val) => checkName(val, form, 'customerName')"></el-input>
@@ -42,15 +45,16 @@
                             <el-option  label="钞户" value="钞户"> </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="凭证号码" required>
-                        <div class="idCard" @click="popUp2('身份证扫描仪')">
-                            <p>请刷身份证</p>
-                        </div>
+                    <el-form-item label="凭证号码" prop='voucherNumber'>
+                        <el-input ref="voucherNumber" :value="form.voucherNumber" @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
                     </el-form-item>
                     <el-form-item label="支取密码" required>
-                        <div class="idCard" @click="popUp('密码器')">
+                        <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>
                     </el-form-item>
 <!--                    <el-form-item label="客户经理" prop="customerManage">-->
 <!--                        <el-input ref="customerManage" :value="form.customerManage" @input="(val) => checkHanzi(val, form, 'customerManage')"></el-input>-->
@@ -60,31 +64,57 @@
             </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 { myValidate, checkHanzi, checkName, autoPlay, autoPlay2 } from '@/utils/utilFunction.js';
+import { myValidate, checkHanzi, checkName, autoPlay, autoPlay2, inputListen } from '@/utils/utilFunction.js';
 import { mobPattern, namePattern, ratePattern, vercustomer } from '@/utils/verify.js'
+
+import { mapMutations, mapGetters } from 'vuex'
+import NeedBefore from '@/components/needBefore'
+import MyDialog from '@/components/dialog'
+const moduleName = 'timeDeposit/openAccount'
 export default{
     name:'',
     props:{},
+    components: {
+        NeedBefore,
+        MyDialog
+    },
     data(){
         return{
+            visible: false,
+            needBefore: '',
             form:{
                 // 必填项
-                // identityCard: '', // 身份证
+                idNumber: '', // 身份证 
                 customerName: '', // 客户姓名
                 currency: '', // 币种
                 currencyMark: '钞户', // 钞汇标识
                 voucherType: '存单', // 凭证类型
-                // voucherNumber: '', // 凭证号码
-                // paymentCode: '', // 支付密码
+                voucherNumber: '', // 凭证号码
+                drawPassword: '', // 支付密码
                 customerManage: '', // 客户经理
-                withdrawingWay:'',//支取方式
+                withdrawingWay:'密码',//支取方式
                 // 非必填项
                 certificateType: '身份证', // 证件类型
                 clientNumber: '' // 客户号
             },
+            formName: {
+                customerName: '客户姓名', // 
+                currency: '币种', // 
+                currencyMark: '钞汇标识', // 
+                voucherType: '凭证类型', // 
+                voucherNumber: '凭证号码', // 
+                customerManage: '客户经理', // 
+                withdrawingWay:'支取方式',//
+                certificateType: '证件类型', // 
+                drawPassword: '支付密码', // 
+                clientNumber: '客户号' // 
+            },
             rules: {
                 customerName: vercustomer ,
                 customerManage: [{ 
@@ -115,6 +145,13 @@ export default{
                         trigger: 'blur'
                     }
                 ],
+                voucherNumber: [
+                    { 
+                        required: true, 
+                        message: '请输入凭证号码',
+                        trigger: 'blur'
+                    }
+                ]
             },
             myTable: {
                 121: {
@@ -134,6 +171,11 @@ export default{
                     type: '3',
                     "subjectId": 7,
                 },
+                128: { // subjectId漏了？
+                    prop: 'voucherNumber',// 凭证号码
+                    type: '3',
+                },
+                
                 130: {
                     prop: 'withdrawingWay', //支取方式
                     type: '1',
@@ -157,16 +199,29 @@ export default{
             },
         }
     },
+    created() {
+    if(this.inMyWork(moduleName)) {
+        if(this.needsModule(moduleName) === '') {
+        }else {
+        this.needBefore = this.needsModule(moduleName)
+        }
+    }
+  },
     mounted() {
         this.getFormData()
         this.$refs.clientNumber.focus()
     },
     methods: {
+        ...mapMutations({
+            changeShowGoods: 'system/changeShowGoods',
+            setDataFlow: 'system/setDataFlow',
+            setNeedsModule: 'system/setNeedsModule'
+        }),
         getFormData(){
             const parentId = '285,287,5,26,58,118'
             const cards = {    
                 13: 'nomtimeOpenAccount1',
-                128: 'nomtimeOpenAccount2',
+                // 128: 'nomtimeOpenAccount2',
                 129: 'nomtimeOpenAccountPassword'
             }           
             autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cards)
@@ -187,28 +242,57 @@ export default{
             this.$refs.form.validate(myValidate(() => {
                     // 验证通过逻辑写在这
                     this.visible = true;
-                    let nomtimeOpenAccount1 = sessionStorage.getItem('nomtimeOpenAccount1')
-                    let nomtimeOpenAccount2 = sessionStorage.getItem('nomtimeOpenAccount2')
-                    let nomtimeOpenAccountPassword = sessionStorage.getItem('nomtimeOpenAccountPassword')
-                    const cards = [
-                        {
-                            13: nomtimeOpenAccount1
-                        },
-                        {
-                            128: nomtimeOpenAccount2
-                        },  
-                        {
-                            129: nomtimeOpenAccountPassword,
-                            "subjectId": 17,
-                        }
-                    ]
-                    const parentId = '285,287,5,26,58,118'
-                    autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
+                    
             }, this.$refs));
         },
+        submitForm2() {
+            let nomtimeOpenAccount1 = sessionStorage.getItem('nomtimeOpenAccount1')
+            // let nomtimeOpenAccount2 = sessionStorage.getItem('nomtimeOpenAccount2')
+            let nomtimeOpenAccountPassword = sessionStorage.getItem('nomtimeOpenAccountPassword')
+            const cards = [
+                {
+                    13: nomtimeOpenAccount1
+                },
+                // {
+                //     128: nomtimeOpenAccount2
+                // },  
+                {
+                    129: nomtimeOpenAccountPassword,
+                    "subjectId": 17,
+                }
+            ]
+            const parentId = '285,287,5,26,58,118'
+            autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
+            this.setNeedsModule(moduleName)
+        },
         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: {
+      dataFlowPassword(newVal) {
+        this.form.drawPassword = '******'
+      },
+      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
+      }
+  }
 }
 </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 f68ce33..07be595 100644
--- a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
+++ b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
@@ -1,12 +1,15 @@
 // 整存整取 > 取款
 <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="popUp('身份证扫描仪')">
-                            <p>请填凭证号码</p>
+                        <div v-if='!cardNumberJudge' class="idCard" @click="popUp2('刷卡器')">
+                            <p>请刷卡</p>
+                        </div>
+                        <div v-else>
+                            <el-input @blur="getDataBlur" ref="voucherNumber" :value="form.voucherNumber" @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
                         </div>
                     </el-form-item>
                     <el-form-item label="币种" prop="currencyType">
@@ -21,12 +24,15 @@
                         <el-input  :value="form.withdrawAmount" @input="val => ismoney(val, form, 'withdrawAmount')" ref="withdrawAmount"></el-input>
                     </el-form-item>
                     <el-form-item label="利息（%）" prop="interest">
-                        <el-input :value="form.interest" @input="(val) => checkHanzi(val, form, 'interest')" ref="interest"></el-input>
+                        <el-input :value="form.interest" @input="(val) => rateListen(val, form, 'interest')" ref="interest"></el-input>
                     </el-form-item>
                     <el-form-item label="支取密码" required>
-                        <div class="idCard" @click="popUp2('密码器')">
+                        <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>
                     </el-form-item>
                 </el-col>
                 <el-col :span="10" :offset="1">
@@ -34,7 +40,7 @@
                         <el-input :value="form.customerName" @input="(val) => checkName(val, form, 'customerName')" ref="customerName"></el-input>
                     </el-form-item>
                     <el-form-item label="钞汇标识" prop="currencyMark">
-                        <el-select disabled v-model="form.currencyMark" placeholder="请选择" ref="currencyMark">
+                        <el-select v-model="form.currencyMark" placeholder="请选择" ref="currencyMark">
                             <el-option  label="钞户" value="钞户"> </el-option>
                         </el-select>
                     </el-form-item>
@@ -42,7 +48,7 @@
                         <el-input  :value="form.capital" @input="val => ismoney(val, form, 'capital')" ref="capital" ></el-input>
                     </el-form-item>
                     <el-form-item label="支取类别" prop="withdrawType">
-                        <el-select disabled v-model="form.withdrawType" placeholder="请选择" ref="withdrawType">
+                        <el-select v-model="form.withdrawType" placeholder="请选择" ref="withdrawType">
                             <el-option  label="现金" value="现金"> </el-option>
                         </el-select>
                     </el-form-item>
@@ -57,28 +63,79 @@
             </el-form>
         </el-row>
         <el-button @click="submitIt" 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 { myValidate, checkHanzi, checkName, ismoney, autoPlay, autoPlay2 } from '@/utils/utilFunction.js';
+import { myValidate, checkHanzi, checkName, ismoney, autoPlay, autoPlay2, rateListen, inputListen } from '@/utils/utilFunction.js';
 import { mobPattern, namePattern, ratePattern, vercustomer  } from '@/utils/verify.js'
+
+const moduleName = 'consumerClient'
+import { mapMutations, mapGetters } from 'vuex'
+import NeedBefore from '@/components/needBefore'
+import MyDialog from '@/components/dialog'
 export default{
     name:'',
     props:{},
+    components: {
+        NeedBefore,
+        MyDialog
+    },
+    created() {
+        if(this.inMyWork(moduleName)) {
+            if(this.needsModule(moduleName) === '') {
+            }else {
+            this.needBefore = this.needsModule(moduleName)
+            }
+        }
+    },
     data(){
         return{
+            visible: false,
+            needBefore: '',
+            cardNumberJudge: false,
             form:{
                 // 必填项
-                currencyMark: '钞户', // 钞汇标识
+                drawPassword: '', // 凭证密码
+                cardNumber: '', // 凭证号码
+                currencyMark: '', // 钞汇标识
                 capital: '', // 本金
                 interest: '', // 利息
                 withdrawAmount: '', // 支取金额
-                withdrawType: '现金', // 支取类别
+                withdrawType: '', // 支取类别
                 withdrawWay: '', // 支取方式
+                voucherNumber: '', // 凭证号码
                 // 非必填项
                 customerName: '', // 客户姓名
                 depositNumber: '', // 定存编号
                 currencyType: '', // 币种
+
+                // userName,  这是vuex里的
+                //     currency:'CYC人民币',
+                //     goldLogo:'钞户',
+                //     interest: '0.00',
+                //     depositNubianmber: '0912',
+                //     capital: 100, // 不知道是多少
+                //     withdrawType: '现金', // 支取类别
+                //     withdrawWay: '密码', // 支取方式
+            },
+            formName:{
+                // 必填项
+                drawPassword: '凭证密码', // 
+                cardNumber: '凭证号码', // 
+                currencyMark: '钞汇标识', // 
+                capital: '本金', // 
+                interest: '利息', // 
+                withdrawAmount: '支取金额', // 
+                withdrawType: '支取类别', // 
+                withdrawWay: '支取方式', // 
+                voucherNumber: '凭证号码', // 
+                // 非必填项
+                customerName: '客户姓名', // 
+                depositNumber: '定存编号', // 
+                currencyType: '币种', // 
             },
             rules: {
                 customerName: vercustomer,
@@ -95,6 +152,11 @@ export default{
                 ]
             },
             myTable: {
+                // voucherNumber
+                144: {
+                    prop: 'voucherNumber',
+                    type: '3'
+                },
                 146: {
                     prop: 'currencyType',//币种
                     type: '1',
@@ -150,10 +212,30 @@ export default{
         this.$refs.depositNumber.focus()
     },
     methods: {
+        ...mapMutations({
+            changeShowGoods: 'system/changeShowGoods',
+            setDataFlow: 'system/setDataFlow',
+            setNeedsModule: 'system/setNeedsModule'
+        }),
+        getDataBlur() {
+            // 客户姓名、币种、钞汇标识、定存编号（0912）、本金（开户时存的业务中的金额）、支取类别（现金）、支取方式（密码）
+            if(this.form.voucherNumber) {
+                const { userName, currency, goldLogo, interest, depositNumber, capital, withdrawType, withdrawWay } = this.dataFlow
+                console.log(interest)
+                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
+            }
+        },
         getFormData(){
             const parentId = '285,287,5,26,58,120'
             const cards = {    
-                144: 'nomtimeDepositWithdrawal1',
+                // 144: 'nomtimeDepositWithdrawal1',
                 154: 'nomtimeDepositWithdrawalPassword'
             }
             autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cards)
@@ -165,27 +247,55 @@ export default{
             this.$store.commit('system/changePop',{show:true,text, id: '154'})
         },
         submitIt() {
-            let nomtimeDepositWithdrawal1 = sessionStorage.getItem('nomtimeDepositWithdrawal1')
-            let nomtimeDepositWithdrawalPassword = sessionStorage.getItem('nomtimeDepositWithdrawalPassword')
             this.$refs.form.validate(myValidate(() => {
                 // 验证通过逻辑写在这
                 this.visible = true;
-                const parentId = '285,287,5,26,58,120'
-                const cards = [
-                    {
-                        144: nomtimeDepositWithdrawal1
-                    },
-                    {
-                        154: nomtimeDepositWithdrawalPassword,
-                        "subjectId": 17,
-                    }
-                ]
-                autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
             }, this.$refs));
         },
+        submitForm2() {
+            // let nomtimeDepositWithdrawal1 = sessionStorage.getItem('nomtimeDepositWithdrawal1')
+            let nomtimeDepositWithdrawalPassword = sessionStorage.getItem('nomtimeDepositWithdrawalPassword')
+            const parentId = '285,287,5,26,58,120'
+            const cards = [
+                // {
+                //     144: nomtimeDepositWithdrawal1
+                // },
+                {
+                    154: nomtimeDepositWithdrawalPassword,
+                    "subjectId": 17,
+                }
+            ]
+            autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
+            this.setNeedsModule(moduleName)
+        },
         ismoney: ismoney,
         checkHanzi: checkHanzi,
-        checkName: checkName
+        checkName: checkName,
+        rateListen: rateListen,
+        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
+          this.$nextTick(() => {
+              this.$refs.voucherNumber.focus()
+          })
+      },
+      dataFlowPassword(newVal) {
+        this.form.drawPassword = '******'
+      }
+      // cardNumberJudge
     }
 }
 </script>
diff --git a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
index 8f1e5fa..06d644f 100644
--- a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
@@ -1,6 +1,6 @@
 // 销户
 <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">
@@ -9,9 +9,12 @@
                             <el-option label="身份证" value="身份证"> </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="凭证号码" prop="voucherNumber">
-                        <div class="idCard" @click="popUp('银行卡扫描仪')">
-                            <p>请刷银行卡</p>
+                    <el-form-item label="凭证号码" required>
+                        <div v-if='!cardNumberJudge' class="idCard" @click="popUp('刷卡器')">
+                            <p>请刷卡</p>
+                        </div>
+                        <div v-else>
+                            <el-input @blur="getDataBlur" ref="voucherNumber" :value="form.voucherNumber" @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
                         </div>
                     </el-form-item>
                     <el-form-item label="币种" prop="currency">
@@ -79,20 +82,43 @@
                         </el-select>
                     </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" :needAuth="false" />
     </div>
+    <need-before v-else :moduleName='needBefore'>
+    </need-before>
 </template>
 <script>
 import { mobPattern, namePattern, ratePattern, vercustomer } from '@/utils/verify.js'
 import { myValidate, checkHanzi, checkName, ismoney, autoPlay, autoPlay2 } from '@/utils/utilFunction.js';
+
+const moduleName = 'usefulPhrases/accoumtClosed'
+import { mapMutations, mapGetters } from 'vuex'
+import NeedBefore from '@/components/needBefore'
+import MyDialog from '@/components/dialog'
 export default{
     name:'',
     props:{},
+    components: {
+        NeedBefore,
+        MyDialog
+    },
+    created() {
+        if(this.inMyWork(moduleName)) {
+            if(this.needsModule(moduleName) === '') {
+            }else {
+            this.needBefore = this.needsModule(moduleName)
+            }
+        }
+    },
     data(){
         return{
+            cardNumberJudge: false,
+            visible: false,
+            needBefore: '',
             form:{
                 // 必填项
                 currency: '', // 币种
@@ -100,7 +126,7 @@ export default{
                 // 非必填项
                 certificateType: '', // 证件类型
                 customerName: '', // 客户姓名
-                currencyMark: '钞户', // 钞汇标识
+                currencyMark: '', // 钞汇标识
                 depositNumber: '', // 定存编号
                 capital: '', // 本金
                 interestRate: '', // 利率
@@ -109,6 +135,22 @@ export default{
                 totalMoney: '', // 总金额
                 signDate:'', // 起息日期
             },
+            formName:{
+                // 必填项
+                currency: '币种', // 
+                voucherNumber: '凭证号码', // 
+                // 非必填项
+                certificateType: '证件类型', // 
+                customerName: '客户姓名', // 
+                currencyMark: '钞汇标识', // 
+                depositNumber: '定存编号', // 
+                capital: '本金', // 
+                interestRate: '利率', // 
+                depositTerm: '存期', // 
+                interest: '利息', // 
+                totalMoney: '总金额', // 
+                signDate:'', // 
+            },
             rules: {
                 customerName: vercustomer,
                 currency: [
@@ -198,6 +240,14 @@ export default{
         this.$refs.customerName.focus()
     },
     methods: {
+        ...mapMutations({
+            changeShowGoods: 'system/changeShowGoods',
+            setDataFlow: 'system/setDataFlow',
+            setNeedsModule: 'system/setNeedsModule'
+        }),
+        getDataBlur() {
+            console.log('???')
+        },
         getFormData(){
             const parentId = '285,287,5,26,59,157'
             const cards = {    
@@ -220,29 +270,67 @@ export default{
             this.$refs.form.validate(myValidate(() => {
                 // 验证通过逻辑写在这
                 this.visible = true;
-                const parentId = '285,287,5,26,59,157'
-                const nomUsefulPhrasesClosed = sessionStorage.getItem('nomUsefulPhrasesClosed')
-                const nomUsefulPhrasesClosed2 = sessionStorage.getItem('nomUsefulPhrasesClosed2')
-                const nomUsefulPhrasesClosedPassword = sessionStorage.getItem('nomUsefulPhrasesClosedPassword')
-                const cards = [
-                    {
-                        180: nomUsefulPhrasesClosed
-                    },
-                    {
-                        181: nomUsefulPhrasesClosed2,
-                        
-                    }, 
-                    {
-                        192: nomUsefulPhrasesClosedPassword,
-                      "subjectId": 32,
-                    }
-                ]
-                autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
             }, this.$refs));
         },
+        submitForm2() {
+            const parentId = '285,287,5,26,59,157'
+            const nomUsefulPhrasesClosed = sessionStorage.getItem('nomUsefulPhrasesClosed')
+            const nomUsefulPhrasesClosed2 = sessionStorage.getItem('nomUsefulPhrasesClosed2')
+            const nomUsefulPhrasesClosedPassword = sessionStorage.getItem('nomUsefulPhrasesClosedPassword')
+            const cards = [
+                {
+                    180: nomUsefulPhrasesClosed
+                },
+                {
+                    181: nomUsefulPhrasesClosed2,
+                    
+                }, 
+                {
+                    192: nomUsefulPhrasesClosedPassword,
+                    "subjectId": 32,
+                }
+            ]
+            autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
+            this.setNeedsModule(moduleName)
+        },
         ismoney: ismoney,
         checkHanzi: checkHanzi,
         checkName: checkName
+    },
+    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()
+            })
+            const { currency, userName, depositNumber, goldLogo, capital, interestRate, interest, totalMoney, signDate } = this.dataFlow
+            this.form.currency = currency
+            this.form.customerName = userName
+            this.form.currencyMark = goldLogo
+            this.form.currencyMark = currencyMark
+            this.form.capital = capital
+            this.form.interestRate = interestRate
+            this.form.interest = interest
+            this.form.totalMoney = totalMoney
+            this.form.signDate = signDate
+        },
+        dataFlowPassword(newVal) {
+            this.form.drawPassword = '******'
+        },
+        dataFlowId(newVal) {
+            // 
+        }
     }
 }
 </script>
diff --git a/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue b/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue
index 3457e18..423fab2 100644
--- a/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue
@@ -1,19 +1,22 @@
 // 续存
 <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="popUp('身份证扫描仪')">
-                            <p>请刷银行卡</p>
+                        <div v-if='!cardNumberJudge' class="idCard" @click="popUp('刷卡器')">
+                            <p>请刷卡</p>
+                        </div>
+                        <div v-else>
+                            <el-input @blur="getDataBlur" ref="voucherNumber" :value="form.voucherNumber" @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
                         </div>
                     </el-form-item>
                     <el-form-item label="定存编号" prop="depositNumber">
                         <el-input :value="form.depositNumber" @input="(val) => checkHanzi(val, form, 'depositNumber')"></el-input>
                     </el-form-item>
                     <el-form-item label="钞汇标识" prop="moneyTarget">
-                        <el-select disabled v-model="form.moneyTarget" placeholder="请选择">
+                        <el-select v-model="form.moneyTarget" placeholder="请选择">
                             <el-option  label="钞户" value="钞户"> </el-option>
                         </el-select>
                     </el-form-item>
@@ -31,42 +34,81 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="存期" prop="depositTerm">
-                        <el-select disabled v-model="form.depositTerm" placeholder="请选择" ref="depositTerm">
+                        <el-select v-model="form.depositTerm" placeholder="请选择" ref="depositTerm">
                             <el-option  label="1年" value="1年"> </el-option>
                             <el-option  label="3年" value="3年"> </el-option>
                             <el-option  label="5年" value="5年"> </el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="支取密码" required>
-                        <div class="idCard" @click="popUp2('密码器')">
-                            <p>请设置密码</p>
+                        <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>
                     </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 { 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';
+
+const moduleName = 'usefulPhrases/continueDeposit'
+import { mapMutations, mapGetters } from 'vuex'
+import NeedBefore from '@/components/needBefore'
+import MyDialog from '@/components/dialog'
 export default{
     name:'',
     props:{},
+    components: {
+        NeedBefore,
+        MyDialog
+    },
+    created() {
+        if(this.inMyWork(moduleName)) {
+            if(this.needsModule(moduleName) === '') {
+            }else {
+            this.needBefore = this.needsModule(moduleName)
+            }
+        }
+    },
     data(){
         return{
+            visible: false,
+            needBefore: '',
+            cardNumberJudge: false,
             form:{
                 // 必填项
                 customerName: '', // 客户姓名
                 currency: '', // 币种
-                depositTerm: '1年', // 存期
-                // paymentCode: '', // 支付密码
+                depositTerm: '', // 存期
+                voucherNumber: '', // 银行卡卡号
+                drawPassword: '', // 支付密码
                 // 非必填项
                 depositNumber: '', // 定存编号
                 moneyTarget: '', // 钞汇标识
                 monthDeposit: '' // 月存金额
             },
+            formName:{
+                // 必填项
+                customerName: '客户姓名', // 
+                currency: '币种', // 
+                depositTerm: '存期', // 
+                voucherNumber: '银行卡卡号', // 
+                drawPassword: '支付密码', // 
+                // 非必填项
+                depositNumber: '定存编号', // 
+                moneyTarget: '钞汇标识', // 
+                monthDeposit: '月存金额' // 
+            },
             rules: {
                 customerName: vercustomer,
                 currency: [
@@ -125,6 +167,23 @@ export default{
         this.$refs.customerName.focus()
     },
     methods: {
+        
+        ...mapMutations({
+            changeShowGoods: 'system/changeShowGoods',
+            setDataFlow: 'system/setDataFlow',
+            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'
             const cards = {    
@@ -142,25 +201,63 @@ export default{
         submitForm() {
             this.$refs.form.validate(myValidate(() => {
                 // 验证通过逻辑写在这
-                let nomUsefulPhrasesContinueCard = sessionStorage.getItem('nomUsefulPhrasesContinueCard')
-                let nomUsefulPhrasesContinuePassword = sessionStorage.getItem('nomUsefulPhrasesContinuePassword')
+                
                 this.visible = true;
-                const parentId = '285,287,5,26,59,156'
-                const cards = [
-                    {
-                        171: nomUsefulPhrasesContinueCard,
-                    },
-                    {
-                        178: nomUsefulPhrasesContinuePassword,
-                      "subjectId": 17,
-                    }
-                ]
-                autoPlay(parentId, this.form, this.myTable2, this.myTable)
+                
             }, this.$refs));
         },
+        submitForm2() {
+            let nomUsefulPhrasesContinueCard = sessionStorage.getItem('nomUsefulPhrasesContinueCard')
+            let nomUsefulPhrasesContinuePassword = sessionStorage.getItem('nomUsefulPhrasesContinuePassword')
+            const parentId = '285,287,5,26,59,156'
+            const cards = [
+                {
+                    171: nomUsefulPhrasesContinueCard,
+                },
+                {
+                    178: nomUsefulPhrasesContinuePassword,
+                    "subjectId": 17,
+                }
+            ]
+            autoPlay(parentId, this.form, this.myTable2, this.myTable)
+        },
         ismoney: ismoney,
         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.form.cardNumber = this.idCardNumber
+          this.cardNumberJudge = true
+          this.$nextTick(() => {
+              this.$refs.voucherNumber.focus()
+          })
+      },
+      dataFlowPassword(newVal) {
+        this.form.drawPassword = '******'
+      },
+      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>
diff --git a/src/pages/manage/list/personal/usefulPhrases/openAccount.vue b/src/pages/manage/list/personal/usefulPhrases/openAccount.vue
index af9e311..0f89f24 100644
--- a/src/pages/manage/list/personal/usefulPhrases/openAccount.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/openAccount.vue
@@ -1,11 +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="证件类型" 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>
@@ -18,13 +18,16 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="凭证类型" prop="voucherType">
-                        <el-select disabled v-model="form.voucherType" placeholder="请选择" ref="voucherType">
-                            <el-option  label="存单" value="存单"> </el-option>
+                        <el-select v-model="form.voucherType" placeholder="请选择" ref="voucherType">
+                            <el-option  label="银行卡" value="银行卡"> </el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="支取密码" required>
-                        <div class="idCard" @click="popUp3('密码器')">
-                            <p>请设置密码</p>
+                        <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-form-item label="续存标识" prop="extendDepositTarget">
@@ -46,13 +49,16 @@
                         <el-input ref="customerName" :value="form.customerName" @input="(val) => checkName(val, form, 'customerName')"></el-input>
                     </el-form-item>
                     <el-form-item label="钞汇标识" prop="currencyMark">
-                        <el-select disabled v-model="form.currencyMark" placeholder="请选择" ref="currencyMark">
+                        <el-select v-model="form.currencyMark" placeholder="请选择" ref="currencyMark">
                             <el-option  label="钞户" value="钞户"> </el-option>
                         </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 @blur="getDataBlur" ref="voucherNumber" :value="form.voucherNumber" @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
                         </div>
                     </el-form-item>
                     <el-form-item label="月存金额" prop="monthDeposit">
@@ -63,37 +69,76 @@
                         <el-input :value="form.customerManage" @input="val => checkHanzi(val, form, 'customerManage')" ref="customerManage" ></el-input>
                     </el-form-item>
                 </el-col>
-               
+                <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
             </el-form>
         </el-row>
         <el-button @click="submitForm" type="primary" class="submitBtn">提交</el-button>
     </div>
+    <need-before v-else :moduleName='needBefore'>
+    </need-before>
 </template>
 <script>
-import { myValidate, checkHanzi, checkName, ismoney, autoPlay, autoPlay2 } from '@/utils/utilFunction.js';
+import { myValidate, checkHanzi, checkName, ismoney, autoPlay, autoPlay2, inputListen } from '@/utils/utilFunction.js';
 import { mobPattern, namePattern, ratePattern, vercustomer  } from '@/utils/verify.js'
+
+const moduleName = 'usefulPhrases/openAccount'
+import { mapMutations, mapGetters } from 'vuex'
+import NeedBefore from '@/components/needBefore'
+import MyDialog from '@/components/dialog'
 export default{
     name:'',
     props:{},
+    components: {
+        NeedBefore,
+        MyDialog
+    },
+    created() {
+        if(this.inMyWork(moduleName)) {
+            if(this.needsModule(moduleName) === '') {
+            }else {
+            this.needBefore = this.needsModule(moduleName)
+            }
+        }
+    },
     data(){
         return{
+            visible: false,
+            needBefore: '',
+            cardNumberJudge: false,
             form:{
                 // 必填项
                 // identityCard: '', // 身份证
                 customerName: '', // 客户姓名
-                currency: 'CYC人民币', // 币种
-                currencyMark: '钞户', // 钞汇标识
-                voucherType: '存单', // 凭证类型
+                currency: '', // 币种
+                currencyMark: '', // 钞汇标识
+                voucherType: '', // 凭证类型
                 monthDeposit: '', // 月存金额
-                depositTerm: '1年', // 存期
-                extendDepositTarget: '不续存', // 续存标识
-                // voucherNumber: '', // 凭证号码
-                // paymentCode: '', // 支付密码
+                depositTerm: '', // 存期
+                extendDepositTarget: '', // 续存标识
+                voucherNumber: '', // 凭证号码
+                drawPassword: '', // 支付密码
                 // 非必填项
                 clientNumber: '', // 客户号
-                certificateType: '', // 证件类型
+                certificateType: '身份证', // 证件类型
                 customerManage: '', // 客户经理
             },
+            formName:{
+                // 必填项
+                // identityCard: '', // 身份证
+                customerName: '客户姓名', // 
+                currency: '币种', // 
+                currencyMark: '钞汇标识', // 
+                voucherType: '凭证类型', // 
+                monthDeposit: '月存金额', // 
+                depositTerm: '存期', // 
+                extendDepositTarget: '续存标识', // 
+                voucherNumber: '凭证号码', // 
+                drawPassword: '支付密码', // 
+                // 非必填项
+                clientNumber: '客户号', // 
+                certificateType: '证件类型', // 
+                customerManage: '客户经理', // 
+            },
             rules: {
                 customerName: vercustomer,
                 currency: [
@@ -169,7 +214,7 @@ export default{
                     "subjectId": 8,
                 },
                 163: {
-                    prop: 'currencyMark',//钞汇标识
+                    prop: 'currencyMark',//钞汇标识 
                     type: '1',
                     "subjectId": 9,
                 },
@@ -178,6 +223,10 @@ export default{
                     type: '1',
                     "subjectId": 11,
                 },
+                166: {
+                    prop: 'voucherNumber',//凭证类型
+                    type: '3',
+                },
                 168: {
                     prop: 'monthDeposit',//月存金额
                     type: '3',
@@ -196,6 +245,19 @@ export default{
         this.$refs.clientNumber.focus()
     },
     methods: {
+        // userName,
+        // peopleNumber,
+        // idNumber,
+        // currency:'CYC人民币',
+        // goldLogo:'钞户',
+        ...mapMutations({
+            changeShowGoods: 'system/changeShowGoods',
+            setDataFlow: 'system/setDataFlow',
+            setNeedsModule: 'system/setNeedsModule'
+        }),
+        getDataBlur() {
+            console.log('???')
+        },
         popUp1(text) {
             this.$store.commit('system/changePop',{show:true,text, id: 1399})
         },
@@ -215,31 +277,69 @@ export default{
             autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cards)
         },
         submitForm() {
-            let nomUsefulPhrasesOpenCard = sessionStorage.getItem('nomUsefulPhrasesOpenCard')
-            let nomUsefulPhrasesOpenCard2 = sessionStorage.getItem('nomUsefulPhrasesOpenCard2')
-            let nomUsefulPhrasesOpenPassword = sessionStorage.getItem('nomUsefulPhrasesOpenPassword')
             this.$refs.form.validate(myValidate(() => {
                 // 验证通过逻辑写在这
                 this.visible = true;
-                const parentId = '285,287,5,26,59,155'
-                const cards = [
-                    {
-                        1399: nomUsefulPhrasesOpenCard2
-                    },
-                    {
-                        166: nomUsefulPhrasesOpenCard
-                    },
-                    {
-                        167: nomUsefulPhrasesOpenPassword,
-                        "subjectId": 17,
-                    }
-                ]
-                autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
             }, this.$refs));
         },
+        submitForm2() {
+            let nomUsefulPhrasesOpenCard = sessionStorage.getItem('nomUsefulPhrasesOpenCard')
+            let nomUsefulPhrasesOpenCard2 = sessionStorage.getItem('nomUsefulPhrasesOpenCard2')
+            let nomUsefulPhrasesOpenPassword = sessionStorage.getItem('nomUsefulPhrasesOpenPassword')
+            const parentId = '285,287,5,26,59,155'
+            const cards = [
+                {
+                    1399: nomUsefulPhrasesOpenCard2
+                },
+                {
+                    166: nomUsefulPhrasesOpenCard
+                },
+                {
+                    167: nomUsefulPhrasesOpenPassword,
+                    "subjectId": 17,
+                }
+            ]
+            autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
+        },
         ismoney: ismoney,
         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: {
+      dataFlowId(newVal) {
+          // 身份证号码、客户姓名、币种（人民币）、钞汇标识（钞户）
+          const { idNumber, userName, peopleNumber, currency, goldLogo } = this.dataFlow
+          console.log(peopleNumber)
+          console.log(this.dataFlow)
+          console.log(goldLogo)
+          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
+          this.$nextTick(() => {
+              this.$refs.voucherNumber.focus()
+          })
+      },
+      dataFlowPassword(newVal) {
+        this.form.drawPassword = '******'
+      }
     }
 }
 </script>
diff --git a/src/store/modules/system.js b/src/store/modules/system.js
index 8def3e0..ded5829 100644
--- a/src/store/modules/system.js
+++ b/src/store/modules/system.js
@@ -84,6 +84,11 @@ const allGoods = {
     // 472: {name:472,src:require('@/assets/img/goods/xjzp.png'),id:472},
 }
 
+const idNumber = '441325466661230215'
+const userName = '小白'
+const capital = 100
+const peopleNumber = '111222'
+
 const myInitState = {
     '': {
         data: [],
@@ -654,36 +659,7 @@ const myInitState = {
     },
 }
 
-const dataArr = {
-    '项目一': {
-        idType: '身份证',
-        idNumber:'441325466661230215',//证件号码
-        userName:'肥仔',//用户名字
-        sex:'男',//性别
-        birthday:'2008',//出生日期
-        // nationality:'汉',//民族
-        mailbox:'肥仔无处不在',//通讯地址
-        phone:'12325647895',//联系电话
-        // 生成
-        // userNumber: '', // 客户号
-
-        // currency: 'CNY人民币', // 币种
-        // userName: '', // 客户姓名
-        // goldLogo: '', // 钞汇标识
-        // accountQuality: '', // 账户性质
-        // accountType: '', // 账户类型
-        // drawWay: '', // 支取方式
-        // voucherType: '', // 凭证类型
-        // accountQualitysTwo: '', // 账户性质2
-        // accountTypesTwo: '', // 账户类型2
-        // drawWaysTwo: '', // 支取方式2
-        // voucherTypesTwo: '', // 凭证类型2
-        // accountQualitysThree: '', // 账户性质3
-        // accountTypesThree: '', // 账户类型3
-        // drawWaysThree: '', // 支取方式3
-        // voucherTypesThree: '', // 凭证类型3
-    }
-}
+
 
 const sealArray = [/* 印章盒物品默认排序 */
     '收讫章', '销户章','私章','附件章','付讫章','业务专用章', '转讫章'
@@ -742,14 +718,14 @@ export default {
                 dataFlowId: 0,
                 dataFlowPassword: 0,
                 dataFlow: {
-                    peopleNumber: '随机111222',
-                    userName:'肥仔',//用户名字
+                    peopleNumber,
+                    userName,//用户名字
                     idType: '身份证',
-                    idNumber:'441325466661230215',//证件号码
+                    idNumber,//证件号码
                     sex:'男',//性别
                     birthday:'2008',//出生日期
                     // nationality:'汉',//民族
-                    mailbox:'肥仔无处不在',//通讯地址
+                    mailbox:'广东省深圳市阳光村',//通讯地址
                     phone:'13222223122',//联系电话
 
                 }
@@ -788,17 +764,17 @@ export default {
                 dataFlowId: 0,
                 dataFlowPassword: 0,
                 dataFlow: {
-                    // peopleNumber: '随机111222',
+                    // peopleNumber,
                     // userName:'肥仔',//用户名字
                     // idType: '身份证',
-                    // idNumber:'441325466661230215',//证件号码
+                    // idNumber,//证件号码
                     // sex:'男',//性别
                     // birthday:'2008',//出生日期
                     // // nationality:'汉',//民族
                     // mailbox:'肥仔无处不在',//通讯地址
                     // phone:'13222223122',//联系电话
                     currency:'CYC人民币',
-                    userName:'肥仔',
+                    userName,
                     goldLogo:'钞户',
                     serviceCharge:'0.00',
                     chargeWay:'密码',
@@ -824,6 +800,22 @@ export default {
 
                 importanceArr: [ 19 ], // 重要空白凭证箱
                 commonArr: [], // 普通凭证箱
+
+                
+                // 以下为数据流:
+                needsModule: {
+                    'timeDeposit/openAccount': false,
+                    'timeDeposit/deposit': false
+                },
+                dataFlowCard: 0,
+                dataFlowId: 0,
+                dataFlowPassword: 0,
+                dataFlow: {
+                    idNumber,
+                    userName,
+                    currency:'CYC人民币',
+                    goldLogo:'钞户',
+                }
             },
             '项目四': {
                 data: [13, 23, 430], // 身份证原件、复印件、 430
@@ -849,6 +841,26 @@ export default {
 
                 importanceArr: [ 429 ], // 重要空白凭证箱
                 commonArr: [ 425, 17, 427 ], // 普通凭证箱
+
+                // 以下为数据流:
+                needsModule: {
+                    'timeDeposit/withdrawal': false
+                },
+                dataFlowCard: 0,
+                dataFlowId: 0,
+                dataFlowPassword: 0,
+                dataFlow: {
+                    // 客户姓名、币种、钞汇标识、定存编号（0912）、本金（开户时存的业务中的金额）、支取类别（现金）、支取方式（密码）
+                    userName,
+                    currency:'CYC人民币',
+                    goldLogo:'钞户',
+                    interest: '0.00',
+                    depositNumber: '0912',
+                    capital, // 不知道是多少
+                    withdrawType: '现金', // 支取类别
+                    withdrawWay: '密码', // 支取方式
+
+                }
             },
             '项目五': {
                 data: [13, 23, 430], // 身份证原件、复印件、 430
@@ -871,6 +883,26 @@ export default {
 
                 importanceArr: [], // 重要空白凭证箱
                 commonArr: [], // 普通凭证箱
+
+                 // 以下为数据流:
+                 needsModule: {
+                    'timeDeposit/withdrawal': false
+                },
+                dataFlowCard: 0,
+                dataFlowId: 0,
+                dataFlowPassword: 0,
+                dataFlow: {
+                    // 客户姓名、币种、钞汇标识、定存编号（0912）、本金（开户时存的业务中的金额）、支取类别（现金）、支取方式（密码）
+                    userName,
+                    currency:'CYC人民币',
+                    goldLogo:'钞户',
+                    interest: '5.75',
+                    depositNumber: '0912',
+                    capital, // 不知道是多少
+                    withdrawType: '现金', // 支取类别
+                    withdrawWay: '密码', // 支取方式
+
+                }
             },
             '项目六': {
                 data: [13, 23, 14, 15], // 身份证原件、复印件、 开户申请书、 现金
@@ -893,6 +925,23 @@ export default {
 
                 importanceArr: [], // 重要空白凭证箱
                 commonArr: [], // 普通凭证箱
+                
+                // 以下为数据流:
+                needsModule: {
+                    'usefulPhrases/openAccount': false
+                },
+                dataFlowCard: 0,
+                dataFlowId: 0,
+                dataFlowPassword: 0,
+                dataFlow: {
+                    // 身份证号码、客户号、客户姓名、币种（人民币）、钞汇标识（钞户）
+                    currency:'CYC人民币',
+                    goldLogo:'钞户',
+                    userName,
+                    peopleNumber,
+                    idNumber,
+                    
+                }
             },
             '项目七': {
                 data: [  16, 15 ], // 银行卡、 现金
@@ -913,6 +962,24 @@ export default {
 
                 importanceArr: [], // 重要空白凭证箱
                 commonArr: [], // 普通凭证箱
+
+                
+                // 以下为数据流:
+                needsModule: {
+                    'usefulPhrases/continueDeposit': false
+                },
+                dataFlowCard: 0,
+                dataFlowId: 0,
+                dataFlowPassword: 0,
+                dataFlow: {
+                    // 客户姓名、定存编号（0816）、币种、钞汇标识、存期（显示上一业务选中的存期）、月存金额
+                    userName,
+                    depositNumber: '0816',
+                    currency:'CYC人民币',
+                    goldLogo:'钞户',
+                    depositTerm: '1年',
+                    monthDeposit: 100,
+                }
             },
             '项目八': {
                 data: [  13, 23, 16 ], // 身份证原件 复印件 银行卡
@@ -934,6 +1001,26 @@ export default {
 
                 importanceArr: [], // 重要空白凭证箱
                 commonArr: [], // 普通凭证箱
+
+                // 以下为数据流:
+                needsModule: {
+                    'usefulPhrases/continueDeposit': false
+                },
+                dataFlowCard: 0,
+                dataFlowId: 0,
+                dataFlowPassword: 0,
+                dataFlow: {
+                    userName,
+                    depositNumber: '0816',
+                    currency:'CYC人民币',
+                    goldLogo:'钞户',
+                    capital: 100,
+                    interestRate: 1.85,
+                    depositTerm: '1年',
+                    interest: 1.6,
+                    totalMoney: 101.6,
+                    signDate: 3
+                }
             },
             '项目九': {
                 data: [ 15, 13, 23, 14 ], // 现金、身份证原件、复印件、开户申请书
diff --git a/src/utils/utilFunction.js b/src/utils/utilFunction.js
index c98855c..c93bae8 100644
--- a/src/utils/utilFunction.js
+++ b/src/utils/utilFunction.js
@@ -73,6 +73,9 @@ const ismoney = function(val, row, prop) {
     if(tmpCheck === ' ') {
         return;
     }
+    if(val.length === 15) {
+        return
+    }
     // const reg = /([1-9]\d{0,9}|0)(\.\d{1,2})?$/ // 不用保留
     const reg2 = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/; // 保留小数点后两位
     if (reg2.test(Number(val)) || val==='') {