diff --git a/src/pages/manage/list/foreignExchange/foreignExchange.vue b/src/pages/manage/list/foreignExchange/foreignExchange.vue
index 7fdc151..959a67c 100644
--- a/src/pages/manage/list/foreignExchange/foreignExchange.vue
+++ b/src/pages/manage/list/foreignExchange/foreignExchange.vue
@@ -2,10 +2,7 @@
   <!-- 外汇业务 -->
   <div class="wrap wrap2">
     <div class="nav">
-      <el-menu :default-active="activeIndex"
-               class="el-menu-demo"
-               mode="horizontal"
-               @select="handleSelect">
+      <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect">
         <el-menu-item index="1">购汇</el-menu-item>
         <el-menu-item index="2">结汇</el-menu-item>
 
@@ -14,30 +11,21 @@
     <MyTitle :titleArr="['外汇业务', text]" />
 
     <!-- 购汇 -->
-    <puchasing v-if="activeIndex==='1'"></puchasing>
+    <puchasing v-if="activeIndex === '1'"></puchasing>
     <!-- 结汇 -->
-    <settlement v-if="activeIndex==='2'"></settlement>
-
-    <el-dialog style="margin-top:10vh"
-               :visible.sync="visible"
-               :modal="false"
-               width="40%"
-               :close-on-click-modal="false"
-               :show-close="false"
-               custom-class="data-dia">
-      <div slot="title"
-           class="dia-header">
+    <settlement v-if="activeIndex === '2'"></settlement>
+
+    <el-dialog style="margin-top:10vh" :visible.sync="visible" :modal="false" width="40%" :close-on-click-modal="false"
+      :show-close="false" custom-class="data-dia">
+      <div slot="title" class="dia-header">
         <div class="data-title">提交</div>
       </div>
       <div class="popBody">
         <h2>本业务需要授权</h2>
       </div>
       <div class="popBtns">
-        <el-button class="close btn"
-                   @click="visible = false">取 消</el-button>
-        <el-button class="sure btn"
-                   type="primary"
-                   @click="visible = false">确 定</el-button>
+        <el-button class="close btn" @click="visible = false">取 消</el-button>
+        <el-button class="sure btn" type="primary" @click="visible = false">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -61,16 +49,9 @@ export default {
       textObj: {
         '1': '购汇',
         '2': '结汇',
-      },
-      form: {
-
       },
       visible: false,
-      options: [],
       activeIndex: '1',
-      second: [// 二级卡数组
-
-      ],
     }
   },
   created () {
@@ -95,103 +76,118 @@ export default {
 
 <style lang="scss" scoped>
 .wrap {
-    width: 100%;
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
-    padding: 24px 0 24px 24px;
-    .nav {
-        /deep/ .el-menu.el-menu--horizontal {
-            border: 0;
-        }
-        /deep/ .el-menu--horizontal > .el-menu-item.is-active {
-            border: 2px solid #568df2;
-            border-radius: 10px;
-            color: #000;
-        }
-        /deep/ .el-menu--horizontal > .el-menu-item {
-            border: 2px solid transparent;
-            border-radius: 10px;
-            margin-right: 10px;
-            height: 30px;
-            line-height: 28px;
-        }
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  padding: 24px 0 24px 24px;
+
+  .nav {
+    /deep/ .el-menu.el-menu--horizontal {
+      border: 0;
     }
-    .title {
-        height: 60px;
-        display: flex;
-        align-items: center;
-        font-size: 20px;
-        padding-left: 0px;
-        margin-top: 10px;
+
+    /deep/ .el-menu--horizontal>.el-menu-item.is-active {
+      border: 2px solid #568df2;
+      border-radius: 10px;
+      color: #000;
     }
-    .body {
-        overflow: auto;
-        .idCard {
-            border-radius: 5px;
-            background: #cfddff;
-            text-align: center;
-            height: 40px;
-            line-height: 40px;
-            font-size: 18px;
-            color: #6191ff;
-        }
-        .add {
-            position: relative;
-            &::after {
-                content: '';
-                display: block;
-                position: absolute;
-                right: 3%;
-                top: -4%;
-                border: 1px dashed #cfddff;
-                width: 88%;
-                height: 268px;
-            }
-            .addBtn {
-                position: absolute;
-                left: 0;
-                top: 50%;
-                transform: translate(50%, -50%);
-                font-size: 22px;
-            }
-        }
+
+    /deep/ .el-menu--horizontal>.el-menu-item {
+      border: 2px solid transparent;
+      border-radius: 10px;
+      margin-right: 10px;
+      height: 30px;
+      line-height: 28px;
     }
-    .submitBtn {
-        position: relative;
-        width: 300px;
-        font-size: 18px;
-        height: 45px;
-        margin-top: 50px;
-        border-radius: 10px;
-        bottom: 10px;
-        left: 50%;
-        transform: translate(-50%, -50%);
+  }
+
+  .title {
+    height: 60px;
+    display: flex;
+    align-items: center;
+    font-size: 20px;
+    padding-left: 0px;
+    margin-top: 10px;
+  }
+
+  .body {
+    overflow: auto;
+
+    .idCard {
+      border-radius: 5px;
+      background: #cfddff;
+      text-align: center;
+      height: 40px;
+      line-height: 40px;
+      font-size: 18px;
+      color: #6191ff;
     }
-    .popBody {
-        min-height: 200px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        text-align: center;
+
+    .add {
+      position: relative;
+
+      &::after {
+        content: '';
+        display: block;
+        position: absolute;
+        right: 3%;
+        top: -4%;
+        border: 1px dashed #cfddff;
+        width: 88%;
+        height: 268px;
+      }
+
+      .addBtn {
+        position: absolute;
+        left: 0;
+        top: 50%;
+        transform: translate(50%, -50%);
+        font-size: 22px;
+      }
     }
-    .popBtns {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        .btn {
-            width: 180px;
-            border-radius: 10px;
-            font-size: 18px;
-        }
-        .close {
-            background: #cfdeff;
-            color: #6191ff;
-        }
-        .sure {
-            background: #6191ff;
-            color: #fff;
-        }
+  }
+
+  .submitBtn {
+    position: relative;
+    width: 300px;
+    font-size: 18px;
+    height: 45px;
+    margin-top: 50px;
+    border-radius: 10px;
+    bottom: 10px;
+    left: 50%;
+    transform: translate(-50%, -50%);
+  }
+
+  .popBody {
+    min-height: 200px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    text-align: center;
+  }
+
+  .popBtns {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .btn {
+      width: 180px;
+      border-radius: 10px;
+      font-size: 18px;
+    }
+
+    .close {
+      background: #cfdeff;
+      color: #6191ff;
     }
+
+    .sure {
+      background: #6191ff;
+      color: #fff;
+    }
+  }
 }
 </style>
diff --git a/src/pages/manage/list/foreignExchange/puchasing.vue b/src/pages/manage/list/foreignExchange/puchasing.vue
index 1a51b6b..5c36e47 100644
--- a/src/pages/manage/list/foreignExchange/puchasing.vue
+++ b/src/pages/manage/list/foreignExchange/puchasing.vue
@@ -1,8 +1,7 @@
 <!-- 外汇业务-购汇 -->
 <template>
   <div class="body">
-    <el-row :gutter="20"
-            style="margin: 0">
+    <el-row :gutter="20" style="margin: 0">
       <div class="texts">
         <p class="text">
           <span>购汇人姓名：</span>
@@ -17,96 +16,56 @@
           剩余 等值49,200.00美元
         </p>
       </div>
-      <el-form ref="form"
-               :rules="rules"
-               :model="form"
-               label-width="120px">
-        <el-col :span="10"
-                :offset="1">
-          <el-form-item label="凭证号码"
-                        required>
-            <div v-if='!cardNumberJudge'
-                 class="idCard"
-                 @click="popUp('刷卡器')">
+      <el-form ref="form" :rules="rules" :model="form" label-width="120px">
+        <el-col :span="10" :offset="1">
+          <el-form-item label="凭证号码" required>
+            <div v-if='!cardNumberJudge' class="idCard" @click="popUp1('刷卡器')">
               <p>请刷卡</p>
             </div>
             <div v-else>
-              <el-input ref="cardNumber"
-                        disabled
-                        :value="form.cardNumber"
-                        @input="(val) => inputListen(val, form, 'cardNumber')"></el-input>
+              <el-input maxlength="20" ref="voucherNumber" disabled :value="form.voucherNumber"
+                @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
+              <p style="color: #8f8f8f;">可用余额：人民币 3,200,000.00</p>
             </div>
           </el-form-item>
-          <el-form-item label="钞汇"
-                        prop="goldLogo">
-            <el-select v-model.trim="form.goldLogo"
-                       placeholder="请选择"
-                       ref="goldLogo">
-              <el-option v-for="item in getSelectList.goldLogoSelectList"
-                         :label="item.options"
-                         :value="item.itemId"
-                         :key="item.itemId"> </el-option>
+          <el-form-item label="钞汇" prop="goldLogo">
+            <el-select v-model.trim="form.goldLogo" placeholder="请选择" ref="goldLogo">
+              <el-option v-for="item in getSelectList.goldLogoSelectList" :label="item.options" :value="item.itemId"
+                :key="item.itemId"> </el-option>
               <!-- <el-option  label="钞户" value="钞户"> </el-option> -->
             </el-select>
           </el-form-item>
-          <el-form-item label="购汇用途"
-                        prop="drawWay">
-            <el-select v-model.trim="form.drawWay"
-                       placeholder="请选择"
-                       ref="drawWay">
-              <el-option label="密码"
-                         :value="18"> </el-option>
+          <el-form-item label="购汇用途" prop="drawWay">
+            <el-select v-model.trim="form.drawWay" placeholder="请选择" ref="drawWay">
+              <el-option label="密码" :value="18"> </el-option>
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="10"
-                :offset="1">
-          <el-form-item label="币种"
-                        prop="currency">
-            <el-select v-model.trim="form.currency"
-                       placeholder="请选择"
-                       ref="currency">
-              <el-option v-for="item in getSelectList.currencySelectList"
-                         :label="item.options"
-                         :value="item.itemId"
-                         :key="item.itemId"> </el-option>
+        <el-col :span="10" :offset="1">
+          <el-form-item label="币种" prop="currency">
+            <el-select v-model.trim="form.currency" placeholder="请选择" ref="currency">
+              <el-option v-for="item in getSelectList.currencySelectList" :label="item.options" :value="item.itemId"
+                :key="item.itemId"> </el-option>
               <!-- <el-option value="CNY人民币">CNY人民币</el-option> -->
             </el-select>
           </el-form-item>
-          <el-form-item label="外汇金额"
-                        prop="money">
-            <el-input :value="form.money"
-                      maxlength="15"
-                      @input="val => ismoney(val, form, 'money')"></el-input>
+          <el-form-item label="外汇金额" prop="money">
+            <el-input :value="form.money" maxlength="15" @input="val => ismoney(val, form, 'money')"></el-input>
           </el-form-item>
-          <el-form-item label="支取密码"
-                        required>
-            <div v-if='!form.drawPassword'
-                 class="idCard"
-                 @click="popUp2('密码器')">
+          <el-form-item label="支取密码" required>
+            <div v-if='!form.drawPassword' class="idCard" @click="popUp2('密码器')">
               <p>请输入密码</p>
             </div>
-            <div v-else
-                 @click="popUp2('密码器')">
-              <el-input :value="form.drawPassword"
-                        ref="drawPassword"
-                        type="password"></el-input>
+            <div v-else @click="popUp2('密码器')">
+              <el-input :value="form.drawPassword" ref="drawPassword" type="password"></el-input>
             </div>
           </el-form-item>
         </el-col>
       </el-form>
     </el-row>
-    <el-button @click="submitForm"
-               type="primary"
-               class="submitBtn"
-               v-throttle>提交</el-button>
-    <my-dialog :moduleName="moduleName"
-               v-if="visible"
-               :visible.sync="visible"
-               :showForm="form"
-               :formName="formName"
-               @submitIt="submitForm2"
-               :needAuth="needAuth" />
+    <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
+    <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName"
+      @submitIt="submitForm2" :needAuth="needAuth" />
   </div>
 
   <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
@@ -114,7 +73,7 @@
 </template>
 <script>
 import { mobPattern, namePattern, ratePattern, vercustomer } from '@/utils/verify.js'
-import { myValidate, ismoney, checkName, checkHanzi, messagePassword } from '@/utils/utilFunction.js'
+import { myValidate, ismoney, checkName, checkHanzi, messagePassword, messageCard, inputListen } from '@/utils/utilFunction.js'
 import { addOperation, getOperation } from '@/api/http';
 import { mapMutations, mapGetters } from 'vuex'
 import TipsBefore from '@/mixins/tipsBefore'
@@ -133,60 +92,46 @@ export default {
     NeedBefore
   },
   created () {
-    if (sessionStorage.getItem('nomCurrentWithdrawalPassword')) {
-      this.form.drawPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword')
+    if (sessionStorage.getItem('nomUsefulPhrasesOpenCard')) {
+      this.cardNumberJudge = true
+      const { voucherNumber } = this.dataFlow
+      this.form.voucherNumber = voucherNumber
+    }
+    if (sessionStorage.getItem('nomUsefulPhrasesOpenPassword')) {
+      this.form.drawPassword = sessionStorage.getItem('nomUsefulPhrasesOpenPassword')
     }
-    // if(this.isNeedBefore) {
-    //     if(sessionStorage.getItem('nomCurrentWithdrawalCard')) {
-    //         this.cardNumberJudge = true
-    //         this.form.cardNumber = this.dataFlow.voucherNumber || '159753'
-    //     }
-    //     return
-    // }
     if (sessionStorage.getItem('nomCurrentWithdrawalCard')) {
       this.cardNumberJudge = true
-      const { currency, userName, goldLogo, serviceCharge, drawWay, voucherNumber } = this.dataFlow
+      const { currency, goldLogo, drawWay, voucherNumber } = this.dataFlow
       this.form.currency = currency
-      this.form.userName = userName
       this.form.goldLogo = goldLogo
-      this.form.serviceCharge = serviceCharge
       this.form.drawWay = drawWay
-      this.form.cardNumber = voucherNumber
     }
 
-
     this.getFormData()
-
   },
   data () {
     return {
-      moduleName: 'currentAccount/withdrawal',
+      moduleName: 'foreignExchange/puchasing',
       visible: false,
       cardNumberJudge: false,
       form: {
-        cardNumber: '',
-        drawPassword: '',
+        voucherNumber: '', // 凭证号码
         currency: '',
-        money: '',
-        userName: '',
         goldLogo: '',
-        serviceCharge: '',
+        money: '',
         drawWay: '',
-        remark: '',
+        drawPassword: '',
       },
       formName: {
-        cardNumber: '卡号',
-        drawPassword: '支取密码',
+        voucherNumber: '凭证号码',
         currency: '币种',
-        money: '金额',
-        userName: '客户姓名',
-        goldLogo: '钞汇标识',
-        serviceCharge: '手续费',
-        drawWay: '支取方式',
-        remark: '摘要',
+        goldLogo: '钞汇',
+        money: '外汇金额',
+        drawWay: '购汇用途',
+        drawPassword: '支取密码',
       },
       rules: {
-        userName: vercustomer,
         currency: [
           {
             required: true,
@@ -208,13 +153,6 @@ export default {
             trigger: 'blur'
           }
         ],
-        serviceCharge: [
-          {
-            required: true,
-            message: '请输入手续费',
-            trigger: 'blur'
-          }
-        ],
         money: [
           {
             required: true,
@@ -247,36 +185,31 @@ export default {
           for (var i = 0; i < list.length; i++) {
             if (list[i].answerId == '85') {
               // sessionStorage.setItem('nomCurrentWithdrawalCard', list[i].emptyTwo)
-              this.form.cardNumber = list[i].emptyTwo
               this.cardNumberJudge = true
             } //卡号
-            else if (list[i].answerId == '86') { this.form.userName = list[i].emptyTwo } //客户姓名
             else if (list[i].answerId == '87') { this.form.currency = +list[i].emptyTwo } //币种
             else if (list[i].answerId == '88') { this.form.goldLogo = +list[i].emptyTwo } //钞汇标识
             else if (list[i].answerId == '89') { this.form.money = list[i].emptyTwo } //金额
             else if (list[i].answerId == '90') { this.form.drawWay = +list[i].emptyTwo } //支取方式
             // if (list[i].answerId == '91') {sessionStorage.setItem('nomCurrentWithdrawalPassword', list[i].emptyTwo)} //支取密码
             else if (list[i].answerId == '91') {
-              console.log(91)
               if (sessionStorage.getItem('nomCurrentWithdrawalPassword')) {
                 this.form.drawPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword')
               } else {
                 this.form.drawPassword = list[i].emptyTwo
               }
             }
-            else if (list[i].answerId == '92') { this.form.serviceCharge = list[i].emptyTwo } //手续费
-            else if (list[i].answerId == '93') { this.form.remark = list[i].emptyTwo } //摘要
           }
         }
-        console.log('fffs')
-
-        console.log('issue')
-        console.log(sessionStorage.getItem('nomCurrentWithdrawalPassword'))
       }).catch((error) => {
       })
     },
     submitForm () {
       if (this.submited) return this.$message.error('已提交！')
+      if (!this.form.voucherNumber) {
+        messageCard('请填写凭证号码')
+        return
+      }
       if (!this.form.drawPassword) {
         messagePassword()
         return
@@ -295,19 +228,15 @@ export default {
       let formList = [];
       // 验证通过逻辑写在这
       // if (nomCurrentWithdrawalCards && nomCurrentWithdrawalCards.length > 0 && nomCurrentWithdrawalPasswords){
-      if (this.cardNumberJudge && this.form.cardNumber) {
+      if (this.cardNumberJudge) {
         // formList.push({"answerId":85,"emptyOne": "", "emptyTwo": nomCurrentWithdrawalCards, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,64,85","type": ""})// 卡号
-        formList.push({ "answerId": 85, "emptyOne": "", "emptyTwo": this.form.cardNumber, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,64,85", "type": "" })
         // formList.push({"answerId":91,"emptyOne": "", "emptyTwo": nomCurrentWithdrawalPassword, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,64,91","type": ""})
         formList.push({ "answerId": 91, "emptyOne": "17", "emptyTwo": this.form.drawPassword, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,64,91", "type": "3" })
         if (this.form.currency) { formList.push({ "answerId": '87', "emptyOne": "8", "emptyTwo": this.form.currency, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,64,87", "type": "1" }) }//币种
         if (this.form.money) { formList.push({ "answerId": '89', "emptyOne": "14", "emptyTwo": this.form.money, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,64,89", "type": "3" }) }//金额
-        if (this.form.remark) { formList.push({ "answerId": '93', "emptyOne": "16", "emptyTwo": this.form.remark, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,64,93", "type": "3" }) }//摘要
         formList.push(
-          { "answerId": '86', "emptyOne": "7", "emptyTwo": this.form.userName, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,64,86", "type": "3" },//客户姓名
           { "answerId": '88', "emptyOne": "9", "emptyTwo": this.form.goldLogo, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,64,88", "type": "1" },//钞汇标识
           { "answerId": '90', "emptyOne": "13", "emptyTwo": this.form.drawWay, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,64,90", "type": "1" },//支取方式
-          { "answerId": '92', "emptyOne": "46", "emptyTwo": this.form.serviceCharge, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,64,92", "type": "3" },//手续费
           // {"answerId":91,"emptyOne": "", "emptyTwo": "", "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,64,91","type": ""}// 密码框
         )
         console.log(formList)
@@ -336,21 +265,22 @@ export default {
         this.setTipsOperate('有必填项未填~');
       }
     },
-    popUp (text) {
+    popUp1 (text) {
       this.setTipsOperate('请刷银行卡');
-      this.setPopId('64')
+      this.setPopId('166')
       sessionStorage.setItem('computerPath', this.$route.fullPath)
       this.$router.push('/counter/list/')
     },
     popUp2 (text) {
       this.setTipsOperate('请在密码器输入密码');
-      this.setPopId('64,2')
+      this.setPopId('167')
       sessionStorage.setItem('computerPath', this.$route.fullPath)
       this.$router.push('/counter/list/')
     },
-    ismoney: ismoney,
-    checkName: checkName,
-    checkHanzi: checkHanzi
+    ismoney,
+    checkName,
+    checkHanzi,
+    inputListen,
   },
   computed: {
     ...mapGetters({
@@ -368,30 +298,34 @@ export default {
 </script>
 <style lang='scss' scoped>
 .wrap .body {
-    margin-top: 0;
-    overflow: auto;
-    .idCard {
-        border-radius: 5px;
-        background: #cfddff;
-        text-align: center;
-        height: 40px;
-        line-height: 40px;
-        font-size: 18px;
-        color: #6191ff;
-        cursor: pointer;
+  margin-top: 0;
+  overflow: auto;
+
+  .idCard {
+    border-radius: 5px;
+    background: #cfddff;
+    text-align: center;
+    height: 40px;
+    line-height: 40px;
+    font-size: 18px;
+    color: #6191ff;
+    cursor: pointer;
+  }
+
+  .texts {
+    margin: 30px 0 30px 80px;
+    font-size: 14px;
+    color: #666;
+
+    .text {
+      line-height: 1.6;
     }
-    .texts {
-        margin: 30px 0 30px 80px;
-        font-size: 14px;
-        color: #666;
-        .text {
-            line-height: 1.6;
-        }
-        span {
-            display: inline-block;
-            width: 90px;
-            text-align: right;
-        }
+
+    span {
+      display: inline-block;
+      width: 90px;
+      text-align: right;
     }
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/manage/list/foreignExchange/settlement.vue b/src/pages/manage/list/foreignExchange/settlement.vue
index 76128c8..0664cd4 100644
--- a/src/pages/manage/list/foreignExchange/settlement.vue
+++ b/src/pages/manage/list/foreignExchange/settlement.vue
@@ -1,8 +1,7 @@
 <!-- 外汇业务-结汇 -->
 <template>
   <div class="body">
-    <el-row :gutter="20"
-            style="margin: 0">
+    <el-row :gutter="20" style="margin: 0">
       <div class="texts">
         <p class="text">
           <span>本年额度：</span>
@@ -13,90 +12,49 @@
           剩余 等值50,000.00美元
         </p>
       </div>
-      <el-form ref="form"
-               :rules="rules"
-               :model="form"
-               label-width="120px">
-        <el-col :span="10"
-                :offset="1">
-          <el-form-item label="凭证号码"
-                        required>
-            <div v-if='!cardNumberJudge'
-                 class="idCard"
-                 @click="popUp('刷卡器')">
+      <el-form ref="form" :rules="rules" :model="form" label-width="120px">
+        <el-col :span="10" :offset="1">
+          <el-form-item label="凭证号码" required>
+            <div v-if='!cardNumberJudge' class="idCard" @click="popUp1('刷卡器')">
               <p>请刷卡</p>
             </div>
             <div v-else>
-              <el-input ref="cardNumber"
-                        disabled
-                        :value="form.cardNumber"
-                        @input="(val) => inputListen(val, form, 'cardNumber')"></el-input>
+              <el-input maxlength="20" ref="voucherNumber" disabled :value="form.voucherNumber"
+                @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
+              <p style="color: #8f8f8f;">可用余额：人民币 3,200,000.00</p>
             </div>
           </el-form-item>
-          <el-form-item label="外币金额"
-                        prop="goldLogo">
-            <el-select v-model.trim="form.goldLogo"
-                       placeholder="请选择"
-                       ref="goldLogo">
-              <el-option v-for="item in getSelectList.goldLogoSelectList"
-                         :label="item.options"
-                         :value="item.itemId"
-                         :key="item.itemId"> </el-option>
-              <!-- <el-option  label="钞户" value="钞户"> </el-option> -->
-            </el-select>
+          <el-form-item label="外币金额" prop="money">
+            <el-input :value="form.money" maxlength="15" @input="val => ismoney(val, form, 'money')"></el-input>
           </el-form-item>
-          <el-form-item label="支取密码"
-                        required>
-            <div v-if='!form.drawPassword'
-                 class="idCard"
-                 @click="popUp2('密码器')">
+          <el-form-item label="支取密码" required>
+            <div v-if='!form.drawPassword' class="idCard" @click="popUp2('密码器')">
               <p>请输入密码</p>
             </div>
-            <div v-else
-                 @click="popUp2('密码器')">
-              <el-input :value="form.drawPassword"
-                        ref="drawPassword"
-                        type="password"></el-input>
+            <div v-else @click="popUp2('密码器')">
+              <el-input :value="form.drawPassword" ref="drawPassword" type="password"></el-input>
             </div>
           </el-form-item>
         </el-col>
-        <el-col :span="10"
-                :offset="1">
-          <el-form-item label="币种"
-                        prop="currency">
-            <el-select v-model.trim="form.currency"
-                       placeholder="请选择"
-                       ref="currency">
-              <el-option v-for="item in getSelectList.currencySelectList"
-                         :label="item.options"
-                         :value="item.itemId"
-                         :key="item.itemId"> </el-option>
+        <el-col :span="10" :offset="1">
+          <el-form-item label="币种" prop="currency">
+            <el-select v-model.trim="form.currency" placeholder="请选择" ref="currency">
+              <el-option v-for="item in getSelectList.currencySelectList" :label="item.options" :value="item.itemId"
+                :key="item.itemId"> </el-option>
               <!-- <el-option value="CNY人民币">CNY人民币</el-option> -->
             </el-select>
           </el-form-item>
-          <el-form-item label="资金来源"
-                        prop="drawWay">
-            <el-select v-model.trim="form.drawWay"
-                       placeholder="请选择"
-                       ref="drawWay">
-              <el-option label="密码"
-                         :value="18"> </el-option>
+          <el-form-item label="资金来源" prop="drawWay">
+            <el-select v-model.trim="form.drawWay" placeholder="请选择" ref="drawWay">
+              <el-option label="密码" :value="18"> </el-option>
             </el-select>
           </el-form-item>
         </el-col>
       </el-form>
     </el-row>
-    <el-button @click="submitForm"
-               type="primary"
-               class="submitBtn"
-               v-throttle>提交</el-button>
-    <my-dialog :moduleName="moduleName"
-               v-if="visible"
-               :visible.sync="visible"
-               :showForm="form"
-               :formName="formName"
-               @submitIt="submitForm2"
-               :needAuth="needAuth" />
+    <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
+    <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName"
+      @submitIt="submitForm2" :needAuth="needAuth" />
   </div>
 
   <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
@@ -104,7 +62,7 @@
 </template>
 <script>
 import { mobPattern, namePattern, ratePattern, vercustomer } from '@/utils/verify.js'
-import { myValidate, ismoney, checkName, checkHanzi, messagePassword } from '@/utils/utilFunction.js'
+import { myValidate, ismoney, checkName, checkHanzi, messagePassword, messageCard } from '@/utils/utilFunction.js'
 import { addOperation, getOperation } from '@/api/http';
 import { mapMutations, mapGetters } from 'vuex'
 import TipsBefore from '@/mixins/tipsBefore'
@@ -126,13 +84,6 @@ export default {
     if (sessionStorage.getItem('nomCurrentWithdrawalPassword')) {
       this.form.drawPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword')
     }
-    // if(this.isNeedBefore) {
-    //     if(sessionStorage.getItem('nomCurrentWithdrawalCard')) {
-    //         this.cardNumberJudge = true
-    //         this.form.cardNumber = this.dataFlow.voucherNumber || '159753'
-    //     }
-    //     return
-    // }
     if (sessionStorage.getItem('nomCurrentWithdrawalCard')) {
       this.cardNumberJudge = true
       const { currency, userName, goldLogo, serviceCharge, drawWay, voucherNumber } = this.dataFlow
@@ -154,26 +105,18 @@ export default {
       visible: false,
       cardNumberJudge: false,
       form: {
-        cardNumber: '',
-        drawPassword: '',
+        voucherNumber: '', // 凭证号码
         currency: '',
         money: '',
-        userName: '',
-        goldLogo: '',
-        serviceCharge: '',
         drawWay: '',
-        remark: '',
+        drawPassword: '',
       },
       formName: {
-        cardNumber: '卡号',
-        drawPassword: '支取密码',
+        voucherNumber: '凭证号码',
         currency: '币种',
-        money: '金额',
-        userName: '客户姓名',
-        goldLogo: '钞汇标识',
-        serviceCharge: '手续费',
-        drawWay: '支取方式',
-        remark: '摘要',
+        money: '外币金额',
+        drawWay: '资金来源',
+        drawPassword: '支取密码',
       },
       rules: {
         userName: vercustomer,
@@ -184,13 +127,6 @@ export default {
             trigger: 'blur'
           }
         ],
-        goldLogo: [
-          {
-            required: true,
-            message: '请选择钞汇标识',
-            trigger: 'blur'
-          }
-        ],
         drawWay: [
           {
             required: true,
@@ -267,6 +203,10 @@ export default {
     },
     submitForm () {
       if (this.submited) return this.$message.error('已提交！')
+      if (!this.form.voucherNumber) {
+        messageCard('请填写凭证号码')
+        return
+      }
       if (!this.form.drawPassword) {
         messagePassword()
         return
@@ -358,30 +298,34 @@ export default {
 </script>
 <style lang='scss' scoped>
 .wrap .body {
-    margin-top: 0;
-    overflow: auto;
-    .idCard {
-        border-radius: 5px;
-        background: #cfddff;
-        text-align: center;
-        height: 40px;
-        line-height: 40px;
-        font-size: 18px;
-        color: #6191ff;
-        cursor: pointer;
+  margin-top: 0;
+  overflow: auto;
+
+  .idCard {
+    border-radius: 5px;
+    background: #cfddff;
+    text-align: center;
+    height: 40px;
+    line-height: 40px;
+    font-size: 18px;
+    color: #6191ff;
+    cursor: pointer;
+  }
+
+  .texts {
+    margin: 30px 0 30px 80px;
+    font-size: 14px;
+    color: #666;
+
+    .text {
+      line-height: 1.6;
     }
-    .texts {
-        margin: 30px 0 30px 80px;
-        font-size: 14px;
-        color: #666;
-        .text {
-            line-height: 1.6;
-        }
-        span {
-            display: inline-block;
-            width: 90px;
-            text-align: right;
-        }
+
+    span {
+      display: inline-block;
+      width: 90px;
+      text-align: right;
     }
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/manage/list/onlineBank/openAccount.vue b/src/pages/manage/list/onlineBank/openAccount.vue
index cfb2fb8..50edddd 100644
--- a/src/pages/manage/list/onlineBank/openAccount.vue
+++ b/src/pages/manage/list/onlineBank/openAccount.vue
@@ -94,7 +94,7 @@ import { mapState, mapMutations, mapGetters } from 'vuex'
 import { vername, vermob } from '@/utils/verify.js'
 import { addOperation, getOperation } from '@/api/http';
 import { mobPattern, namePattern, ratePattern, vercustomer } from '@/utils/verify.js'
-import { phoneListen, mailBoxListen, checkHanzi, randomPeopleNumber, myValidate, checkName, messageIdCard, messageCard, messagePassword } from '@/utils/utilFunction.js'
+import { phoneListen, mailBoxListen, checkHanzi, inputListen, myValidate, checkName, messageIdCard, messageCard, messagePassword } from '@/utils/utilFunction.js'
 
 import MyTitle from '@/components/myTitle'
 import TipsBefore from '@/mixins/tipsBefore'
@@ -241,29 +241,8 @@ export default {
               this.form.idNumber = list[i].emptyTwo
             }
           }
-
         }
-        // const tt1 = JSON.parse(sessionStorage.getItem('tt1'))
-        // console.log('1-tt1')
-        // console.log(tt1)
-        // if(tt1) {
-        //     for(const key in tt1) {
-        //         this.form[tt1] = tt1[key]
-        //     }
-        // }
-      }).catch((error) => {
-        // const tt1 = JSON.parse(sessionStorage.getItem('tt1'))
-        // console.log('2-tt1')
-        // console.log(tt1)
-        // if(tt1) {
-        //     for(const key in tt1) {
-        //         this.form[key] = tt1[key]
-        //     }
-        // }
-        // if(sessionStorage.getItem('tt1')) {
-        //     this.form = {...sessionStorage.getItem('tt1')}
-        // }
-      })
+      }).catch((error) => { })
 
     },
     ...mapMutations({
@@ -274,10 +253,6 @@ export default {
       setTipsOperate: 'system/setTipsOperate'
     }),
     popUp () {// 唤起弹窗
-      // this.$store.commit('system/changePop',{show:true,text:'身份证扫描仪',id:'33'})
-      // this.changeShowGoods(true)
-      // this.$store.commit('system/changePop',{show: false, text: '', id:'33'})
-
       this.setTipsOperate('请刷身份证');
       this.setPopId('33')
       sessionStorage.setItem('computerPath', this.$route.fullPath)
@@ -329,7 +304,6 @@ export default {
       let projectId = sessionStorage.getItem('projectId')
       let startTime = sessionStorage.getItem('startTime')
 
-
       let formList = [];
 
       formList.push({ "answerId": '41', "emptyOne": "", "emptyTwo": this.form.idNumber, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,25,33,41,13", "type": "" })
@@ -343,10 +317,6 @@ export default {
         startTime: startTime,
       }
       addOperation(params).then((data) => {
-        //   this.$message({
-        //       message: '提交成功',
-        //       type: 'success'
-        //   });
         this.setNeedsModule(moduleName)
         this.setDataFlow({ ...this.form })
         this.submited = 1
@@ -374,6 +344,7 @@ export default {
     phoneListen,
     mailBoxListen,
     checkName,
+    inputListen,
   },
   computed: {
     ...mapGetters({