diff --git a/src/components/dialog/index.vue b/src/components/dialog/index.vue
index cb2fad4..85616aa 100644
--- a/src/components/dialog/index.vue
+++ b/src/components/dialog/index.vue
@@ -63,14 +63,8 @@ export default {
         }
     },
     created() {
-        console.log('this.showForm')
-        console.log(this.showForm)
-        console.log('kao?')
         let num = 0;
         for(const key in this.showForm) {
-            // if(key === 'birthday') {
-            //     console.log(Date.format(this.showForm[key]))
-            // }
             if(num%2 === 0) {
                 this.leftObj[this.formName[key]] = this.showForm[key]
             }else {
@@ -101,7 +95,6 @@ export default {
             this.visible = false;
         },
         sureIt() {
-            console.log(this.flow)
             if(this.flow === 1) {
                 this.flow = 2
             }else if(this.flow === 2) {
diff --git a/src/components/needBefore/index.vue b/src/components/needBefore/index.vue
index 6d24b03..85d570b 100644
--- a/src/components/needBefore/index.vue
+++ b/src/components/needBefore/index.vue
@@ -13,7 +13,10 @@ const obj = {
     // 'currentAccount/deposit': '/counter/list/manage/currentAccount'
     'consumerClient': '客户信息 -> 个人客户信息建立',
     'currentAccount/openAccount': '活期业务 -> 开户',
-    'currentAccount/deposit': '活期业务 -> 存款'
+    'currentAccount/deposit': '活期业务 -> 存款',
+    'currentAccount/withdrawal': '活期业务 -> 取款',
+    'currentAccount/transferAccounts': '活期业务 -> 转账',
+    'currentAccount/settle': '活期业务 -> 销户',
 }
 
 import {mapGetters} from 'vuex'
diff --git a/src/pages/manage/list/client/consumerClient.vue b/src/pages/manage/list/client/consumerClient.vue
index fbc470a..2d5c10e 100644
--- a/src/pages/manage/list/client/consumerClient.vue
+++ b/src/pages/manage/list/client/consumerClient.vue
@@ -114,7 +114,7 @@ import MyTitle from '@/components/myTitle'
 import MyDialog from '@/components/dialog'
 // goodState: 'system/goodState',
 
-const moduleNmae = 'consumerClient'
+const moduleName = 'consumerClient'
 export default {
     name: 'index',
     data() {
@@ -240,7 +240,7 @@ export default {
         MyDialog
     },
     created() {
-        console.log(moduleNmae)
+        console.log(moduleName)
 
         this.dataFlowId2 = this.dataFlowId
     },
@@ -353,7 +353,7 @@ export default {
                           message: '提交成功',
                           type: 'success'
                       });
-                      this.setNeedsModule(moduleNmae)
+                      this.setNeedsModule(moduleName)
                       this.setDataFlow({ ...this.form })
                   }).catch((error)=>{
                   })
diff --git a/src/pages/manage/list/personal/currentAccount/deposit.vue b/src/pages/manage/list/personal/currentAccount/deposit.vue
index 5fd7df7..a644379 100644
--- a/src/pages/manage/list/personal/currentAccount/deposit.vue
+++ b/src/pages/manage/list/personal/currentAccount/deposit.vue
@@ -116,10 +116,13 @@ export default{
       
   },
   created() {
-    if(this.needsModule(moduleName) === '') {
-    }else {
-    this.needBefore = this.needsModule(moduleName)
+    if(this.inMyWork(moduleName)) {
+        if(this.needsModule(moduleName) === '') {
+        }else {
+        this.needBefore = this.needsModule(moduleName)
+        }
     }
+    
   },
   methods: {
       getFormData(){
@@ -206,7 +209,8 @@ export default{
         dataFlowCard: 'system/dataFlowCard',
         dataFlowPassword: 'system/dataFlowPassword',
         needsModule: 'system/needsModule',
-        idCardNumber: 'system/idCardNumber'
+        idCardNumber: 'system/idCardNumber',
+        inMyWork: 'system/inMyWork'
     })	
   },
   watch: {
diff --git a/src/pages/manage/list/personal/currentAccount/openAccount.vue b/src/pages/manage/list/personal/currentAccount/openAccount.vue
index b8bc32c..409b619 100644
--- a/src/pages/manage/list/personal/currentAccount/openAccount.vue
+++ b/src/pages/manage/list/personal/currentAccount/openAccount.vue
@@ -306,13 +306,14 @@ export default {
       MyDialog
     },
     created() {
-      if(this.needsModule(moduleName) === '') {
-        this.form.userNumber = this.dataFlow.peopleNumber
-        this.form.userName = this.dataFlow.userName
-      }else {
-        this.needBefore = this.needsModule(moduleName)
+      if(this.inMyWork(moduleName)) {
+        if(this.needsModule(moduleName) === '') {
+          this.form.userNumber = this.dataFlow.peopleNumber
+          this.form.userName = this.dataFlow.userName
+        }else {
+          this.needBefore = this.needsModule(moduleName)
+        }
       }
-      
     },
   mounted(){
       if(!this.needBefore) {
@@ -639,7 +640,8 @@ export default {
             dataFlowCard: 'system/dataFlowCard',
             dataFlowPassword: 'system/dataFlowPassword',
             needsModule: 'system/needsModule',
-            idCardNumber: 'system/idCardNumber'
+            idCardNumber: 'system/idCardNumber',
+            inMyWork: 'system/inMyWork'
         })
     },
     watch: {
diff --git a/src/pages/manage/list/personal/currentAccount/settle.vue b/src/pages/manage/list/personal/currentAccount/settle.vue
index 3750c32..2c38099 100644
--- a/src/pages/manage/list/personal/currentAccount/settle.vue
+++ b/src/pages/manage/list/personal/currentAccount/settle.vue
@@ -1,13 +1,16 @@
 /* 个人业务>活期业务>结清 */
 <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('刷卡器')">
+                        <div v-if='!form.cardNumber' class="idCard" @click="popUp('刷卡器')">
                             <p>请刷卡</p>
                         </div>
+                        <div v-else>
+                            <el-input :value="form.cardNumber" disabled ref="cardNumber"></el-input>
+                        </div>
                     </el-form-item>
                     <el-form-item label="币种" prop="currency">
                         <el-select v-model="form.currency" placeholder="请选择" ref="currency">
@@ -21,9 +24,12 @@
                         <el-input disabled v-model="form.totalMoney" placeholder="显示余额加利息总额"></el-input>
                     </el-form-item>
                     <el-form-item label="支取密码" required>
-                      <div class="idCard" @click="popUp('密码器')">
-                        <p>请输入密码</p>
-                      </div>
+                        <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">
@@ -52,17 +58,33 @@
             </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 { mapMutations, mapGetters } from 'vuex'
+import NeedBefore from '@/components/needBefore'
+import MyDialog from '@/components/dialog'
+const moduleName = 'currentAccount/settle'
 export default{
     name:'',
     props:{},
+    components: {
+        NeedBefore,
+        MyDialog
+    },
     data(){
         return{
+            visible: false,
+            needBefore: '',
             form:{
+              cardNumber: '',
+              drawPassword: '',
               currency:'',
               money:'',
               totalMoney:'',
@@ -72,6 +94,18 @@ export default{
               chargeWay:'',
               remark:'',
             },
+            formName:{
+              cardNumber: '卡号',
+              drawPassword: '支取密码',
+              currency:'币种',
+              money:'金额',
+              totalMoney:'总金额',
+              userName:'客户姓名',
+              goldLogo:'钞汇标识',
+              interest:'利息',
+              chargeWay:'支取方式',
+              remark:'摘要',
+            },
             rules: {
                 userName: vercustomer ,
                 chargeWay: [
@@ -130,7 +164,12 @@ export default{
         }
     },
     created() {
-      
+        if(this.inMyWork(moduleName)) {
+            if(this.needsModule(moduleName) === '') {
+            }else {
+            this.needBefore = this.needsModule(moduleName)
+            }
+        }
     },
     mounted() {
         this.$refs.userName.focus()
@@ -142,26 +181,34 @@ export default{
         autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cardArr)
     },
     methods: {
+        ...mapMutations({
+            changeShowGoods: 'system/changeShowGoods',
+            setDataFlow: 'system/setDataFlow',
+            setNeedsModule: 'system/setNeedsModule'
+        }),
 //提交表单
       submitForm(){
+        this.$refs.form.validate(myValidate(() => {
+            // 验证通过逻辑写在这
+            this.visible = true
+        }, this.$refs));
+      },
+      submitForm2() {
         let nomCurrentSettleCard = sessionStorage.getItem('nomCurrentSettleCard')
         let nomCurrentSettleCards = JSON.parse(nomCurrentSettleCard);
         let nomCurrentSettlePassword = sessionStorage.getItem('nomCurrentSettlePassword')
         let nomCurrentSettlePasswords = JSON.parse(nomCurrentSettlePassword);
-        this.$refs.form.validate(myValidate(() => {
-            // 验证通过逻辑写在这
-            const cards = [
-                {
-                    103: nomCurrentSettleCard
-                }, 
-                {
-                    111: nomCurrentSettlePassword,
-                    "subjectId": 17,
-                }
-            ]
-            const parentId = '285,287,5,26,57,66'
-            autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
-        }, this.$refs));
+        const cards = [
+            {
+                103: nomCurrentSettleCard
+            }, 
+            {
+                111: nomCurrentSettlePassword,
+                "subjectId": 17,
+            }
+        ]
+        const parentId = '285,287,5,26,57,66'
+        autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
       },
       popUp(text) {
         this.$store.commit('system/changePop',{show:true,text, id: 66})
@@ -170,6 +217,31 @@ export default{
       checkHanzi: checkHanzi,
       checkName: checkName
     },
+    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, 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) {
+        this.form.drawPassword = '******'
+      }
+    }
 }
 </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 fccddb1..d047433 100644
--- a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
+++ b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
@@ -1,13 +1,16 @@
 /* 个人业务>活期业务>转账 */
 <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('刷卡器')">
+                        <div v-if='!form.cardNumber' class="idCard" @click="popUp('刷卡器')">
                             <p>请刷卡</p>
                         </div>
+                        <div v-else>
+                            <el-input :value="form.cardNumber" disabled ref="cardNumber"></el-input>
+                        </div>
                     </el-form-item>
                     <el-form-item label="币种" prop="currency">
                         <el-select v-model="form.currency" placeholder="请选择" ref="currency">
@@ -31,9 +34,12 @@
                         </el-select>
                     </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="payeeName" >
                         <el-input :value="form.payeeName" @input="(val) => checkName(val, form, 'payeeName')" ref="payeeName"></el-input>
@@ -47,17 +53,33 @@
             </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, ismoney, checkName, autoPlay, autoPlay2 } from '@/utils/utilFunction.js'
+import { mapMutations, mapGetters } from 'vuex'
+
+const moduleName = 'currentAccount/transferAccounts'
+import MyDialog from '@/components/dialog'
+import NeedBefore from '@/components/needBefore'
 export default{
     name:'',
     props:{},
+    components: {
+        MyDialog,
+        NeedBefore
+    },
     data(){
         return{
+            visible: false,
+            needBefore: '',
             form:{
+              cardNumber: '',
+              drawPassword: '',
               currency:'',
               money:'',
               shroffAccount:'',
@@ -66,6 +88,15 @@ export default{
               payeeName:'',
               remark:'',
             },
+            formName: {
+              currency:'币种',
+              money:'金额',
+              shroffAccount:'收款卡号',
+              userName:'客户姓名',
+              goldLogo:'钞汇标识',
+              payeeName:'收款人名称',
+              remark:'摘要',
+            },
             rules: {
                 userName: vercustomer ,
                 payeeName: [
@@ -136,6 +167,14 @@ export default{
             }
         }
     },
+   created() {
+    if(this.inMyWork(moduleName)) {
+        if(this.needsModule(moduleName) === '') {
+        }else {
+        this.needBefore = this.needsModule(moduleName)
+        }
+    }
+  },
   mounted() {
       this.$refs.money.focus()
       const parentId = '285,287,5,26,57,65'
@@ -146,26 +185,38 @@ export default{
         autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cardArr)
   },
   methods: {
+    ...mapMutations({
+        changeShowGoods: 'system/changeShowGoods',
+        setDataFlow: 'system/setDataFlow',
+        setNeedsModule: 'system/setNeedsModule'
+    }),
     //提交表单
     submitForm(){
+        
+        this.$refs.form.validate(myValidate(() => {
+            
+            // 验证通过逻辑写在这
+            this.visible = true
+        }, this.$refs));
+    },
+    submitForm2() {
         let nomCurrentTransferCard = sessionStorage.getItem('nomCurrentTransferCard')
         let nomCurrentTransferCards = JSON.parse(nomCurrentTransferCard);
         let nomCurrentTransferPassword = sessionStorage.getItem('nomCurrentTransferPassword')
         let nomCurrentTransferPasswords = JSON.parse(nomCurrentTransferPassword);
-        this.$refs.form.validate(myValidate(() => {
-            // 验证通过逻辑写在这
-            const cards = [
-                {
-                    94: nomCurrentTransferCard
-                }, 
-                {
-                    99: nomCurrentTransferPassword,
-                    "subjectId": 17,
-                }
-            ]
-            const parentId = '285,287,5,26,57,65'
-            autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
-        }, this.$refs));
+        const cards = [
+            {
+                94: nomCurrentTransferCard
+            }, 
+            {
+                99: nomCurrentTransferPassword,
+                "subjectId": 17,
+            }
+        ]
+        const parentId = '285,287,5,26,57,65'
+        autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
+        this.setDataFlow({ ...this.form })
+        this.setNeedsModule(moduleName)
     },
     popUp(text) {
         this.$store.commit('system/changePop',{show:true,text, id: 65})
@@ -177,6 +228,30 @@ export default{
     checkHanzi: checkHanzi,
     checkName: checkName
   },
+  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) {
+            this.form.drawPassword = '******'
+        }
+    }
 }
 </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 b562d54..48a3790 100644
--- a/src/pages/manage/list/personal/currentAccount/withdrawal.vue
+++ b/src/pages/manage/list/personal/currentAccount/withdrawal.vue
@@ -1,13 +1,16 @@
 /* 个人业务>活期业务>取款 */
 <template>
-    <div class="body">
+    <div class="body" v-if="!needBefore">
         <el-row :gutter="20" style="margin: 0">
             <el-form ref="form" :rules="rules" :model="form" label-width="120px">
                 <el-col :span="10" :offset="1">
                     <el-form-item label="卡号" required>
-                        <div class="idCard" @click="popUp('刷卡器')">
+                        <div v-if='!form.cardNumber' class="idCard" @click="popUp('刷卡器')">
                             <p>请刷卡</p>
                         </div>
+                        <div v-else>
+                            <el-input :value="form.cardNumber" disabled ref="cardNumber"></el-input>
+                        </div>
                     </el-form-item>
                     <el-form-item label="币种" prop="currency">
                         <el-select v-model="form.currency" placeholder="请选择" ref="currency">
@@ -18,9 +21,12 @@
                         <el-input :value="form.money" @input="val => ismoney(val, form, 'money')"></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-col>
                 <el-col :span="10" :offset="1">
@@ -50,21 +56,47 @@
             </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, ismoney, checkName, checkHanzi  } from '@/utils/utilFunction.js'
 import { addOperation, getOperation } from '@/api/http';
+import { mapMutations, mapGetters } from 'vuex'
+
+const moduleName = 'currentAccount/withdrawal'
+import MyDialog from '@/components/dialog'
+import NeedBefore from '@/components/needBefore'
 export default{
     name:'',
     props:{
         depositFinish: Boolean
     },
+    components: {
+        MyDialog,
+        NeedBefore
+    },
+    created() {
+        if(this.inMyWork(moduleName)) {
+            if(this.needsModule(moduleName) === '') {
+            }else {
+            this.needBefore = this.needsModule(moduleName)
+            }
+        }
+        
+    },
     data(){
         return{
+            visible: false,
+            needBefore: '',
             form:{
+              cardNumber: '',
+              drawPassword: '',
               currency:'',
               money:'',
               userName:'',
@@ -73,6 +105,17 @@ export default{
               chargeWay:'',
               remark:'',
             },
+            formName:{
+              cardNumber: '卡号',
+              drawPassword: '支取密码',
+              currency:'币种',
+              money:'金额',
+              userName:'客户姓名',
+              goldLogo:'钞汇标识',
+              serviceCharge:'手续费',
+              chargeWay:'支取方式',
+              remark:'摘要',
+            },
             rules: {
                 userName: vercustomer ,
                 goldLogo: [
@@ -100,10 +143,17 @@ export default{
         }
     },
   mounted() {
-      this.getFormData()
-      this.$refs.userName.focus();
+        if(!this.needBefore) {
+            this.getFormData()
+            this.$refs.userName.focus();
+        }
   },
   methods: {
+        ...mapMutations({
+            changeShowGoods: 'system/changeShowGoods',
+            setDataFlow: 'system/setDataFlow',
+            setNeedsModule: 'system/setNeedsModule'
+        }),
       getFormData(){
           let param= {
               parentId: '285,287,5,26,57,64'
@@ -130,47 +180,50 @@ export default{
           })
       },
     submitForm(){
+        this.$refs.form.validate(myValidate(() => {
+            this.visible = true;
+        }, this.$refs));
+    },
+    submitForm2() {
         let projectId = sessionStorage.getItem('projectId')
         let startTime = sessionStorage.getItem('startTime')
         let nomCurrentWithdrawalCard = sessionStorage.getItem('nomCurrentWithdrawalCard')
         let nomCurrentWithdrawalCards = nomCurrentWithdrawalCard // JSON.parse(nomCurrentWithdrawalCard);
         let nomCurrentWithdrawalPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword')
         let nomCurrentWithdrawalPasswords = nomCurrentWithdrawalPassword // JSON.parse(nomCurrentWithdrawalPassword);
-        console.log(nomCurrentWithdrawalCards)
-        this.$refs.form.validate(myValidate(() => {
-            this.visible = true;
-            let formList = [];
-            // 验证通过逻辑写在这
-            if (nomCurrentWithdrawalCards && nomCurrentWithdrawalCards.length > 0 && nomCurrentWithdrawalPasswords){
-                formList.push({"answerId":85,"emptyOne": "", "emptyTwo": nomCurrentWithdrawalCards, "operationIds": "285,287,5,26,57,64,85","type": ""})// 卡号
-                formList.push({"answerId":91,"emptyOne": "", "emptyTwo": nomCurrentWithdrawalPassword, "operationIds": "285,287,5,26,57,64,91","type": ""})
-                if (this.form.currency){formList.push({"answerId":'87', "emptyOne": "8", "emptyTwo": this.form.currency, "operationIds": "285,287,5,26,57,64,87","type": "1"})}//币种
-                if (this.form.money){formList.push({"answerId":'89', "emptyOne": "14", "emptyTwo": this.form.money, "operationIds": "285,287,5,26,57,64,89", "type": "3"})}//金额
-                if (this.form.remark){formList.push({"answerId":'93', "emptyOne": "16", "emptyTwo": this.form.remark, "operationIds": "285,287,5,26,57,64,93", "type": "3"})}//摘要
-                formList.push(
-                    {"answerId":'86', "emptyOne": "7", "emptyTwo": this.form.userName, "operationIds": "285,287,5,26,57,64,86", "type": "3"},//客户姓名
-                    {"answerId":'88', "emptyOne": "9", "emptyTwo": this.form.goldLogo, "operationIds": "285,287,5,26,57,64,88", "type": "1"},//钞汇标识
-                    {"answerId":'90', "emptyOne": "15", "emptyTwo": this.form.chargeWay, "operationIds": "285,287,5,26,57,64,90", "type": "1"},//支取方式
-                    {"answerId":'92', "emptyOne": "15", "emptyTwo": this.form.serviceCharge, "operationIds": "285,287,5,26,57,64,92", "type": "3"},//手续费
-                    // {"answerId":91,"emptyOne": "", "emptyTwo": "", "operationIds": "285,287,5,26,57,64,91","type": ""}// 密码框
-                )
-                let params= {
-                    parentId:'285,287,5,26,57,64',
-                    lcJudgmentRuleReq:formList,
-                    projectId:+projectId,
-                    startTime:startTime,
-                }
-                addOperation(params).then((data)=>{
-                    this.$message({
-                        message: '提交成功',
-                        type: 'success'
-                    });
-                }).catch((error)=>{
-                })
-            }else{
-                this.$message.error('有必填项未填哦~');
+        let formList = [];
+        // 验证通过逻辑写在这
+        if (nomCurrentWithdrawalCards && nomCurrentWithdrawalCards.length > 0 && nomCurrentWithdrawalPasswords){
+            formList.push({"answerId":85,"emptyOne": "", "emptyTwo": nomCurrentWithdrawalCards, "operationIds": "285,287,5,26,57,64,85","type": ""})// 卡号
+            formList.push({"answerId":91,"emptyOne": "", "emptyTwo": nomCurrentWithdrawalPassword, "operationIds": "285,287,5,26,57,64,91","type": ""})
+            if (this.form.currency){formList.push({"answerId":'87', "emptyOne": "8", "emptyTwo": this.form.currency, "operationIds": "285,287,5,26,57,64,87","type": "1"})}//币种
+            if (this.form.money){formList.push({"answerId":'89', "emptyOne": "14", "emptyTwo": this.form.money, "operationIds": "285,287,5,26,57,64,89", "type": "3"})}//金额
+            if (this.form.remark){formList.push({"answerId":'93', "emptyOne": "16", "emptyTwo": this.form.remark, "operationIds": "285,287,5,26,57,64,93", "type": "3"})}//摘要
+            formList.push(
+                {"answerId":'86', "emptyOne": "7", "emptyTwo": this.form.userName, "operationIds": "285,287,5,26,57,64,86", "type": "3"},//客户姓名
+                {"answerId":'88', "emptyOne": "9", "emptyTwo": this.form.goldLogo, "operationIds": "285,287,5,26,57,64,88", "type": "1"},//钞汇标识
+                {"answerId":'90', "emptyOne": "15", "emptyTwo": this.form.chargeWay, "operationIds": "285,287,5,26,57,64,90", "type": "1"},//支取方式
+                {"answerId":'92', "emptyOne": "15", "emptyTwo": this.form.serviceCharge, "operationIds": "285,287,5,26,57,64,92", "type": "3"},//手续费
+                // {"answerId":91,"emptyOne": "", "emptyTwo": "", "operationIds": "285,287,5,26,57,64,91","type": ""}// 密码框
+            )
+            let params= {
+                parentId:'285,287,5,26,57,64',
+                lcJudgmentRuleReq:formList,
+                projectId:+projectId,
+                startTime:startTime,
             }
-        }, this.$refs));
+            addOperation(params).then((data)=>{
+                this.$message({
+                    message: '提交成功',
+                    type: 'success'
+                });
+                this.setDataFlow({ ...this.form })
+                this.setNeedsModule(moduleName)
+            }).catch((error)=>{
+            })
+        }else{
+            this.$message.error('有必填项未填哦~');
+        }
     },
     popUp(text) {
         this.$store.commit('system/changePop',{show:true,text,id:'64'})
@@ -179,6 +232,30 @@ export default{
     checkName: checkName,
     checkHanzi: checkHanzi 
   },
+  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) {
+        this.form.drawPassword = '******'
+      }
+  }
 }
 </script>
 <style lang='scss' scoped>
diff --git a/src/store/modules/system.js b/src/store/modules/system.js
index f97f80c..e3827a1 100644
--- a/src/store/modules/system.js
+++ b/src/store/modules/system.js
@@ -9,7 +9,7 @@ const allGoods = {
     30: {name:'银行承兑汇票',src:require('@/assets/img/seal/paid.png'),id:30},
     411: {name:411,src:require('@/assets/img/goods/xjzp.png'),id:411},
     425: {name:'取款凭条',src:require('@/assets/img/goods/qkpt.png'),id:425},
-    426: {name:426,src:require('@/assets/img/goods/zzpt.png'),id:426},
+    426: {name:'转账凭条',src:require('@/assets/img/goods/zzpt.png'),id:426},
     479: {name:'业务收费凭证',src:require('@/assets/img/goods/ywsfpz.png'),id:479},
     427: {name:'利息清单',src:require('@/assets/img/goods/lxqd.png'),id:427},
     438: {name:'普通空白凭证',src:require('@/assets/img/goods/ptkbpz.png'),id:438},
@@ -775,6 +775,35 @@ export default {
 
                 importanceArr: [], // 重要空白凭证箱
                 commonArr: [ 425, 427 ], // 普通凭证箱
+
+                // 以下为数据流:
+                needsModule: {
+                    'consumerClient': false,
+                    'currentAccount/withdrawal': false,
+                    'currentAccount/transferAccounts': false,
+                    'currentAccount/settle': false,
+                },
+                // dataFlowGo: 0,
+                dataFlowCard: 0,
+                dataFlowId: 0,
+                dataFlowPassword: 0,
+                dataFlow: {
+                    // peopleNumber: '随机111222',
+                    // userName:'肥仔',//用户名字
+                    // idType: '身份证',
+                    // idNumber:'441325466661230215',//证件号码
+                    // sex:'男',//性别
+                    // birthday:'2008',//出生日期
+                    // // nationality:'汉',//民族
+                    // mailbox:'肥仔无处不在',//通讯地址
+                    // phone:'13222223122',//联系电话
+                    currency:'CYC人民币',
+                    userName:'肥仔',
+                    goldLogo:'钞户',
+                    serviceCharge:'0.00',
+                    chargeWay:'密码',
+                    interest: '0.1'
+                }
             },
             '项目三': {
                 data: [15, 13, 23, 14], // 现金、身份证原件、复印件、开户申请书
@@ -1345,7 +1374,9 @@ export default {
         },
         setDataFlow(state, obj) {
             for(let key in obj) {
-                state.businessSelect[state.businessKey].dataFlow[key] = obj[key]
+                if(state.businessSelect[state.businessKey].dataFlow[key]) {
+                    state.businessSelect[state.businessKey].dataFlow[key] = obj[key]
+                }
             }
         },
         initState(state) {
@@ -1757,6 +1788,16 @@ export default {
                 // return
             }
             return arr
-        }
+        },
+        inMyWork(state) {
+            return (moduleName) => {
+                for(let key in state.businessSelect[state.businessKey].needsModule) {
+                    if(moduleName === key) {
+                        return true
+                    }
+                }
+                return false
+            }
+        },
     }
 }
\ No newline at end of file