From 42eba9d7f840b971ba405acbf7293155104a9987 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 17 Oct 2023 20:07:34 +0800
Subject: [PATCH] fix

---
 src/App.vue                                   |    7 +-
 src/components/case/index.vue                 |    5 -
 src/components/selectBusiness/index.vue       |    1 +
 src/pages/index/list/index.vue                |    2 +-
 .../personal/currentAccount/openAccount.vue   | 1907 +++++++++--------
 .../list/personal/timeDeposit/withdrawal.vue  |  984 +++++----
 src/pages/manage/navbar/index.vue             |  656 +++---
 src/pages/report/index.vue                    |   19 +-
 src/store/modules/system.js                   |    1 +
 9 files changed, 1910 insertions(+), 1672 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 4e63065..d171da0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,7 +2,7 @@
   <div id="app">
     <select-business class="selectBusiness"
                      :showIt.sync="showIt"
-                     v-show="!showIt && showBusiness" />
+                     v-show="!showIt && showBusiness && !submited" />
     <router-view></router-view>
     <vCase :showIt.sync="showIt"></vCase>
     <tip-dialog class="Z-9999" />
@@ -44,7 +44,8 @@ export default {
   data () {
     return {
       showIt: true,
-      showSelect: false
+      showSelect: false,
+      submited: false
     }
   },
   methods: {
@@ -56,7 +57,7 @@ export default {
   watch: {
     showIt: {
       handler (newVal) {
-        console.log("🚀 ~ file: App.vue:58 ~ handler ~ newVal:", newVal, this.businessKey, sessionStorage.getItem('submited'))
+        this.submited = sessionStorage.getItem('submited')
         if (!newVal && !this.businessKey && !sessionStorage.getItem('submited')) {
           this.setShowBusiness(true)
         } else {
diff --git a/src/components/case/index.vue b/src/components/case/index.vue
index b2872b8..34d7434 100644
--- a/src/components/case/index.vue
+++ b/src/components/case/index.vue
@@ -368,7 +368,6 @@ export default {
     if (sessionStorage.getItem('projectId')) {
       projectId = sessionStorage.getItem('projectId')
     }
-    console.log('mounted', projectId)
     let assessmentId = sessionStorage.getItem('assessmentId') || this.getQueryVariable('assessmentId')
     let competitionId = sessionStorage.getItem('competitionId') || this.getQueryVariable('competitionId')
     let stageId = sessionStorage.getItem('stageId') || this.getQueryVariable('stageId')
@@ -415,7 +414,6 @@ export default {
         this.getData()
       }
     }
-    console.log(2222, this.showIt)
   },
   methods: {
     ...mapMutations({
@@ -516,8 +514,6 @@ export default {
             }
 
           }
-          console.log('---this.topicList')
-          console.log(this.topicList)
           if (this.topicList.length > 0) {
             const storeProjectId = sessionStorage.getItem('storeProjectId') || this.$route.query.projectId
             if (storeProjectId) {
@@ -758,7 +754,6 @@ export default {
       }
       this.loading = true;
       submit(params).then((data) => {
-        console.log(4, data)
         if (data.status == 200) {
           sessionStorage.setItem('firstLoad2', true)
           // this.clearStore()
diff --git a/src/components/selectBusiness/index.vue b/src/components/selectBusiness/index.vue
index 9105309..c0e0169 100644
--- a/src/components/selectBusiness/index.vue
+++ b/src/components/selectBusiness/index.vue
@@ -146,6 +146,7 @@ export default {
       sessionStorage.setItem('cid', cid)
       sessionStorage.setItem('systemId', systemId)
       sessionStorage.setItem('projectId', projectId)
+      sessionStorage.setItem('firstLoad2', true)
       sessionStorage.removeItem('submited')
       if (assessmentId) {
         sessionStorage.setItem('assessmentId', assessmentId)
diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue
index a138002..5b84ee6 100644
--- a/src/pages/index/list/index.vue
+++ b/src/pages/index/list/index.vue
@@ -101,7 +101,7 @@ export default {
       }, 1000);
     }
 
-    if (!this.businessKey) {
+    if (!this.businessKey && this.$route.path !== '/index/report' && !sessionStorage.getItem('submited')) {
       this.setShowBusiness(true)
     }
     // 已经提交，则显示面板
diff --git a/src/pages/manage/list/personal/currentAccount/openAccount.vue b/src/pages/manage/list/personal/currentAccount/openAccount.vue
index 06c13d1..c5daedc 100644
--- a/src/pages/manage/list/personal/currentAccount/openAccount.vue
+++ b/src/pages/manage/list/personal/currentAccount/openAccount.vue
@@ -1,244 +1,405 @@
 /* 个人业务>活期业务>开户 */
 <template>
-<div>
-  <div class="body">
-    <div>
-      <el-row :gutter="20" style="margin: 0">
-            <el-form ref="form" :model="form" label-width="120px" :rules="rules">
-                <el-col :span="10" :offset="2">
-                    <el-form-item label="客户号">
-                        <el-input :value="form.userNumber" disabled @input="(val) => checkHanzi(val, form, 'userNumber')" ref="userNumber"></el-input>
-                    </el-form-item>
-                    <el-form-item label="币种" prop="currency">
-                        <el-select v-model.trim="form.currency" placeholder="请选择" ref="currency">
-                            <el-option label='CNY人民币' :value="12" :key="12">CNY人民币</el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="10" :offset="1">
-                    <el-form-item label="客户姓名" prop="userName">
-                        <el-input :value="form.userName" disabled @input="(val) => checkName(val, form, 'userName')" ref="userName"></el-input>
-                    </el-form-item>
-                    <el-form-item label="钞汇标识" prop="goldLogo">
-                        <el-select v-model.trim="form.goldLogo" disabled placeholder="请选择" ref="goldLogo">
-                            <el-option v-for="item in goldLogoSelectList" :label="item.options" :value="item.itemId"  :key="item.itemId"> </el-option>
-                        </el-select>
-                    </el-form-item>
+  <div>
+    <div class="body">
+      <div>
+        <el-row :gutter="20"
+                style="margin: 0">
+          <el-form ref="form"
+                   :model="form"
+                   label-width="120px"
+                   :rules="rules">
+            <el-col :span="10"
+                    :offset="2">
+              <el-form-item label="客户号">
+                <el-input :value="form.userNumber"
+                          disabled
+                          @input="(val) => checkHanzi(val, form, 'userNumber')"
+                          ref="userNumber"></el-input>
+              </el-form-item>
+              <el-form-item label="币种"
+                            prop="currency">
+                <el-select v-model.trim="form.currency"
+                           placeholder="请选择"
+                           ref="currency">
+                  <el-option label='CNY人民币'
+                             :value="12"
+                             :key="12">CNY人民币</el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="10"
+                    :offset="1">
+              <el-form-item label="客户姓名"
+                            prop="userName">
+                <el-input :value="form.userName"
+                          disabled
+                          @input="(val) => checkName(val, form, 'userName')"
+                          ref="userName"></el-input>
+              </el-form-item>
+              <el-form-item label="钞汇标识"
+                            prop="goldLogo">
+                <el-select v-model.trim="form.goldLogo"
+                           disabled
+                           placeholder="请选择"
+                           ref="goldLogo">
+                  <el-option v-for="item in goldLogoSelectList"
+                             :label="item.options"
+                             :value="item.itemId"
+                             :key="item.itemId"> </el-option>
+                </el-select>
+              </el-form-item>
 
-                    <!-- <el-form-item label="钞汇标识" prop="goldLogo" disabled>
+              <!-- <el-form-item label="钞汇标识" prop="goldLogo" disabled>
                         <el-select v-model.trim="form.goldLogo" disabled placeholder="请选择" ref="goldLogo">
                             <el-option label="钞户" value="钞户"> </el-option>
                         </el-select>
                     </el-form-item> -->
 
-                </el-col>
-            </el-form>
+            </el-col>
+          </el-form>
         </el-row>
         <div class="add">
-            <el-row :gutter="20" style="margin: 0;z-index:9">
-                <el-form ref="form1" :model="form" label-width="120px">
-                    <el-col :span="10" :offset="2">
-                        <el-form-item label="账户性质">
-                            <el-select v-model.trim="form.accountQuality" placeholder="请选择" ref="accountQuality">
-                                <!-- <el-option v-for="item in accountQualitySelectList" :label="item.options" :value="item.itemId"  :key="item.itemId"> </el-option>
+          <el-row :gutter="20"
+                  style="margin: 0;z-index:9">
+            <el-form ref="form1"
+                     :model="form"
+                     label-width="120px">
+              <el-col :span="10"
+                      :offset="2">
+                <el-form-item label="账户性质">
+                  <el-select v-model.trim="form.accountQuality"
+                             placeholder="请选择"
+                             ref="accountQuality">
+                    <!-- <el-option v-for="item in accountQualitySelectList" :label="item.options" :value="item.itemId"  :key="item.itemId"> </el-option>
                                  -->
-                                <el-option label="个人结算户" :value="14"> </el-option>
-                                <el-option label="基本户" :value="101"> </el-option>
-                                <el-option label="一般户" :value="102"> </el-option>
-                                <el-option label="专用户" :value="103"> </el-option>
-                                <el-option label="临时户" :value="104"> </el-option>
-                                <!-- 14: '个人结算户',
+                    <el-option label="个人结算户"
+                               :value="14"> </el-option>
+                    <el-option label="基本户"
+                               :value="101"> </el-option>
+                    <el-option label="一般户"
+                               :value="102"> </el-option>
+                    <el-option label="专用户"
+                               :value="103"> </el-option>
+                    <el-option label="临时户"
+                               :value="104"> </el-option>
+                    <!-- 14: '个人结算户',
                                 101: '基本户',
                                 102: '一般户',
                                 103: '专用户',
                                 104: '临时户' -->
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="账户类型" prop="accountType">
-                            <el-select v-model.trim="form.accountType" placeholder="请选择" ref="accountType">
-                              <!-- 16: '一类户',
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="账户类型"
+                              prop="accountType">
+                  <el-select v-model.trim="form.accountType"
+                             placeholder="请选择"
+                             ref="accountType">
+                    <!-- 16: '一类户',
                               17: '二类户',
                               97: '结算户',
                               98: '结算户',
                               99: '委托保障金户',
                               100: '资本临时户' -->
-                                <el-option label="一类户" :value="16"> </el-option>
-                                <el-option label="二类户" :value="17"> </el-option>
-                                <!-- <el-option label="结算户" :value="97"> </el-option>
+                    <el-option label="一类户"
+                               :value="16"> </el-option>
+                    <el-option label="二类户"
+                               :value="17"> </el-option>
+                    <!-- <el-option label="结算户" :value="97"> </el-option>
                                 <el-option label="委托保障金户" :value="100"> </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-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" :offset="1">
-                        <el-form-item label="凭证类型" prop="voucherType">
-                            <el-select v-model.trim="form.voucherType" placeholder="请选择" ref="voucherType">
-                                <el-option label="IC卡" :value="15"> </el-option>
-                                <el-option label="转账支票" :value="115"> </el-option>
-                                <el-option label="现金支票" :value="116"> </el-option>
-                                <el-option label="存单" :value="123"> </el-option>
-                                <el-option label="银行" :value="127"> </el-option>
-                                
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="凭证号码" required>
-                          <div v-if='!cardNumberJudge' class="idCard" @click="popUp('刷卡器')">
-                            <p>请刷卡</p>
-                          </div>
-                          <div v-else>
-                              <el-input ref="cardNumber" :value="form.cardNumber" disabled @input="(val) => inputListen(val, form, 'cardNumber')"></el-input>
-                          </div>
-                        </el-form-item>
-                        <el-form-item label="支取密码" required>
-                            <div v-if='!form.drawPassword' class="idCard" @click="popUps('密码器')">
-                                <p>请输入密码</p>
-                            </div>
-                            <div v-else @click="popUps('密码器')">
-                              <el-input :value="form.drawPassword" ref="drawPassword" type="password"></el-input>
-                            </div>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-                <el-button @click="openAccount" type="primary" class="addBtn" circle icon="el-icon-plus"></el-button>
-            </el-row>
+                  </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-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="10"
+                      :offset="1">
+                <el-form-item label="凭证类型"
+                              prop="voucherType">
+                  <el-select v-model.trim="form.voucherType"
+                             placeholder="请选择"
+                             ref="voucherType">
+                    <el-option label="IC卡"
+                               :value="15"> </el-option>
+                    <el-option label="转账支票"
+                               :value="115"> </el-option>
+                    <el-option label="现金支票"
+                               :value="116"> </el-option>
+                    <el-option label="存单"
+                               :value="123"> </el-option>
+                    <el-option label="银行"
+                               :value="127"> </el-option>
+
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="凭证号码"
+                              required>
+                  <div v-if='!cardNumberJudge'
+                       class="idCard"
+                       @click="popUp('刷卡器')">
+                    <p>请刷卡</p>
+                  </div>
+                  <div v-else>
+                    <el-input ref="cardNumber"
+                              :value="form.cardNumber"
+                              disabled
+                              @input="(val) => inputListen(val, form, 'cardNumber')"></el-input>
+                  </div>
+                </el-form-item>
+                <el-form-item label="支取密码"
+                              required>
+                  <div v-if='!form.drawPassword'
+                       class="idCard"
+                       @click="popUps('密码器')">
+                    <p>请输入密码</p>
+                  </div>
+                  <div v-else
+                       @click="popUps('密码器')">
+                    <el-input :value="form.drawPassword"
+                              ref="drawPassword"
+                              type="password"></el-input>
+                  </div>
+                </el-form-item>
+              </el-col>
+            </el-form>
+            <el-button @click="openAccount"
+                       type="primary"
+                       class="addBtn"
+                       circle
+                       icon="el-icon-plus"></el-button>
+          </el-row>
         </div>
         <!-- 二级证件,最多三张，逻辑：上一张二级为填完信息不可添加第三张  v-for="(item,index) in second" :key="index" -->
-      <div class="add" v-if="formTwo">
-        <el-row :gutter="20" style="margin: 0;z-index:9">
-          <el-form ref="form2" :model="form" label-width="120px">
-            <el-col :span="10" :offset="2">
-              <el-form-item label="账户性质">
-                <el-select v-model.trim="form.accountQualitysTwo" placeholder="请选择">
-                  <el-option label="个人结算户" :value="14"> </el-option>
-                  <el-option label="基本户" :value="101"> </el-option>
-                  <el-option label="一般户" :value="102"> </el-option>
-                  <el-option label="专用户" :value="103"> </el-option>
-                  <el-option label="临时户" :value="104"> </el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="账户类型" required>
-                <el-select v-model.trim="form.accountTypesTwo" placeholder="请选择">
-                  <el-option label="一类户" :value="16"> </el-option>
-                  <el-option label="二类户" :value="17"> </el-option>
-                  <!-- <el-option label="结算户" :value="97"> </el-option>
+        <div class="add"
+             v-if="formTwo">
+          <el-row :gutter="20"
+                  style="margin: 0;z-index:9">
+            <el-form ref="form2"
+                     :model="form"
+                     label-width="120px">
+              <el-col :span="10"
+                      :offset="2">
+                <el-form-item label="账户性质">
+                  <el-select v-model.trim="form.accountQualitysTwo"
+                             placeholder="请选择">
+                    <el-option label="个人结算户"
+                               :value="14"> </el-option>
+                    <el-option label="基本户"
+                               :value="101"> </el-option>
+                    <el-option label="一般户"
+                               :value="102"> </el-option>
+                    <el-option label="专用户"
+                               :value="103"> </el-option>
+                    <el-option label="临时户"
+                               :value="104"> </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="账户类型"
+                              required>
+                  <el-select v-model.trim="form.accountTypesTwo"
+                             placeholder="请选择">
+                    <el-option label="一类户"
+                               :value="16"> </el-option>
+                    <el-option label="二类户"
+                               :value="17"> </el-option>
+                    <!-- <el-option label="结算户" :value="97"> </el-option>
                   <el-option label="委托保障金户" :value="100"> </el-option> -->
-                </el-select>
-              </el-form-item>
-              <el-form-item label="支取方式" required>
-                <el-select v-model.trim="form.drawWaysTwo" placeholder="请选择">
-                  <!-- <el-option v-for="item in drawWaySelectList" :label="item.options" :value="item.itemId"  :key="item.itemId"> </el-option> -->
-                  <el-option label="密码" :value="18"> </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="10" :offset="1">
-              <el-form-item label="凭证类型" required>
-                <el-select v-model.trim="form.voucherTypesTwo" placeholder="请选择">
-                  <el-option label="IC卡" :value="15"> </el-option>
-                  <el-option label="转账支票" :value="115"> </el-option>
-                  <el-option label="现金支票" :value="116"> </el-option>
-                  <el-option label="存单" :value="123"> </el-option>
-                  <el-option label="银行" :value="127"> </el-option>
-                  <!-- <el-option v-for="item in voucherTypeSelectList" :label="item.options" :value="item.itemId"  :key="item.itemId"> </el-option> -->
-                </el-select>
-              </el-form-item>
-              <el-form-item label="凭证号码" required>
-                <div v-if='!cardNumberJudge2' class="idCard" @click="popUpTwo('刷卡器')">
-                  <p>请刷卡</p>
-                </div>
-                <div v-else>
-                    <el-input ref="cardNumber2" :value="form.cardNumber2" disabled @input="(val) => inputListen(val, form, 'cardNumber2')"></el-input>
-                </div>
-              </el-form-item>
-              <el-form-item label="支取密码" required>
-                <div v-if='!form.drawPassword2' class="idCard" @click="popUpsTwo('密码器')">
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="支取方式"
+                              required>
+                  <el-select v-model.trim="form.drawWaysTwo"
+                             placeholder="请选择">
+                    <!-- <el-option v-for="item in drawWaySelectList" :label="item.options" :value="item.itemId"  :key="item.itemId"> </el-option> -->
+                    <el-option label="密码"
+                               :value="18"> </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="10"
+                      :offset="1">
+                <el-form-item label="凭证类型"
+                              required>
+                  <el-select v-model.trim="form.voucherTypesTwo"
+                             placeholder="请选择">
+                    <el-option label="IC卡"
+                               :value="15"> </el-option>
+                    <el-option label="转账支票"
+                               :value="115"> </el-option>
+                    <el-option label="现金支票"
+                               :value="116"> </el-option>
+                    <el-option label="存单"
+                               :value="123"> </el-option>
+                    <el-option label="银行"
+                               :value="127"> </el-option>
+                    <!-- <el-option v-for="item in voucherTypeSelectList" :label="item.options" :value="item.itemId"  :key="item.itemId"> </el-option> -->
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="凭证号码"
+                              required>
+                  <div v-if='!cardNumberJudge2'
+                       class="idCard"
+                       @click="popUpTwo('刷卡器')">
+                    <p>请刷卡</p>
+                  </div>
+                  <div v-else>
+                    <el-input ref="cardNumber2"
+                              :value="form.cardNumber2"
+                              disabled
+                              @input="(val) => inputListen(val, form, 'cardNumber2')"></el-input>
+                  </div>
+                </el-form-item>
+                <el-form-item label="支取密码"
+                              required>
+                  <div v-if='!form.drawPassword2'
+                       class="idCard"
+                       @click="popUpsTwo('密码器')">
                     <p>请输入密码</p>
-                </div>
-                <div v-else @click="popUpsTwo('密码器')">
-                  <el-input :value="form.drawPassword2" ref="drawPassword2" type="password"></el-input>
-                </div>
-              </el-form-item>
-            </el-col>
-          </el-form>
-          <el-button @click="deleteSecond()" class="addBtn" circle icon="el-icon-close"></el-button>
-        </el-row>
-      </div>
-      <div class="add" v-if="formThree">
-        <el-row :gutter="20" style="margin: 0;z-index:9">
-          <el-form ref="form3" :model="form" label-width="120px">
-            <el-col :span="10" :offset="2">
-              <el-form-item label="账户性质">
-                <el-select v-model.trim="form.accountQualitysThree" placeholder="请选择">
-                  <el-option label="个人结算户" :value="14"> </el-option>
-                  <el-option label="基本户" :value="101"> </el-option>
-                  <el-option label="一般户" :value="102"> </el-option>
-                  <el-option label="专用户" :value="103"> </el-option>
-                  <el-option label="临时户" :value="104"> </el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="账户类型" required>
-                <el-select v-model.trim="form.accountTypesThree"  placeholder="请选择">
-                  <el-option label="一类户" :value="16"> </el-option>
-                  <el-option label="二类户" :value="17"> </el-option>
-                  <!-- <el-option label="结算户" :value="97"> </el-option>
+                  </div>
+                  <div v-else
+                       @click="popUpsTwo('密码器')">
+                    <el-input :value="form.drawPassword2"
+                              ref="drawPassword2"
+                              type="password"></el-input>
+                  </div>
+                </el-form-item>
+              </el-col>
+            </el-form>
+            <el-button @click="deleteSecond()"
+                       class="addBtn"
+                       circle
+                       icon="el-icon-close"></el-button>
+          </el-row>
+        </div>
+        <div class="add"
+             v-if="formThree">
+          <el-row :gutter="20"
+                  style="margin: 0;z-index:9">
+            <el-form ref="form3"
+                     :model="form"
+                     label-width="120px">
+              <el-col :span="10"
+                      :offset="2">
+                <el-form-item label="账户性质">
+                  <el-select v-model.trim="form.accountQualitysThree"
+                             placeholder="请选择">
+                    <el-option label="个人结算户"
+                               :value="14"> </el-option>
+                    <el-option label="基本户"
+                               :value="101"> </el-option>
+                    <el-option label="一般户"
+                               :value="102"> </el-option>
+                    <el-option label="专用户"
+                               :value="103"> </el-option>
+                    <el-option label="临时户"
+                               :value="104"> </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="账户类型"
+                              required>
+                  <el-select v-model.trim="form.accountTypesThree"
+                             placeholder="请选择">
+                    <el-option label="一类户"
+                               :value="16"> </el-option>
+                    <el-option label="二类户"
+                               :value="17"> </el-option>
+                    <!-- <el-option label="结算户" :value="97"> </el-option>
                   <el-option label="委托保障金户" :value="100"> </el-option> -->
-                </el-select>
-              </el-form-item>
-              <el-form-item label="支取方式" required>
-                <el-select v-model.trim="form.drawWaysThree" placeholder="请选择">
-                  <el-option label="密码" :value="18"> </el-option>
-                  <!-- <el-option v-for="item in drawWaySelectList" :label="item.options" :value="item.options" :key="item.itemId"> </el-option> -->
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="10" :offset="1">
-              <el-form-item label="凭证类型" required>
-                <el-select v-model.trim="form.voucherTypesThree" placeholder="请选择">
-                  <el-option label="IC卡" :value="15"> </el-option>
-                  <el-option label="转账支票" :value="115"> </el-option>
-                  <el-option label="现金支票" :value="116"> </el-option>
-                  <el-option label="存单" :value="123"> </el-option>
-                  <el-option label="银行" :value="127"> </el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="凭证号码" required>
-              <div v-if='!cardNumberJudge3' class="idCard" @click="popUpThree('刷卡器')">
-                  <p>请刷卡</p>
-                </div>
-                <div v-else>
-                    <el-input ref="cardNumber3" :value="form.cardNumber3" disabled @input="(val) => inputListen(val, form, 'cardNumber3')"></el-input>
-                </div>
-              </el-form-item>
-              <el-form-item label="支取密码" required>
-                <div v-if='!form.drawPassword3' class="idCard" @click="popUpsThree('密码器')">
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="支取方式"
+                              required>
+                  <el-select v-model.trim="form.drawWaysThree"
+                             placeholder="请选择">
+                    <el-option label="密码"
+                               :value="18"> </el-option>
+                    <!-- <el-option v-for="item in drawWaySelectList" :label="item.options" :value="item.options" :key="item.itemId"> </el-option> -->
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="10"
+                      :offset="1">
+                <el-form-item label="凭证类型"
+                              required>
+                  <el-select v-model.trim="form.voucherTypesThree"
+                             placeholder="请选择">
+                    <el-option label="IC卡"
+                               :value="15"> </el-option>
+                    <el-option label="转账支票"
+                               :value="115"> </el-option>
+                    <el-option label="现金支票"
+                               :value="116"> </el-option>
+                    <el-option label="存单"
+                               :value="123"> </el-option>
+                    <el-option label="银行"
+                               :value="127"> </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="凭证号码"
+                              required>
+                  <div v-if='!cardNumberJudge3'
+                       class="idCard"
+                       @click="popUpThree('刷卡器')">
+                    <p>请刷卡</p>
+                  </div>
+                  <div v-else>
+                    <el-input ref="cardNumber3"
+                              :value="form.cardNumber3"
+                              disabled
+                              @input="(val) => inputListen(val, form, 'cardNumber3')"></el-input>
+                  </div>
+                </el-form-item>
+                <el-form-item label="支取密码"
+                              required>
+                  <div v-if='!form.drawPassword3'
+                       class="idCard"
+                       @click="popUpsThree('密码器')">
                     <p>请输入密码</p>
-                </div>
-                <div v-else @click="popUpsThree('密码器')">
-                  <el-input :value="form.drawPassword3" ref="drawPassword3" type="password"></el-input>
-                </div>
-              </el-form-item>
-            </el-col>
-          </el-form>
-          <el-button @click="deleteSecond()" class="addBtn" circle icon="el-icon-close"></el-button>
-        </el-row>
+                  </div>
+                  <div v-else
+                       @click="popUpsThree('密码器')">
+                    <el-input :value="form.drawPassword3"
+                              ref="drawPassword3"
+                              type="password"></el-input>
+                  </div>
+                </el-form-item>
+              </el-col>
+            </el-form>
+            <el-button @click="deleteSecond()"
+                       class="addBtn"
+                       circle
+                       icon="el-icon-close"></el-button>
+          </el-row>
+        </div>
       </div>
+
+      <el-button @click="formSubmit"
+                 type="primary"
+                 class="submitBtn"
+                 v-throttle>提交</el-button>
     </div>
-        
-      <el-button @click="formSubmit" type="primary" class="submitBtn" v-throttle>提交</el-button>
-    </div>
-    <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="popSure" :needAuth="false" />
-  
-</div>
-<!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
+    <my-dialog :moduleName="moduleName"
+               v-if="visible"
+               :visible.sync="visible"
+               :showForm="form"
+               :formName="formName"
+               @submitIt="popSure"
+               :needAuth="false" />
+
+  </div>
+  <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
 </template>
 <script> // 模块标识：currentAccount/openAccount
-import {getSubjectInfo,addOperation,getOperation} from "@/api/http.js";
+import { getSubjectInfo, addOperation, getOperation } from "@/api/http.js";
 import { mapMutations, mapGetters, mapState } from 'vuex'
-import { vercustomer  } from '@/utils/verify.js'
+import { vercustomer } from '@/utils/verify.js'
 import { myValidate, checkName, checkHanzi, inputListen } from '@/utils/utilFunction.js'
 import NeedBefore from '@/components/needBefore'
 import MyDialog from '@/components/dialog'
@@ -247,212 +408,212 @@ import TipsBefore from '@/mixins/tipsBefore'
 const moduleName = 'currentAccount/openAccount'
 
 export default {
-    data(){
-        return{
-            moduleName: 'currentAccount/openAccount',
-
-            passwordTag: '',
-            cardNumberTag: '',
-
-            
-
-            cardNumberJudge: false,
-            cardNumberJudge2: false,
-            cardNumberJudge3: false,
-            form:{
-              cardNumber: '', // 卡号
-              cardNumber2: '', // 卡号
-              cardNumber3: '', // 卡号
-              drawPassword: '', // 支取密码
-              drawPassword2: '', // 支取密码2
-              drawPassword3: '', // 支取密码3
-              userNumber: '', // 客户号
-              currency: '', // 币种
-              userName: '', // 客户姓名
-              goldLogo: '', // 钞汇标识
-              accountQuality: '', // 账户性质
-              accountType: '', // 账户类型
-              drawWay: '', // 支取方式
-              voucherType: '', // 凭证类型
-              accountQualitysTwo: '', // 账户性质2
-              accountTypesTwo: '', // 账户类型2
-              drawWaysTwo: '', // 支取方式2
-              voucherTypesTwo: '', // 凭证类型2
-              accountQualitysThree: '', // 账户性质3
-              accountTypesThree: '', // 账户类型3
-              drawWaysThree: '', // 支取方式3
-              voucherTypesThree: '', // 凭证类型3
-            },
-            formShow: {},
-            formName:{
-              cardNumber: '卡号', // 
-              cardNumber2: '卡号二', // 
-              cardNumber3: '卡号三', // 
-              drawPassword: '支取密码', //
-              drawPassword2: '支取密码二', // 
-              drawPassword3: '支取密码三', //  
-              userNumber: '客户号', // 
-              currency: '币种', // 
-              userName: '客户姓名', // 
-              goldLogo: '钞汇标识', // 
-              accountQuality: '账户性质', // 
-              accountType: '账户类型', // 
-              drawWay: '支取方式', // 
-              voucherType: '凭证类型', // 
-              accountQualitysTwo: '账户性质2', // 
-              accountTypesTwo: '账户类型2', // 
-              drawWaysTwo: '支取方式2', // 
-              voucherTypesTwo: '凭证类型2', // 
-              accountQualitysThree: '账户性质3', // 
-              accountTypesThree: '账户类型3', // 
-              drawWaysThree: '支取方式3', // 
-              voucherTypesThree: '凭证类型3', // 
-            },
-            rules: {
-              userName: vercustomer ,
-              currency: [
-                { 
-                  required: true, 
-                  message: '请选择币种',
-                  trigger: 'blur'
-                }
-              ],
-              goldLogo: [
-                { 
-                  required: true, 
-                  message: '请选择钞汇标识',
-                  trigger: 'blur'
-                }
-              ],
-              accountType: [
-                { 
-                  required: true, 
-                  message: '请输入账户类型',
-                  trigger: 'blur'
-                }
-              ],
-              voucherType: [
-                { 
-                  required: true, 
-                  message: '请输入凭证类型',
-                  trigger: 'blur'
-                }
-              ],
-              voucherTypesTwo: [
-                { 
-                  required: true, 
-                  message: '请输入凭证类型2',
-                  trigger: 'blur'
-                }
-              ],
-              voucherTypesThree: [
-                { 
-                  required: true, 
-                  message: '请输入凭证类型3',
-                  trigger: 'blur'
-                }
-              ],
-              drawWay: [
-                { 
-                  required: true, 
-                  message: '请输入支取方式',
-                  trigger: 'blur'
-                }
-              ]
-            },
-            second:[],// 二级卡数组
-            options:[],
-          visible:false,
-          formTwo:false,
-          formThree:false,
-          count:0,
-          currencySelectList:[
-
-          ],
-          goldLogoSelectList:[],
-          accountQualitySelectList:[],
-          voucherTypeSelectList:[],
-          accountTypeSelectList:[],
-          drawWaySelectList:[],
-          num:0,
-          submited: 0
-        }
-    },
-    mixins: [ TipsBefore ],
-    components: {
-      NeedBefore,
-      MyDialog
-    },
-    created() {
-      // mixins函数判定，如果不需要则不执行初始化代码
-      
-      if(sessionStorage.getItem('openAccountCount')) {
-        this.count = parseInt(sessionStorage.getItem('openAccountCount'))
-        if(this.count === 1) {
-          this.formTwo = true
-        }else if(this.count === 2) {
-          this.formTwo = true
-          this.formThree = true
-        }
-        // this.formThree = true
-        // this.openAccount()
-      }
+  data () {
+    return {
+      moduleName: 'currentAccount/openAccount',
 
-      // if(this.isNeedBefore) {
-      //   return
-      // }
+      passwordTag: '',
+      cardNumberTag: '',
 
-      const { peopleNumber, userName } = this.dataFlow
-      this.form.userNumber = peopleNumber
-      this.form.userName = userName
-      const { voucherNumber, voucherNumber2 } = this.dataFlow
 
-      // 判断是否使用刷卡器
-      if(sessionStorage.getItem('accountVoucher')) {
-          this.form.cardNumber = voucherNumber
-          this.cardNumberJudge = true
-      }
-      if(sessionStorage.getItem('accountVoucherTwo')) {
-          this.form.cardNumber2 = voucherNumber2
-          this.cardNumberJudge2 = true
-      }
-      if(sessionStorage.getItem('accountVoucherThree')) {
-          this.form.cardNumber3 = voucherNumber2
-          this.cardNumberJudge3 = true
-      }
-      
 
-      // 无缓存的话密码出不来
-      if(sessionStorage.getItem('accountPassword')) {
-          this.form.drawPassword = sessionStorage.getItem('accountPassword')
-      }
-      if(sessionStorage.getItem('accountPasswordTwo')) {
-          this.form.drawPassword2 = sessionStorage.getItem('accountPasswordTwo')
-      }
-      if(sessionStorage.getItem('accountPasswordThree')) {
-          this.form.drawPassword3 = sessionStorage.getItem('accountPasswordThree')
+      cardNumberJudge: false,
+      cardNumberJudge2: false,
+      cardNumberJudge3: false,
+      form: {
+        cardNumber: '', // 卡号
+        cardNumber2: '', // 卡号
+        cardNumber3: '', // 卡号
+        drawPassword: '', // 支取密码
+        drawPassword2: '', // 支取密码2
+        drawPassword3: '', // 支取密码3
+        userNumber: '', // 客户号
+        currency: '', // 币种
+        userName: '', // 客户姓名
+        goldLogo: '', // 钞汇标识
+        accountQuality: '', // 账户性质
+        accountType: '', // 账户类型
+        drawWay: '', // 支取方式
+        voucherType: '', // 凭证类型
+        accountQualitysTwo: '', // 账户性质2
+        accountTypesTwo: '', // 账户类型2
+        drawWaysTwo: '', // 支取方式2
+        voucherTypesTwo: '', // 凭证类型2
+        accountQualitysThree: '', // 账户性质3
+        accountTypesThree: '', // 账户类型3
+        drawWaysThree: '', // 支取方式3
+        voucherTypesThree: '', // 凭证类型3
+      },
+      formShow: {},
+      formName: {
+        cardNumber: '卡号', // 
+        cardNumber2: '卡号二', // 
+        cardNumber3: '卡号三', // 
+        drawPassword: '支取密码', //
+        drawPassword2: '支取密码二', // 
+        drawPassword3: '支取密码三', //  
+        userNumber: '客户号', // 
+        currency: '币种', // 
+        userName: '客户姓名', // 
+        goldLogo: '钞汇标识', // 
+        accountQuality: '账户性质', // 
+        accountType: '账户类型', // 
+        drawWay: '支取方式', // 
+        voucherType: '凭证类型', // 
+        accountQualitysTwo: '账户性质2', // 
+        accountTypesTwo: '账户类型2', // 
+        drawWaysTwo: '支取方式2', // 
+        voucherTypesTwo: '凭证类型2', // 
+        accountQualitysThree: '账户性质3', // 
+        accountTypesThree: '账户类型3', // 
+        drawWaysThree: '支取方式3', // 
+        voucherTypesThree: '凭证类型3', // 
+      },
+      rules: {
+        userName: vercustomer,
+        currency: [
+          {
+            required: true,
+            message: '请选择币种',
+            trigger: 'blur'
+          }
+        ],
+        goldLogo: [
+          {
+            required: true,
+            message: '请选择钞汇标识',
+            trigger: 'blur'
+          }
+        ],
+        accountType: [
+          {
+            required: true,
+            message: '请输入账户类型',
+            trigger: 'blur'
+          }
+        ],
+        voucherType: [
+          {
+            required: true,
+            message: '请输入凭证类型',
+            trigger: 'blur'
+          }
+        ],
+        voucherTypesTwo: [
+          {
+            required: true,
+            message: '请输入凭证类型2',
+            trigger: 'blur'
+          }
+        ],
+        voucherTypesThree: [
+          {
+            required: true,
+            message: '请输入凭证类型3',
+            trigger: 'blur'
+          }
+        ],
+        drawWay: [
+          {
+            required: true,
+            message: '请输入支取方式',
+            trigger: 'blur'
+          }
+        ]
+      },
+      second: [],// 二级卡数组
+      options: [],
+      visible: false,
+      formTwo: false,
+      formThree: false,
+      count: 0,
+      currencySelectList: [
+
+      ],
+      goldLogoSelectList: [],
+      accountQualitySelectList: [],
+      voucherTypeSelectList: [],
+      accountTypeSelectList: [],
+      drawWaySelectList: [],
+      num: 0,
+      submited: 0
+    }
+  },
+  mixins: [TipsBefore],
+  components: {
+    NeedBefore,
+    MyDialog
+  },
+  created () {
+    // mixins函数判定，如果不需要则不执行初始化代码
+
+    if (sessionStorage.getItem('openAccountCount')) {
+      this.count = parseInt(sessionStorage.getItem('openAccountCount'))
+      if (this.count === 1) {
+        this.formTwo = true
+      } else if (this.count === 2) {
+        this.formTwo = true
+        this.formThree = true
       }
+      // this.formThree = true
+      // this.openAccount()
+    }
 
-      this.getOptionsList()
-
-      // this.getOptionsList()
-      // 这个顺序不能错！要拿到itemid
-      // this.$nextTick(() => {
-      //   if(sessionStorage.getItem('openAccountCount')) {
-      //     this.count = sessionStorage.getItem('openAccountCount')
-      //     if(this.count === 1) {
-      //       this.formTwo = true
-      //     }else {
-      //       this.formThree = true
-      //     }
-      //     // this.formThree = true
-      //     // this.openAccount()
-      //   }
-      // })
+    // if(this.isNeedBefore) {
+    //   return
+    // }
 
+    const { peopleNumber, userName } = this.dataFlow
+    this.form.userNumber = peopleNumber
+    this.form.userName = userName
+    const { voucherNumber, voucherNumber2 } = this.dataFlow
 
-    },
-  mounted(){
+    // 判断是否使用刷卡器
+    if (sessionStorage.getItem('accountVoucher')) {
+      this.form.cardNumber = voucherNumber
+      this.cardNumberJudge = true
+    }
+    if (sessionStorage.getItem('accountVoucherTwo')) {
+      this.form.cardNumber2 = voucherNumber2
+      this.cardNumberJudge2 = true
+    }
+    if (sessionStorage.getItem('accountVoucherThree')) {
+      this.form.cardNumber3 = voucherNumber2
+      this.cardNumberJudge3 = true
+    }
+
+
+    // 无缓存的话密码出不来
+    if (sessionStorage.getItem('accountPassword')) {
+      this.form.drawPassword = sessionStorage.getItem('accountPassword')
+    }
+    if (sessionStorage.getItem('accountPasswordTwo')) {
+      this.form.drawPassword2 = sessionStorage.getItem('accountPasswordTwo')
+    }
+    if (sessionStorage.getItem('accountPasswordThree')) {
+      this.form.drawPassword3 = sessionStorage.getItem('accountPasswordThree')
+    }
+
+    this.getOptionsList()
+
+    // this.getOptionsList()
+    // 这个顺序不能错！要拿到itemid
+    // this.$nextTick(() => {
+    //   if(sessionStorage.getItem('openAccountCount')) {
+    //     this.count = sessionStorage.getItem('openAccountCount')
+    //     if(this.count === 1) {
+    //       this.formTwo = true
+    //     }else {
+    //       this.formThree = true
+    //     }
+    //     // this.formThree = true
+    //     // this.openAccount()
+    //   }
+    // })
+
+
+  },
+  mounted () {
     // currencySelectList:[
     //       ],
     //       goldLogoSelectList:[],
@@ -460,509 +621,509 @@ export default {
     //       voucherTypeSelectList:[],
     //       accountTypeSelectList:[],
     //       drawWaySelectList:[],
-    
+
   },
-    methods:{
-        ...mapMutations({
-            changeShowGoods: 'system/changeShowGoods',
-            setNeedsModule: 'system/setNeedsModule',
-            setDataFlow: 'system/setDataFlow',
-            setPopId: 'system/setPopId',
-            setTipsOperate: 'system/setTipsOperate'
-        }),
-        initData() {
-
-        },
-
-        getOptionsList(){
-            for(var i=8;i<14;i++){
-                this.getSubjectInfoData(i)
-            }
-        },
-        getOperationData(){
-            let param= {
-                parentId:  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,26,57,62'
+  methods: {
+    ...mapMutations({
+      changeShowGoods: 'system/changeShowGoods',
+      setNeedsModule: 'system/setNeedsModule',
+      setDataFlow: 'system/setDataFlow',
+      setPopId: 'system/setPopId',
+      setTipsOperate: 'system/setTipsOperate'
+    }),
+    initData () {
+
+    },
+
+    getOptionsList () {
+      for (var i = 8; i < 14; i++) {
+        this.getSubjectInfoData(i)
+      }
+    },
+    getOperationData () {
+      let param = {
+        parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,26,57,62'
+      }
+      getOperation(param).then((data) => {
+        if (data.status == 200) {
+          var list = data.data.judgmentRuleReqs
+          for (var i = 0; i < list.length; i++) {
+            if (list[i].answerId == '68') { this.form.userNumber = list[i].emptyTwo }
+            else if (list[i].answerId == '69') { this.form.userName = list[i].emptyTwo }
+            else if (list[i].answerId == '70') { this.form.currency = +list[i].emptyTwo }
+            else if (list[i].answerId == '71') {
+              this.form.goldLogo = +list[i].emptyTwo
             }
-            getOperation(param).then((data)=>{
-                    if(data.status == 200) {
-                        var list = data.data.judgmentRuleReqs
-                        for (var i = 0; i < list.length; i++) {
-                            if (list[i].answerId == '68') {this.form.userNumber = list[i].emptyTwo}
-                            else if (list[i].answerId == '69') {this.form.userName = list[i].emptyTwo}
-                            else if (list[i].answerId == '70') {this.form.currency = +list[i].emptyTwo}
-                            else if (list[i].answerId == '71') {
-                              this.form.goldLogo = +list[i].emptyTwo
-                            }
-                            else if (list[i].answerId == '72') {this.form.accountQuality = +list[i].emptyTwo}
-                            else if (list[i].answerId == '73') {this.form.voucherType = +list[i].emptyTwo}
-                            else if (list[i].answerId == '74') {this.form.accountType = +list[i].emptyTwo}
-                            else if (list[i].answerId == '75') {
-                              this.form.cardNumber = list[i].emptyTwo
-                              this.cardNumberJudge = true
-                            }
-                            else if (list[i].answerId == '76') {this.form.drawWay = +list[i].emptyTwo}
-                            // else if (list[i].answerId == '77') {sessionStorage.setItem('accountPasswordAll', list[i].emptyTwo)}
-                            else if (list[i].answerId == '77') {
-                              this.form.drawPassword = list[i].emptyTwo
-                            }
-                            // else if (list[i].answerId == '270') {
-                            //   this.form.accountQualitysTwo = +list[i].emptyTwo
-                            // }
-                            // else if (list[i].answerId == '271') {this.form.voucherTypesTwo = +list[i].emptyTwo}
-                            // else if (list[i].answerId == '272') {this.form.accountTypesTwo = +list[i].emptyTwo}
-                            // else if (list[i].answerId == '274') {this.form.drawWaysTwo = +list[i].emptyTwo}
-                            // else if (list[i].answerId == '276') {this.form.accountQualitysThree = +list[i].emptyTwo}
-                            // else if (list[i].answerId == '277') {this.form.voucherTypesThree = +list[i].emptyTwo}
-                            // else if (list[i].answerId == '278') {this.form.accountTypesThree = +list[i].emptyTwo}
-                            // else if (list[i].answerId == '280') {this.form.drawWaysThree = +list[i].emptyTwo}
-                        }
-                        if(sessionStorage.getItem('accountPassword')) {
-                            this.form.drawPassword = sessionStorage.getItem('accountPassword')
-                        }
-                        if(sessionStorage.getItem('accountPasswordTwo')) {
-                            this.form.drawPassword2 = sessionStorage.getItem('accountPasswordTwo')
-                        }
-                        if(sessionStorage.getItem('accountPasswordThree')) {
-                            this.form.drawPassword3 = sessionStorage.getItem('accountPasswordThree')
-                        }
-                    }else{
-                        this.getFormData()
-                    }
-                    // 判断是否使用密码器
-                    
-
-            }).catch((error)=>{
-            })
-        },
-        getFormData(){
-            let param= {
-                parentId:  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,25,33'
+            else if (list[i].answerId == '72') { this.form.accountQuality = +list[i].emptyTwo }
+            else if (list[i].answerId == '73') { this.form.voucherType = +list[i].emptyTwo }
+            else if (list[i].answerId == '74') { this.form.accountType = +list[i].emptyTwo }
+            else if (list[i].answerId == '75') {
+              this.form.cardNumber = list[i].emptyTwo
+              this.cardNumberJudge = true
             }
-            getOperation(param).then((data)=>{
-                if(data.status == 200) {
-                    var list = data.data.judgmentRuleReqs
-                    for (var i = 0; i < list.length; i++) {
-                        if (list[i].answerId == '42') {this.form.userName = list[i].emptyTwo}
-                        else if (list[i].answerId == '75') {
-                          this.form.cardNumber = list[i].emptyTwo
-                          this.cardNumberJudge = true
-                        }
-                    }
-
-                    if(sessionStorage.getItem('accountPassword')) {
-                        this.form.drawPassword = sessionStorage.getItem('accountPassword')
-                    }
-                    if(sessionStorage.getItem('accountPasswordTwo')) {
-                        this.form.drawPassword2 = sessionStorage.getItem('accountPasswordTwo')
-                    }
-                    if(sessionStorage.getItem('accountPasswordThree')) {
-                        this.form.drawPassword3 = sessionStorage.getItem('accountPasswordThree')
-                    }
-                }
-            }).catch((error)=>{
-            })
-        },
-        ...mapMutations({
-            changeShowGoods: 'system/changeShowGoods'
-        }),
-        getOperationWindowsData(){
-            let param= {
-                parentId:  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,26,57,62,75'
+            else if (list[i].answerId == '76') { this.form.drawWay = +list[i].emptyTwo }
+            // else if (list[i].answerId == '77') {sessionStorage.setItem('accountPasswordAll', list[i].emptyTwo)}
+            else if (list[i].answerId == '77') {
+              this.form.drawPassword = list[i].emptyTwo
             }
-            let dataList = [];
-            getOperation(param).then((data)=>{
-                if(data.status == 200){
-                    let list = data.data.judgmentRuleReqs;
-                    // for(var i=0;i<list.length;i++){
-                    //     dataList.push(list[i])
-                    // }
-                    if(list.length > 0) {
-                      this.cardNumberJudge = true;
-                      this.form.cardNumber = list[0].emptyTwo
-                    }
-                }else{
-                    // dataList = []
-                }
-                // sessionStorage.setItem('dataList',JSON.stringify(dataList))
-            }).catch((error)=>{
-            })
-        },
-      getSubjectInfoData(item){
-        let params= {
-          subject_id:item
+            // else if (list[i].answerId == '270') {
+            //   this.form.accountQualitysTwo = +list[i].emptyTwo
+            // }
+            // else if (list[i].answerId == '271') {this.form.voucherTypesTwo = +list[i].emptyTwo}
+            // else if (list[i].answerId == '272') {this.form.accountTypesTwo = +list[i].emptyTwo}
+            // else if (list[i].answerId == '274') {this.form.drawWaysTwo = +list[i].emptyTwo}
+            // else if (list[i].answerId == '276') {this.form.accountQualitysThree = +list[i].emptyTwo}
+            // else if (list[i].answerId == '277') {this.form.voucherTypesThree = +list[i].emptyTwo}
+            // else if (list[i].answerId == '278') {this.form.accountTypesThree = +list[i].emptyTwo}
+            // else if (list[i].answerId == '280') {this.form.drawWaysThree = +list[i].emptyTwo}
+          }
+          if (sessionStorage.getItem('accountPassword')) {
+            this.form.drawPassword = sessionStorage.getItem('accountPassword')
+          }
+          if (sessionStorage.getItem('accountPasswordTwo')) {
+            this.form.drawPassword2 = sessionStorage.getItem('accountPasswordTwo')
+          }
+          if (sessionStorage.getItem('accountPasswordThree')) {
+            this.form.drawPassword3 = sessionStorage.getItem('accountPasswordThree')
+          }
+        } else {
+          this.getFormData()
         }
-          getSubjectInfo(params).then((data)=>{
-          if(data.status == 200){
-              this.num = this.num+1
-              if(this.num == 6){
-                  this.getOperationData()
-                  this.getOperationWindowsData()
-              }
-            this.selectList = data.data.items;
-            if (item == '8'){
-              this.currencySelectList = data.data.items;
-            }else if (item == '9'){
-                this.goldLogoSelectList = data.data.items;
-                this.form.goldLogo = +this.goldLogoSelectList[0].itemId
-            }else if (item == '10'){
-              this.accountQualitySelectList = data.data.items;
-              this.form.accountQuality = this.accountQualitySelectList[0].itemId
-              
-            }else if (item == '11'){
-              
-              this.voucherTypeSelectList = data.data.items;
-              this.form.voucherType = +this.voucherTypeSelectList[0].itemId
-            }else if (item == '12'){
-              this.accountTypeSelectList = data.data.items;
-              this.form.accountType = this.accountTypeSelectList[0].itemId
-            }else if (item == '13'){
-              this.drawWaySelectList = data.data.items;
-              this.form.drawWay = this.drawWaySelectList[0].itemId
+        // 判断是否使用密码器
+
+
+      }).catch((error) => {
+      })
+    },
+    getFormData () {
+      let param = {
+        parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,25,33'
+      }
+      getOperation(param).then((data) => {
+        if (data.status == 200) {
+          var list = data.data.judgmentRuleReqs
+          for (var i = 0; i < list.length; i++) {
+            if (list[i].answerId == '42') { this.form.userName = list[i].emptyTwo }
+            else if (list[i].answerId == '75') {
+              this.form.cardNumber = list[i].emptyTwo
+              this.cardNumberJudge = true
             }
           }
-        }).catch((error)=>{
-        })
-      },
-        detectionObjKeys(obj,keys){/* obj-传入对象，keys-传入检测的key值 */
-            let boolean = true
-            keys.map(e=>{
-                if(!obj[e]){
-                    boolean = false
-                }
-            })
-        },
-        openAccount(){
-          // if(sessionStorage.getItem('openAccountCount')) {
-          //   this.count = sessionStorage.getItem('openAccountCount')
-          // } 
-          this.count = this.count+1;
-          sessionStorage.setItem('openAccountCount', this.count)
-          if (this.count > 2){
-              this.count = 2
-              this.setTipsOperate('最多只能添加三个!')
+
+          if (sessionStorage.getItem('accountPassword')) {
+            this.form.drawPassword = sessionStorage.getItem('accountPassword')
           }
-          if(this.count == 1 || this.count == 2){
-              this.formTwo = true
-              // this.form.accountQualitysTwo =  this.accountQualitySelectList[0].itemId
-              this.form.accountQualitysTwo =  14
-              // this.form.voucherTypesTwo = this.voucherTypeSelectList[0].itemId
-              this.form.voucherTypesTwo = 15
-              
+          if (sessionStorage.getItem('accountPasswordTwo')) {
+            this.form.drawPassword2 = sessionStorage.getItem('accountPasswordTwo')
           }
-          if (this.count == 2){
-              this.formThree = true
-              // this.form.accountQualitysThree =  this.accountQualitySelectList[0].itemId
-              this.form.accountQualitysThree =  14
-              // this.form.voucherTypesThree = this.voucherTypeSelectList[0].itemId
-              this.form.voucherTypesThree = 15
+          if (sessionStorage.getItem('accountPasswordThree')) {
+            this.form.drawPassword3 = sessionStorage.getItem('accountPasswordThree')
           }
-        },
-      //点击提交表单
-      formSubmit(){
-          // businessKey
-          // if(!this.dataFlow.userNumber && this.businessKey === '项目一') {
-          //   this.$message({
-          //       message: '请先完成个人客户信息建立！',
-          //       type: 'error'
-          //   });
-          //   return;
+        }
+      }).catch((error) => {
+      })
+    },
+    ...mapMutations({
+      changeShowGoods: 'system/changeShowGoods'
+    }),
+    getOperationWindowsData () {
+      let param = {
+        parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,26,57,62,75'
+      }
+      let dataList = [];
+      getOperation(param).then((data) => {
+        if (data.status == 200) {
+          let list = data.data.judgmentRuleReqs;
+          // for(var i=0;i<list.length;i++){
+          //     dataList.push(list[i])
           // }
-          console.log(this.form)
-          if (this.submited) return this.$message.error('已提交！')
-          this.$refs.form.validate(myValidate(() => {
-                
-
-                // 验证通过逻辑写在这 
-                // this.formTwo == true && (this.form.accountTypesTwo && this.form.drawWaysTwo && this.form.voucherTypesTwo)
-                // this.formThree == true && (this.form.accountTypesThree && this.form.drawWaysThree && this.form.voucherTypesThree)
-                let judgeVisible2 = true
-                let judgeVisible3 = true
-                if(this.formTwo) {
-                  judgeVisible2 = this.form.accountTypesTwo && this.form.drawWaysTwo && this.form.voucherTypesTwo
-                }
-                if(this.formThree) {
-                  judgeVisible3 = this.form.accountTypesThree && this.form.drawWaysThree && this.form.voucherTypesThree
-                }
-                if(this.form.userName && this.form.currency && this.form.goldLogo && this.form.accountType && this.form.drawWay && this.form.voucherType && this.cardNumberJudge && this.form.drawPassword && judgeVisible2 && judgeVisible3) {
-                  this.visible = true
-                }else {
-                  this.setTipsOperate('有必填项未填哦~');
-                }
-            }, this.$refs));
-      },
-      //确认提交
-      popSure(){
-          const { userName, goldLogo, currency } = this.form
-          this.setDataFlow({  userName, goldLogo, currency  })
-          this.setNeedsModule(moduleName)
-          // this.visible = false
-          let formList = [];
-          // let formLists = [];
-          let voucherNumber = []
-          let voucherNumberTwo = []
-          let voucherNumberThree = []
-          let projectId = sessionStorage.getItem('projectId')
-          let startTime = sessionStorage.getItem('startTime')
-          let accountVoucher = sessionStorage.getItem('accountVoucher')
-          let formExternalDataList = JSON.parse(accountVoucher);
-          if (formExternalDataList){
-              voucherNumber = formExternalDataList
-          }else{
-              voucherNumber = []
+          if (list.length > 0) {
+            this.cardNumberJudge = true;
+            this.form.cardNumber = list[0].emptyTwo
           }
-          let accountVoucherTwo = sessionStorage.getItem('accountVoucherTwo')
-          let formExternalDataListTwo = JSON.parse(accountVoucherTwo);
-          if (formExternalDataListTwo){
-              voucherNumberTwo = formExternalDataListTwo
-          }else{
-              voucherNumberTwo = []
+        } else {
+          // dataList = []
+        }
+        // sessionStorage.setItem('dataList',JSON.stringify(dataList))
+      }).catch((error) => {
+      })
+    },
+    getSubjectInfoData (item) {
+      let params = {
+        subject_id: item
+      }
+      getSubjectInfo(params).then((data) => {
+        if (data.status == 200) {
+          this.num = this.num + 1
+          if (this.num == 6) {
+            this.getOperationData()
+            this.getOperationWindowsData()
           }
-          let accountVoucherThree = sessionStorage.getItem('accountVoucherThree')
-          let formExternalDataListThree = JSON.parse(accountVoucherThree);
-          if (formExternalDataListThree){
-              voucherNumberThree = formExternalDataListThree
-          }else{
-              voucherNumberThree = []
+          this.selectList = data.data.items;
+          if (item == '8') {
+            this.currencySelectList = data.data.items;
+          } else if (item == '9') {
+            this.goldLogoSelectList = data.data.items;
+            this.form.goldLogo = +this.goldLogoSelectList[0].itemId
+          } else if (item == '10') {
+            this.accountQualitySelectList = data.data.items;
+            this.form.accountQuality = this.accountQualitySelectList[0].itemId
+
+          } else if (item == '11') {
+
+            this.voucherTypeSelectList = data.data.items;
+            this.form.voucherType = +this.voucherTypeSelectList[0].itemId
+          } else if (item == '12') {
+            this.accountTypeSelectList = data.data.items;
+            this.form.accountType = this.accountTypeSelectList[0].itemId
+          } else if (item == '13') {
+            this.drawWaySelectList = data.data.items;
+            this.form.drawWay = this.drawWaySelectList[0].itemId
           }
-          let accountPassword = sessionStorage.getItem('accountPassword')
-          let accountPasswordTwo = sessionStorage.getItem('accountPasswordTwo')
-          let accountPasswordThree = sessionStorage.getItem('accountPasswordThree')
-          let drawPassword = accountPassword;
-          let drawPasswordTwo = accountPasswordTwo;
-          let drawPasswordThree = accountPasswordThree;
-          formList.push({"answerId":75,"emptyOne": "44", "emptyTwo": this.form.cardNumber, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,75","type": "3"})
-              // console.log([...formList])
-              // let param= {
-              //     parentId:  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,26,57,62,75',
-              //     lcJudgmentRuleReq: formLists,
-              //     projectId: +projectId,
-              //     startTime: startTime,
-              // }
-              // addOperation(param).then((data)=>{
-
-              // }).catch((error)=>{
-              //   this.$message({
-              //       message: '服务器繁忙哦，提交失败。',
-              //       center: true,
-              //       type: 'info'
-              //   });
-              // })
-              formList.push(
-                  {"answerId":'77',"emptyOne": "17", "emptyTwo": drawPassword, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,77", "type": "3"},//支取密码
-              )
-              if(this.formTwo == true && (this.form.accountTypesTwo && this.form.drawWaysTwo && this.form.voucherTypesTwo)){
-                  if (this.form.accountTypesTwo){formList.push({"answerId":'272',"emptyOne": "12", "emptyTwo": this.form.accountTypesTwo,"operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,272","type": "1"})}//账户类型2
-                  if (this.form.drawWaysTwo){formList.push({"answerId":'274',"emptyOne": "13", "emptyTwo": this.form.drawWaysTwo,"operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,274","type": "1"})} //支取方式2
-                  if (this.form.voucherTypesTwo){formList.push({"answerId":'271',"emptyOne": "11", "emptyTwo": this.form.voucherTypesTwo,"operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,271","type": "1"})} //凭证类型2
-                  formList.push(
-                      {"answerId":'275',"emptyOne": "17", "emptyTwo": drawPasswordTwo, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,275", "type": "3"},//支取密码
-                  )
-                  // for (var i=0;i<voucherNumberTwo.length;i++){
-                  //     formList.push({"answerId":voucherNumberTwo[i].id,"emptyOne": "", "emptyTwo": "", "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,273,"+voucherNumberTwo[i].id,"type": ""})
-                  // }
-                  formList.push({"answerId":273,"emptyOne": "44", "emptyTwo": this.form.cardNumber2, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,273","type": ""})
-              }else if(this.formTwo == true){
-                  this.setTipsOperate('有必填项未填哦~');
-              }
-              if(this.formThree == true && (this.form.accountTypesThree && this.form.drawWaysThree && this.form.voucherTypesThree)){
-                  if (this.form.accountTypesThree){formList.push({"answerId":'278',"emptyOne": "12", "emptyTwo": this.form.accountTypesThree, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,278","type": "1"})}//账户类型3
-                  if (this.form.drawWaysThree){formList.push({"answerId":'280',"emptyOne": "13", "emptyTwo": this.form.drawWaysThree, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,280","type": "1"})}//支取方式3
-                  if (this.form.voucherTypesThree){formList.push({"answerId":'277',"emptyOne": "11", "emptyTwo": this.form.voucherTypesThree, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,277","type": "1"})}//凭证类型3
-                  formList.push(
-                      {"answerId":'281',"emptyOne": "17", "emptyTwo": drawPasswordThree, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,281", "type": "3"},//支取密码
-                  )
-                  // for (var i=0;i<voucherNumberThree.length;i++){
-                  //     formList.push({"answerId":voucherNumberThree[i].id,"emptyOne": "", "emptyTwo": "", "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,279,"+voucherNumberThree[i].id,"type": ""})
-                  // }
-                  formList.push({"answerId":279,"emptyOne": "44", "emptyTwo": "", "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,279","type": ""})
-              }else if(this.formThree == true){
-                  this.setTipsOperate('有必填项未填哦~');
-              }
-              if (this.form.userNumber){formList.push({"answerId":'68',"emptyOne": "6", "emptyTwo": this.form.userNumber, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,68","type": "3"})}//客户号
-              if (this.form.accountQuality){formList.push({"answerId":'72',"emptyOne": "10", "emptyTwo": this.form.accountQuality, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,72","type": "1"})}//账户性质1
-              if (this.form.accountQualitysTwo){formList.push({"answerId":'270',"emptyOne": "10", "emptyTwo": this.form.accountQualitysTwo, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,270","type": "1"})}//账户性质2
-              if (this.form.accountQualitysThree){formList.push({"answerId":'276',"emptyOne": "10", "emptyTwo": this.form.accountQualitysThree, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,276","type": "1"})}//账户性质3
-              formList.push(
-                  {"answerId":'69',"emptyOne": "7", "emptyTwo": this.form.userName, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,69", "type": "3"},//用户名称
-                  {"answerId":'70',"emptyOne": "8", "emptyTwo": this.form.currency, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,70", "type": "1"},//币种
-                  {"answerId":'71',"emptyOne": "9", "emptyTwo": this.form.goldLogo, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,71","type": "1"},//钞汇标识
-                  {"answerId":'74',"emptyOne": "12", "emptyTwo": this.form.accountType, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,74","type": "1"}, //账户类型
-                  {"answerId":'76',"emptyOne": "13", "emptyTwo": this.form.drawWay, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,76", "type": "1"}, //支取方式
-                  {"answerId":'73',"emptyOne": "11", "emptyTwo": this.form.voucherType, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,73", "type": "1"}, //凭证类型
-                  // {"answerId":'75',"emptyOne": "12", "emptyTwo": this.form.cardNumber, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,75","type": "3"},
-              )
-              let params= {
-                  parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,26,57,62',
-                  lcJudgmentRuleReq:formList,
-                  projectId:+projectId,
-                  startTime:startTime,
-              }
-              addOperation(params).then((data)=>{
-                this.submited = 1
-                  // this.$message({
-                  //     message: '提交成功',
-                  //     type: 'success'
-                  // });
-              }).catch((error)=>{
-                 this.setTipsOperate('服务器繁忙哦，提交失败。')
-              })
-      },
-        deleteSecond(){
-            this.$confirm('此操作将删除该账户类型, 是否继续?', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-            }).then(() => {
-              this.count = this.count-1;
-              sessionStorage.setItem('openAccountCount', this.count)
-              if (this.count < 1){this.count = 0}
-              if (this.count == 0){
-                sessionStorage.removeItem('accountPasswordTwo')
-                sessionStorage.removeItem('accountVoucherTwo')
-                this.formTwo = false
-              }
-              if (this.count == 1){
-                sessionStorage.removeItem('accountVoucherThree')
-                sessionStorage.removeItem('accountPasswordThree')
-                this.formThree = false
-              }
-                // this.second.splice(index,1)
-                this.setTipsOperate('删除成功!')
-            }).catch(() => {
-              this.setTipsOperate('已取消删除')        
-            });
-        },
-      popUp(){
-        // 打开第一个刷卡器
-        // this.$store.commit('system/changePop',{show:true,text:'刷卡器',id:'62,1'})
-        // this.cardNumberTag = 1  
-        this.setTipsOperate('请刷银行卡')
-        // this.$message.warning('请刷银行卡');
-        this.setPopId('62,1')
-        sessionStorage.setItem('computerPath', this.$route.fullPath)
-        this.$router.push('/counter/list/')
-      },
-      popUps(){
-        // this.passwordTag = 1
-        // this.$store.commit('system/changePop',{show:true,text:'密码器',id:'62,1'})
-        this.setTipsOperate('请在密码器输入密码')
-        // this.$message.warning('请在密码器输入密码');
-        this.setPopId('62,1')
-        sessionStorage.setItem('computerPath', this.$route.fullPath)
-        this.$router.push('/counter/list/')
-      },
-      popUpTwo(){
-        // this.cardNumberTag = 2
-        // this.$store.commit('system/changePop',{show:true,text:'刷卡器',id:'62,2'})
-        
-        this.setTipsOperate('请刷二类银行卡')
-        this.setPopId('62,2')
-        sessionStorage.setItem('computerPath', this.$route.fullPath)
-        this.$router.push('/counter/list/')
-      },
-      popUpsTwo(){
-        // this.passwordTag = 2
-        // this.$store.commit('system/changePop',{show:true,text:'密码器',id:'62,2'})
-
-        this.setTipsOperate('请在密码器输入密码');
-        this.setPopId('62,2')
-        sessionStorage.setItem('computerPath', this.$route.fullPath)
-        this.$router.push('/counter/list/')
-      },
-      popUpThree(){
-        // this.cardNumberTag = 3
-        // this.$store.commit('system/changePop',{show:true,text:'刷卡器',id:'62,3'})
-
-        this.setTipsOperate('请刷银行卡');
-        this.setPopId('62,3')
-        sessionStorage.setItem('computerPath', this.$route.fullPath)
-        this.$router.push('/counter/list/')
-      },
-      popUpsThree(){
-        // this.passwordTag = 3
-        // this.$store.commit('system/changePop',{show:true,text:'密码器',id:'62,3'})
-
-        this.setTipsOperate('请在密码器输入密码');
-        this.setPopId('62,3')
-        sessionStorage.setItem('computerPath', this.$route.fullPath)
-        this.$router.push('/counter/list/')
-      },
-      checkName: checkName,
-      checkHanzi: checkHanzi,
-      inputListen: inputListen
+        }
+      }).catch((error) => {
+      })
     },
-    computed: {
-        ...mapGetters({
-            dataFlow: 'system/dataFlow',
-            needsModule: 'system/needsModule',
-            idCardNumber: 'system/idCardNumber',
-            inMyWork: 'system/inMyWork'
-        })
+    detectionObjKeys (obj, keys) {/* obj-传入对象，keys-传入检测的key值 */
+      let boolean = true
+      keys.map(e => {
+        if (!obj[e]) {
+          boolean = false
+        }
+      })
     },
-    watch: {
-      formTwo: {
-        handler(newVal) {
-          if(!newVal) {
-            this.form.drawWaysTwo = ''
-            this.form.accountQualitysTwo = ''
-            this.form.voucherTypesTwo = ''
-            this.form.accountTypesTwo = ''
-            this.form.drawPassword2 = ''
-          }
-        },
-        immediate: true
-      },
-      formThree: {
-        handler(newVal) {
-          if(!newVal) {
-            this.form.drawWaysThree = ''
-            this.form.accountQualitysThree = ''
-            this.form.voucherTypesThree = ''
-            this.form.accountTypesThree = ''
-            this.form.drawPassword3 = ''
-          }
-        },
-        immediate: true
+    openAccount () {
+      // if(sessionStorage.getItem('openAccountCount')) {
+      //   this.count = sessionStorage.getItem('openAccountCount')
+      // } 
+      this.count = this.count + 1;
+      sessionStorage.setItem('openAccountCount', this.count)
+      if (this.count > 2) {
+        this.count = 2
+        this.setTipsOperate('最多只能添加三个!')
+      }
+      if (this.count == 1 || this.count == 2) {
+        this.formTwo = true
+        // this.form.accountQualitysTwo =  this.accountQualitySelectList[0].itemId
+        this.form.accountQualitysTwo = 14
+        // this.form.voucherTypesTwo = this.voucherTypeSelectList[0].itemId
+        this.form.voucherTypesTwo = 15
+
+      }
+      if (this.count == 2) {
+        this.formThree = true
+        // this.form.accountQualitysThree =  this.accountQualitySelectList[0].itemId
+        this.form.accountQualitysThree = 14
+        // this.form.voucherTypesThree = this.voucherTypeSelectList[0].itemId
+        this.form.voucherTypesThree = 15
+      }
+    },
+    //点击提交表单
+    formSubmit () {
+      // businessKey
+      // if(!this.dataFlow.userNumber && this.businessKey === '项目一') {
+      //   this.$message({
+      //       message: '请先完成个人客户信息建立！',
+      //       type: 'error'
+      //   });
+      //   return;
+      // }
+      console.log(this.form)
+      if (this.submited) return this.$message.error('已提交！')
+      this.$refs.form.validate(myValidate(() => {
+
+
+        // 验证通过逻辑写在这 
+        // this.formTwo == true && (this.form.accountTypesTwo && this.form.drawWaysTwo && this.form.voucherTypesTwo)
+        // this.formThree == true && (this.form.accountTypesThree && this.form.drawWaysThree && this.form.voucherTypesThree)
+        let judgeVisible2 = true
+        let judgeVisible3 = true
+        if (this.formTwo) {
+          judgeVisible2 = this.form.accountTypesTwo && this.form.drawWaysTwo && this.form.voucherTypesTwo
+        }
+        if (this.formThree) {
+          judgeVisible3 = this.form.accountTypesThree && this.form.drawWaysThree && this.form.voucherTypesThree
+        }
+        if (this.form.userName && this.form.currency && this.form.goldLogo && this.form.accountType && this.form.drawWay && this.form.voucherType && this.cardNumberJudge && this.form.drawPassword && judgeVisible2 && judgeVisible3) {
+          this.visible = true
+        } else {
+          this.setTipsOperate('有必填项未填哦~');
+        }
+      }, this.$refs));
+    },
+    //确认提交
+    popSure () {
+      const { userName, goldLogo, currency } = this.form
+      this.setDataFlow({ userName, goldLogo, currency })
+      this.setNeedsModule(moduleName)
+      // this.visible = false
+      let formList = [];
+      // let formLists = [];
+      let voucherNumber = []
+      let voucherNumberTwo = []
+      let voucherNumberThree = []
+      let projectId = sessionStorage.getItem('projectId')
+      let startTime = sessionStorage.getItem('startTime')
+      let accountVoucher = sessionStorage.getItem('accountVoucher')
+      let formExternalDataList = JSON.parse(accountVoucher);
+      if (formExternalDataList) {
+        voucherNumber = formExternalDataList
+      } else {
+        voucherNumber = []
+      }
+      let accountVoucherTwo = sessionStorage.getItem('accountVoucherTwo')
+      let formExternalDataListTwo = JSON.parse(accountVoucherTwo);
+      if (formExternalDataListTwo) {
+        voucherNumberTwo = formExternalDataListTwo
+      } else {
+        voucherNumberTwo = []
       }
-      
+      let accountVoucherThree = sessionStorage.getItem('accountVoucherThree')
+      let formExternalDataListThree = JSON.parse(accountVoucherThree);
+      if (formExternalDataListThree) {
+        voucherNumberThree = formExternalDataListThree
+      } else {
+        voucherNumberThree = []
+      }
+      let accountPassword = sessionStorage.getItem('accountPassword')
+      let accountPasswordTwo = sessionStorage.getItem('accountPasswordTwo')
+      let accountPasswordThree = sessionStorage.getItem('accountPasswordThree')
+      let drawPassword = accountPassword;
+      let drawPasswordTwo = accountPasswordTwo;
+      let drawPasswordThree = accountPasswordThree;
+      formList.push({ "answerId": 75, "emptyOne": "44", "emptyTwo": this.form.cardNumber, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,62,75", "type": "3" })
+      // console.log([...formList])
+      // let param= {
+      //     parentId:  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,26,57,62,75',
+      //     lcJudgmentRuleReq: formLists,
+      //     projectId: +projectId,
+      //     startTime: startTime,
+      // }
+      // addOperation(param).then((data)=>{
+
+      // }).catch((error)=>{
+      //   this.$message({
+      //       message: '服务器繁忙哦，提交失败。',
+      //       center: true,
+      //       type: 'info'
+      //   });
+      // })
+      formList.push(
+        { "answerId": '77', "emptyOne": "17", "emptyTwo": drawPassword, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,62,77", "type": "3" },//支取密码
+      )
+      if (this.formTwo == true && (this.form.accountTypesTwo && this.form.drawWaysTwo && this.form.voucherTypesTwo)) {
+        if (this.form.accountTypesTwo) { formList.push({ "answerId": '272', "emptyOne": "12", "emptyTwo": this.form.accountTypesTwo, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,62,272", "type": "1" }) }//账户类型2
+        if (this.form.drawWaysTwo) { formList.push({ "answerId": '274', "emptyOne": "13", "emptyTwo": this.form.drawWaysTwo, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,62,274", "type": "1" }) } //支取方式2
+        if (this.form.voucherTypesTwo) { formList.push({ "answerId": '271', "emptyOne": "11", "emptyTwo": this.form.voucherTypesTwo, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,62,271", "type": "1" }) } //凭证类型2
+        formList.push(
+          { "answerId": '275', "emptyOne": "17", "emptyTwo": drawPasswordTwo, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,62,275", "type": "3" },//支取密码
+        )
+        // for (var i=0;i<voucherNumberTwo.length;i++){
+        //     formList.push({"answerId":voucherNumberTwo[i].id,"emptyOne": "", "emptyTwo": "", "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,273,"+voucherNumberTwo[i].id,"type": ""})
+        // }
+        formList.push({ "answerId": 273, "emptyOne": "44", "emptyTwo": this.form.cardNumber2, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,62,273", "type": "3" })
+      } else if (this.formTwo == true) {
+        this.setTipsOperate('有必填项未填哦~');
+      }
+      if (this.formThree == true && (this.form.accountTypesThree && this.form.drawWaysThree && this.form.voucherTypesThree)) {
+        if (this.form.accountTypesThree) { formList.push({ "answerId": '278', "emptyOne": "12", "emptyTwo": this.form.accountTypesThree, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,62,278", "type": "1" }) }//账户类型3
+        if (this.form.drawWaysThree) { formList.push({ "answerId": '280', "emptyOne": "13", "emptyTwo": this.form.drawWaysThree, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,62,280", "type": "1" }) }//支取方式3
+        if (this.form.voucherTypesThree) { formList.push({ "answerId": '277', "emptyOne": "11", "emptyTwo": this.form.voucherTypesThree, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,62,277", "type": "1" }) }//凭证类型3
+        formList.push(
+          { "answerId": '281', "emptyOne": "17", "emptyTwo": drawPasswordThree, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,62,281", "type": "3" },//支取密码
+        )
+        // for (var i=0;i<voucherNumberThree.length;i++){
+        //     formList.push({"answerId":voucherNumberThree[i].id,"emptyOne": "", "emptyTwo": "", "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,279,"+voucherNumberThree[i].id,"type": ""})
+        // }
+        formList.push({ "answerId": 279, "emptyOne": "44", "emptyTwo": "", "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,62,279", "type": "" })
+      } else if (this.formThree == true) {
+        this.setTipsOperate('有必填项未填哦~');
+      }
+      if (this.form.userNumber) { formList.push({ "answerId": '68', "emptyOne": "6", "emptyTwo": this.form.userNumber, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,62,68", "type": "3" }) }//客户号
+      if (this.form.accountQuality) { formList.push({ "answerId": '72', "emptyOne": "10", "emptyTwo": this.form.accountQuality, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,62,72", "type": "1" }) }//账户性质1
+      if (this.form.accountQualitysTwo) { formList.push({ "answerId": '270', "emptyOne": "10", "emptyTwo": this.form.accountQualitysTwo, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,62,270", "type": "1" }) }//账户性质2
+      if (this.form.accountQualitysThree) { formList.push({ "answerId": '276', "emptyOne": "10", "emptyTwo": this.form.accountQualitysThree, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,62,276", "type": "1" }) }//账户性质3
+      formList.push(
+        { "answerId": '69', "emptyOne": "7", "emptyTwo": this.form.userName, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,62,69", "type": "3" },//用户名称
+        { "answerId": '70', "emptyOne": "8", "emptyTwo": this.form.currency, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,62,70", "type": "1" },//币种
+        { "answerId": '71', "emptyOne": "9", "emptyTwo": this.form.goldLogo, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,62,71", "type": "1" },//钞汇标识
+        { "answerId": '74', "emptyOne": "12", "emptyTwo": this.form.accountType, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,62,74", "type": "1" }, //账户类型
+        { "answerId": '76', "emptyOne": "13", "emptyTwo": this.form.drawWay, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,62,76", "type": "1" }, //支取方式
+        { "answerId": '73', "emptyOne": "11", "emptyTwo": this.form.voucherType, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,62,73", "type": "1" }, //凭证类型
+        // {"answerId":'75',"emptyOne": "12", "emptyTwo": this.form.cardNumber, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,26,57,62,75","type": "3"},
+      )
+      let params = {
+        parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,26,57,62',
+        lcJudgmentRuleReq: formList,
+        projectId: +projectId,
+        startTime: startTime,
+      }
+      addOperation(params).then((data) => {
+        this.submited = 1
+        // this.$message({
+        //     message: '提交成功',
+        //     type: 'success'
+        // });
+      }).catch((error) => {
+        this.setTipsOperate('服务器繁忙哦，提交失败。')
+      })
+    },
+    deleteSecond () {
+      this.$confirm('此操作将删除该账户类型, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.count = this.count - 1;
+        sessionStorage.setItem('openAccountCount', this.count)
+        if (this.count < 1) { this.count = 0 }
+        if (this.count == 0) {
+          sessionStorage.removeItem('accountPasswordTwo')
+          sessionStorage.removeItem('accountVoucherTwo')
+          this.formTwo = false
+        }
+        if (this.count == 1) {
+          sessionStorage.removeItem('accountVoucherThree')
+          sessionStorage.removeItem('accountPasswordThree')
+          this.formThree = false
+        }
+        // this.second.splice(index,1)
+        this.setTipsOperate('删除成功!')
+      }).catch(() => {
+        this.setTipsOperate('已取消删除')
+      });
+    },
+    popUp () {
+      // 打开第一个刷卡器
+      // this.$store.commit('system/changePop',{show:true,text:'刷卡器',id:'62,1'})
+      // this.cardNumberTag = 1  
+      this.setTipsOperate('请刷银行卡')
+      // this.$message.warning('请刷银行卡');
+      this.setPopId('62,1')
+      sessionStorage.setItem('computerPath', this.$route.fullPath)
+      this.$router.push('/counter/list/')
+    },
+    popUps () {
+      // this.passwordTag = 1
+      // this.$store.commit('system/changePop',{show:true,text:'密码器',id:'62,1'})
+      this.setTipsOperate('请在密码器输入密码')
+      // this.$message.warning('请在密码器输入密码');
+      this.setPopId('62,1')
+      sessionStorage.setItem('computerPath', this.$route.fullPath)
+      this.$router.push('/counter/list/')
+    },
+    popUpTwo () {
+      // this.cardNumberTag = 2
+      // this.$store.commit('system/changePop',{show:true,text:'刷卡器',id:'62,2'})
+
+      this.setTipsOperate('请刷二类银行卡')
+      this.setPopId('62,2')
+      sessionStorage.setItem('computerPath', this.$route.fullPath)
+      this.$router.push('/counter/list/')
+    },
+    popUpsTwo () {
+      // this.passwordTag = 2
+      // this.$store.commit('system/changePop',{show:true,text:'密码器',id:'62,2'})
+
+      this.setTipsOperate('请在密码器输入密码');
+      this.setPopId('62,2')
+      sessionStorage.setItem('computerPath', this.$route.fullPath)
+      this.$router.push('/counter/list/')
+    },
+    popUpThree () {
+      // this.cardNumberTag = 3
+      // this.$store.commit('system/changePop',{show:true,text:'刷卡器',id:'62,3'})
+
+      this.setTipsOperate('请刷银行卡');
+      this.setPopId('62,3')
+      sessionStorage.setItem('computerPath', this.$route.fullPath)
+      this.$router.push('/counter/list/')
+    },
+    popUpsThree () {
+      // this.passwordTag = 3
+      // this.$store.commit('system/changePop',{show:true,text:'密码器',id:'62,3'})
+
+      this.setTipsOperate('请在密码器输入密码');
+      this.setPopId('62,3')
+      sessionStorage.setItem('computerPath', this.$route.fullPath)
+      this.$router.push('/counter/list/')
+    },
+    checkName: checkName,
+    checkHanzi: checkHanzi,
+    inputListen: inputListen
+  },
+  computed: {
+    ...mapGetters({
+      dataFlow: 'system/dataFlow',
+      needsModule: 'system/needsModule',
+      idCardNumber: 'system/idCardNumber',
+      inMyWork: 'system/inMyWork'
+    })
+  },
+  watch: {
+    formTwo: {
+      handler (newVal) {
+        if (!newVal) {
+          this.form.drawWaysTwo = ''
+          this.form.accountQualitysTwo = ''
+          this.form.voucherTypesTwo = ''
+          this.form.accountTypesTwo = ''
+          this.form.drawPassword2 = ''
+        }
+      },
+      immediate: true
     },
+    formThree: {
+      handler (newVal) {
+        if (!newVal) {
+          this.form.drawWaysThree = ''
+          this.form.accountQualitysThree = ''
+          this.form.voucherTypesThree = ''
+          this.form.accountTypesThree = ''
+          this.form.drawPassword3 = ''
+        }
+      },
+      immediate: true
+    }
+
+  },
 
 };
 </script>
 <style lang="scss" scoped>
-.body{
+.body {
     margin-top: 50px;
     overflow: auto;
-    .idCard{
+    .idCard {
         border-radius: 5px;
-        background: #CFDDFF;
+        background: #cfddff;
         text-align: center;
         height: 40px;
         line-height: 40px;
         font-size: 18px;
-        color: #6191FF;
+        color: #6191ff;
         cursor: pointer;
     }
-    .add{
+    .add {
         position: relative;
-        .el-col{
+        .el-col {
             padding: 10px 0;
         }
-        &::after{
+        &::after {
             content: '';
             display: block;
             position: absolute;
             right: 3%;
             top: -4%;
-            border: 1px dashed #CFDDFF;
+            border: 1px dashed #cfddff;
             width: 88%;
             height: 200px;
         }
-        .addBtn{
+        .addBtn {
             position: absolute;
             left: 0;
             top: 50%;
-            transform: translate(50%,-50%);
+            transform: translate(50%, -50%);
             font-size: 22px;
         }
     }
@@ -978,28 +1139,28 @@ export default {
 //     left: 50%;
 //     transform: translate(-50%,-50%);
 // }
-.popBody{
+.popBody {
     min-height: 200px;
     display: flex;
     align-items: center;
     justify-content: center;
     text-align: center;
 }
-.popBtns{
+.popBtns {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    .btn{
+    .btn {
         width: 180px;
         border-radius: 10px;
         font-size: 18px;
     }
-    .close{
-        background: #CFDEFF;
-        color: #6191FF;
+    .close {
+        background: #cfdeff;
+        color: #6191ff;
     }
-    .sure{
-        background: #6191FF;
+    .sure {
+        background: #6191ff;
         color: #fff;
     }
 }
diff --git a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
index d57f1f8..2c2bb0d 100644
--- a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
+++ b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
@@ -1,492 +1,558 @@
 // 整存整取 > 取款
 <template>
-    <div class="body">
-        <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="voucherNumber">
-                        <!-- <div v-if='!cardNumberJudge' class="idCard" @click="popUp('刷卡器')">
+  <div class="body">
+    <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="voucherNumber">
+            <!-- <div v-if='!cardNumberJudge' class="idCard" @click="popUp('刷卡器')">
                             <p>请刷卡</p>
                         </div>
                         <div v-else>
                             <el-input @blur="getDataBlur" ref="voucherNumber" disabled :value="form.voucherNumber" @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
                         </div> -->
-                        <el-input @blur="getDataBlur" ref="voucherNumber" :value="form.voucherNumber" @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
-                    </el-form-item>
-                    <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-select>
-                    </el-form-item>
-                    <el-form-item label="定存编号" prop="depositNumber">
-                        <el-input ref="depositNumber" disabled :value="form.depositNumber" @input="(val) => checkHanzi(val, form, 'depositNumber')"></el-input>
-                    </el-form-item>
-                    <el-form-item label="支取方式" prop="withdrawWay">
-                        <el-radio-group v-model.trim="form.withdrawWay"  ref="withdrawWay">
-                            <el-radio :label="125">部分支取</el-radio>
-                            <el-radio :label="126">全部支取并销户</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item label="支取类别" prop="withdrawType">
-                        <el-select v-model.trim="form.withdrawType" placeholder="请选择" ref="withdrawType">
-                            <el-option  label="现金" :value="124"> </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <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>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="10" :offset="1">
-                    <el-form-item label="客户姓名" prop="customerName">
-                        <el-input :value="form.customerName" disabled @input="(val) => checkName(val, form, 'customerName')" ref="customerName"></el-input>
-                    </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-select>
-                    </el-form-item>
-                    <el-form-item label="本金" prop="capital">
-                        <el-input  :value="form.capital" disabled @input="val => ismoney(val, form, 'capital')" ref="capital" ></el-input>
-                    </el-form-item>
-                    <el-form-item label="支取金额" prop="withdrawAmount">
-                        <el-input ref="withdrawAmount"  :value="form.withdrawAmount" :disabled="capitalDisabled" @input="val => getMoneyJudge(val)"></el-input>
-                    </el-form-item>
-                    <el-form-item label="利息" prop="interest">
-                        <el-input :value="form.interest" disabled @input="(val) => rateListen(val, form, 'interest')" ref="interest"></el-input>
-                    </el-form-item>
-                    <el-form-item label="新凭证号码" prop="newVoucherNumber" v-show="form.withdrawWay===125">
-                        <el-input :value="form.newVoucherNumber" @input="(val) => inputListen(val, form, 'newVoucherNumber')" ref="newVoucherNumber"></el-input>
-                    </el-form-item>
-                    
-                </el-col>
-                
-            </el-form>
-        </el-row>
-        <el-button @click="submitIt" type="primary" class="submitBtn" v-throttle>提交</el-button>
-        <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
-    </div>
-    <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
+            <el-input @blur="getDataBlur"
+                      ref="voucherNumber"
+                      :value="form.voucherNumber"
+                      @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
+          </el-form-item>
+          <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-select>
+          </el-form-item>
+          <el-form-item label="定存编号"
+                        prop="depositNumber">
+            <el-input ref="depositNumber"
+                      disabled
+                      :value="form.depositNumber"
+                      @input="(val) => checkHanzi(val, form, 'depositNumber')"></el-input>
+          </el-form-item>
+          <el-form-item label="支取方式"
+                        prop="withdrawWay">
+            <el-radio-group v-model.trim="form.withdrawWay"
+                            ref="withdrawWay">
+              <el-radio :label="125">部分支取</el-radio>
+              <el-radio :label="126">全部支取并销户</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="支取类别"
+                        prop="withdrawType">
+            <el-select v-model.trim="form.withdrawType"
+                       placeholder="请选择"
+                       ref="withdrawType">
+              <el-option label="现金"
+                         :value="124"> </el-option>
+            </el-select>
+          </el-form-item>
+          <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>
+          </el-form-item>
+        </el-col>
+        <el-col :span="10"
+                :offset="1">
+          <el-form-item label="客户姓名"
+                        prop="customerName">
+            <el-input :value="form.customerName"
+                      disabled
+                      @input="(val) => checkName(val, form, 'customerName')"
+                      ref="customerName"></el-input>
+          </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-select>
+          </el-form-item>
+          <el-form-item label="本金"
+                        prop="capital">
+            <el-input :value="form.capital"
+                      disabled
+                      @input="val => ismoney(val, form, 'capital')"
+                      ref="capital"></el-input>
+          </el-form-item>
+          <el-form-item label="支取金额"
+                        prop="withdrawAmount">
+            <el-input ref="withdrawAmount"
+                      :value="form.withdrawAmount"
+                      :disabled="capitalDisabled"
+                      @input="val => getMoneyJudge(val)"></el-input>
+          </el-form-item>
+          <el-form-item label="利息"
+                        prop="interest">
+            <el-input :value="form.interest"
+                      disabled
+                      @input="(val) => rateListen(val, form, 'interest')"
+                      ref="interest"></el-input>
+          </el-form-item>
+          <el-form-item label="新凭证号码"
+                        prop="newVoucherNumber"
+                        v-show="form.withdrawWay===125">
+            <el-input :value="form.newVoucherNumber"
+                      @input="(val) => inputListen(val, form, 'newVoucherNumber')"
+                      ref="newVoucherNumber"></el-input>
+          </el-form-item>
+
+        </el-col>
+
+      </el-form>
+    </el-row>
+    <el-button @click="submitIt"
+               type="primary"
+               class="submitBtn"
+               v-throttle>提交</el-button>
+    <my-dialog :moduleName="moduleName"
+               v-if="visible"
+               :visible.sync="visible"
+               :showForm="form"
+               :formName="formName"
+               @submitIt="submitForm2" />
+  </div>
+  <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
 </template>
 <script>
-import { myValidate, checkHanzi, checkName, ismoney, autoPlay, autoPlay2, rateListen, inputListen,messageCard, messagePassword} from '@/utils/utilFunction.js';
-import { mobPattern, namePattern, ratePattern, vercustomer  } from '@/utils/verify.js'
+import { myValidate, checkHanzi, checkName, ismoney, autoPlay, autoPlay2, rateListen, inputListen, messageCard, messagePassword } from '@/utils/utilFunction.js';
+import { mobPattern, namePattern, ratePattern, vercustomer } from '@/utils/verify.js'
 
 const moduleName = 'timeDeposit/withdrawal'
 import { mapMutations, mapGetters } from 'vuex'
 import NeedBefore from '@/components/needBefore'
 import MyDialog from '@/components/dialog'
 import TipsBefore from '@/mixins/tipsBefore'
-export default{
-    name:'',
-    props:{},
-    mixins: [ TipsBefore ],
-    components: {
-        NeedBefore,
-        MyDialog
-    },
-    created() {
-        
-        if(this.form.depositNumber) {
-            this.form.depositNumber = '0912'
-        }
-        if(sessionStorage.getItem('nomtimeDepositWithdrawalPassword')) {
-            this.form.drawPassword = sessionStorage.getItem('nomtimeDepositWithdrawalPassword')
-        }
-        const { withdrawWay } = this.dataFlow
-        if(withdrawWay === 126) {
-            this.form.interest = '15.00'
-            // this.rules.withdrawAmount[0].required = false
+export default {
+  name: '',
+  props: {},
+  mixins: [TipsBefore],
+  components: {
+    NeedBefore,
+    MyDialog
+  },
+  created () {
 
-            if(sessionStorage.getItem('nomtimeDepositWithdrawal2')) {
-                this.cardNumberJudge = true
-                const { userName, currency, goldLogo, interest, depositNumber, capital, withdrawType, voucherNumber } = this.dataFlow
-                this.form.voucherNumber = voucherNumber
-                this.form.customerName = userName
-                this.form.currency = currency
-                this.form.goldLogo = goldLogo
-                // this.form.interest = interest
-                this.form.depositNumber = depositNumber
-                this.form.capital = capital
-                this.form.withdrawType = withdrawType
-                // this.form.withdrawWay = withdrawWay
-            }
+    if (this.form.depositNumber) {
+      this.form.depositNumber = '0912'
+    }
+    if (sessionStorage.getItem('nomtimeDepositWithdrawalPassword')) {
+      this.form.drawPassword = sessionStorage.getItem('nomtimeDepositWithdrawalPassword')
+    }
+    const { withdrawWay } = this.dataFlow
+    if (withdrawWay === 126) {
+      this.form.interest = '15.00'
+      // this.rules.withdrawAmount[0].required = false
 
-            
-        }else {
-            this.form.interest = 0.00
+      if (sessionStorage.getItem('nomtimeDepositWithdrawal2')) {
+        this.cardNumberJudge = true
+        const { userName, currency, goldLogo, interest, depositNumber, capital, withdrawType, voucherNumber } = this.dataFlow
+        this.form.voucherNumber = voucherNumber
+        this.form.customerName = userName
+        this.form.currency = currency
+        this.form.goldLogo = goldLogo
+        // this.form.interest = interest
+        this.form.depositNumber = depositNumber
+        this.form.capital = capital
+        this.form.withdrawType = withdrawType
+        // this.form.withdrawWay = withdrawWay
+      }
 
-            if(sessionStorage.getItem('nomtimeDepositWithdrawal1')) {
-                this.cardNumberJudge = true
-                const { userName, currency, goldLogo, interest, depositNumber, capital, withdrawType, voucherNumber } = this.dataFlow
-                this.form.voucherNumber = voucherNumber
-                this.form.customerName = userName
-                this.form.currency = currency
-                this.form.goldLogo = goldLogo
-                this.form.interest = interest
-                this.form.depositNumber = depositNumber
-                this.form.capital = capital
-                this.form.withdrawType = withdrawType
-                // this.form.withdrawWay = withdrawWay
-            }
-        }
-        if(!this.form.withdrawWay) {
-            this.form.withdrawWay = 125
-        }
-        this.getFormData()
-        
-    },
-    data(){
-        const withdrawAmountValidator = (rule, value, cb) => {
-            const maxMoney = Number(this.form.capital) + Number(this.form.interest)
-            if(Number(value) > maxMoney) {
-                cb(new Error('支取金额不应超过本金与利息之和'))
-            }else {
-                cb()
-            }
-        }
-        return{
-            moduleName: 'timeDeposit/withdrawal',
-            visible: false,
-            capitalDisabled: false, // 支取金额是否可以手动输入
-            cardNumberJudge: false,
-            form:{
-                // 必填项
-                drawPassword: '', // 凭证密码
-                cardNumber: '', // 凭证号码
-                goldLogo: '', // 钞汇标识
-                capital: '', // 本金
-                interest: '', // 利息
-                withdrawAmount: '', // 支取金额
-                withdrawType: '', // 支取类别
-                withdrawWay: '', // 支取方式
-                voucherNumber: '', // 凭证号码
-                // 非必填项
-                customerName: '', // 客户姓名
-                depositNumber: '', // 定存编号
-                currency: '', // 币种
-                newVoucherNumber: '', // 新凭证号码
 
-                // userName,  这是vuex里的
-                //     currency:'CNY人民币',
-                //     goldLogo:'钞户',
-                //     interest: '0.00',
-                //     depositNubianmber: '0912',
-                //     capital: 100, // 不知道是多少
-                //     withdrawType: '现金', // 支取类别
-                //     withdrawWay: '密码', // 支取方式
-            },
-            formName:{
-                // 必填项
-                drawPassword: '凭证密码', // 
-                cardNumber: '凭证号码', // 
-                goldLogo: '钞汇标识', // 
-                capital: '本金', // 
-                interest: '利息', // 
-                withdrawAmount: '支取金额', // 
-                withdrawType: '支取类别', // 
-                withdrawWay: '支取方式', // 
-                voucherNumber: '凭证号码', // 
-                // 非必填项
-                customerName: '客户姓名', // 
-                depositNumber: '定存编号', // 
-                currency: '币种', // 
-                newVoucherNumber: '新凭证号码', // 
-            },
-            rules: {
-                customerName: vercustomer,
-                voucherNumber: [
-                    { 
-                        required: true, 
-                        message: '请输入凭证号码',
-                        trigger: 'blur'
-                    }
-                ],
-                newVoucherNumber: [
-                    { 
-                        required: true, 
-                        message: '请输入新凭证号码',
-                        trigger: 'blur'
-                    }
-                ],
-                interest: [
-                    // { 
-                    //     required: true, 
-                    //     message: '请输入利息',
-                    //     trigger: 'blur'
-                    // },
-                    {
-                        pattern: ratePattern,
-                        message: '利息格式有误'
-                    }
-                ],
-                withdrawAmount: [
-                    { 
-                        required: true, 
-                        message: '请输入支取金额',
-                        trigger: 'blur'
-                    },
-                    {
-                        validator: withdrawAmountValidator,
-                        trigger: 'change'
-                    }
-                ],
-                withdrawWay: [
-                    { 
-                        required: true, 
-                        message: '请选择支取方式',
-                        trigger: 'blur'
-                    },
-                ],
-            },
-            myTable: {
-                // voucherNumber
-                144: {
-                    prop: 'voucherNumber',
-                    type: '3',
-                    "subjectId": 44,
-                },
-                146: {
-                    prop: 'currency',//币种
-                    type: '1',
-                    "subjectId": 8,
-                },
-                147: {
-                    prop: 'goldLogo',//钞汇标识
-                    type: '1',
-                    "subjectId": 9,
-                },
-                148: {
-                    prop: 'depositNumber',//定存编号
-                    type: '3',
-                    "subjectId": 33,
-                },
-                149: {
-                    prop: 'capital',//本金
-                    type: '3',
-                    "subjectId": 34,
-                },
-                150: {
-                    prop: 'withdrawAmount',//支取金额
-                    type: '3',
-                    "subjectId": 35,
-                },
-                151: {
-                    prop: 'withdrawType',//支取类别
-                    type: '1',
-                    "subjectId": 36,
-                },
-                153: {
-                    prop: 'withdrawWay',//支取方式
-                    type: '1',
-                    "subjectId": 13,
-                },
-                154: {
-                    prop: 'drawPassword',//支取密码
-                    type: '3',
-                    "subjectId": 17,
-                },
-                564: {
-                    prop: 'newVoucherNumber',// 新凭证号码
-                    type: '3',
-                    "subjectId": 44,
-                }
-            },
-            myTable2: {
-                145: {
-                    prop: 'customerName',//客户姓名
-                    type: '3',
-                    "subjectId": 7,
-                },
-                152: {
-                    prop: 'interest',//利息
-                    type: '3',
-                    "subjectId": 26,
-                },
-            },
-            submited: 0
-        }
-    },
-    mounted() {
-    },
-    methods: {
-        ...mapMutations({
-            changeShowGoods: 'system/changeShowGoods',
-            setDataFlow: 'system/setDataFlow',
-            setNeedsModule: 'system/setNeedsModule',
-            setPopId: 'system/setPopId',
-            setTipsOperate: 'system/setTipsOperate'
-        }),
-        getMoneyJudge(val) {
-            // 检查空格
-            const tmpCheck = val.substr(val.length-1, 1);
-            // 去掉空格
-            if(tmpCheck === ' ') {
-                return;
-            }
-            // 限制最长为15
-            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==='') {
-                this.form.withdrawAmount = val
-            }
+    } else {
+      this.form.interest = 0.00
+
+      if (sessionStorage.getItem('nomtimeDepositWithdrawal1')) {
+        this.cardNumberJudge = true
+        const { userName, currency, goldLogo, interest, depositNumber, capital, withdrawType, voucherNumber } = this.dataFlow
+        this.form.voucherNumber = voucherNumber
+        this.form.customerName = userName
+        this.form.currency = currency
+        this.form.goldLogo = goldLogo
+        this.form.interest = interest
+        this.form.depositNumber = depositNumber
+        this.form.capital = capital
+        this.form.withdrawType = withdrawType
+        // this.form.withdrawWay = withdrawWay
+      }
+    }
+    if (!this.form.withdrawWay) {
+      this.form.withdrawWay = 125
+    }
+    this.getFormData()
+
+  },
+  data () {
+    const withdrawAmountValidator = (rule, value, cb) => {
+      const maxMoney = Number(this.form.capital) + Number(this.form.interest)
+      if (Number(value) > maxMoney) {
+        cb(new Error('支取金额不应超过本金与利息之和'))
+      } else {
+        cb()
+      }
+    }
+    return {
+      moduleName: 'timeDeposit/withdrawal',
+      visible: false,
+      capitalDisabled: false, // 支取金额是否可以手动输入
+      cardNumberJudge: false,
+      form: {
+        // 必填项
+        drawPassword: '', // 凭证密码
+        cardNumber: '', // 凭证号码
+        goldLogo: '', // 钞汇标识
+        capital: '', // 本金
+        interest: '', // 利息
+        withdrawAmount: '', // 支取金额
+        withdrawType: '', // 支取类别
+        withdrawWay: '', // 支取方式
+        voucherNumber: '', // 凭证号码
+        // 非必填项
+        customerName: '', // 客户姓名
+        depositNumber: '', // 定存编号
+        currency: '', // 币种
+        newVoucherNumber: '', // 新凭证号码
+
+        // userName,  这是vuex里的
+        //     currency:'CNY人民币',
+        //     goldLogo:'钞户',
+        //     interest: '0.00',
+        //     depositNubianmber: '0912',
+        //     capital: 100, // 不知道是多少
+        //     withdrawType: '现金', // 支取类别
+        //     withdrawWay: '密码', // 支取方式
+      },
+      formName: {
+        // 必填项
+        drawPassword: '凭证密码', // 
+        cardNumber: '凭证号码', // 
+        goldLogo: '钞汇标识', // 
+        capital: '本金', // 
+        interest: '利息', // 
+        withdrawAmount: '支取金额', // 
+        withdrawType: '支取类别', // 
+        withdrawWay: '支取方式', // 
+        voucherNumber: '凭证号码', // 
+        // 非必填项
+        customerName: '客户姓名', // 
+        depositNumber: '定存编号', // 
+        currency: '币种', // 
+        newVoucherNumber: '新凭证号码', // 
+      },
+      rules: {
+        customerName: vercustomer,
+        voucherNumber: [
+          {
+            required: true,
+            message: '请输入凭证号码',
+            trigger: 'blur'
+          }
+        ],
+        newVoucherNumber: [
+          {
+            required: true,
+            message: '请输入新凭证号码',
+            trigger: 'blur'
+          }
+        ],
+        interest: [
+          // { 
+          //     required: true, 
+          //     message: '请输入利息',
+          //     trigger: 'blur'
+          // },
+          {
+            pattern: ratePattern,
+            message: '利息格式有误'
+          }
+        ],
+        withdrawAmount: [
+          {
+            required: true,
+            message: '请输入支取金额',
+            trigger: 'blur'
+          },
+          {
+            validator: withdrawAmountValidator,
+            trigger: 'change'
+          }
+        ],
+        withdrawWay: [
+          {
+            required: true,
+            message: '请选择支取方式',
+            trigger: 'blur'
+          },
+        ],
+      },
+      myTable: {
+        // voucherNumber
+        144: {
+          prop: 'voucherNumber',
+          type: '3',
+          "subjectId": 44,
         },
-        getDataBlur() {
-            if(!this.form.voucherNumber) {
-                return
-            }
-            // 客户姓名、币种、钞汇标识、定存编号（0912）、本金（开户时存的业务中的金额）、支取类别（现金）、支取方式（密码）
-            const { userName, currency, goldLogo, interest, depositNumber, capital, withdrawType, money } = this.dataFlow
-            // this.form.voucherNumber = voucherNumber
-            this.form.customerName = userName
-            this.form.currency = currency
-            this.form.goldLogo = goldLogo
-            // this.form.interest = interest
-            this.form.depositNumber = depositNumber
-            this.form.capital = money || 0
-            this.form.withdrawType = withdrawType
-            // this.form.withdrawAmount = Number(this.form.interest) + Number(this.form.capital)
+        146: {
+          prop: 'currency',//币种
+          type: '1',
+          "subjectId": 8,
         },
-        getFormData(){
-            const parentId =  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,26,58,120'
-            const cards = {    
-                // 144: 'nomtimeDepositWithdrawal1',
-                // 154: 'nomtimeDepositWithdrawalPassword'
-            }
-            const callback = () => {
-                if(this.form.depositNumber) {
-                    this.form.depositNumber = '0912'
-                }
-            }
-            autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cards, callback)
+        147: {
+          prop: 'goldLogo',//钞汇标识
+          type: '1',
+          "subjectId": 9,
         },
-        popUp(text) {
-            const { withdrawWay } = this.dataFlow
-            if(withdrawWay === 126) {
-                this.setPopId('144,2')
-            }else {
-                this.setPopId('144,1')
-            }
-            
-            this.setTipsOperate('请刷银行卡');
-            
-            
-            sessionStorage.setItem('computerPath', this.$route.fullPath)
-            this.$router.push('/counter/list/')
+        148: {
+          prop: 'depositNumber',//定存编号
+          type: '3',
+          "subjectId": 33,
         },
-        popUp2(text) {
-            // this.$store.commit('system/changePop',{show:true,text, id: '154'})
-            // if(this.isNeedBefore) {
-            //     this.setPopId('154')
-            // }else {
-            //     const { withdrawWay } = this.dataFlow
-            //     if(withdrawWay === 126) {
-            //         this.setPopId('154,2')
-            //     }else {
-            //         this.setPopId('154')
-            //     }
-            // }
-            this.setPopId('154')
-            this.setTipsOperate('请在密码器输入密码');
-            
-            sessionStorage.setItem('computerPath', this.$route.fullPath)
-            this.$router.push('/counter/list/')
+        149: {
+          prop: 'capital',//本金
+          type: '3',
+          "subjectId": 34,
         },
-        submitIt() {
-            // if(!this.form.voucherNumber) {
-            //     messageCard()
-            //     return
-            // }
-            if (this.submited) return this.$message.error('已提交！')
-            if(!this.form.drawPassword) {
-                messagePassword()
-                return
-            }
-            this.$refs.form.validate(myValidate(() => {
-                // 验证通过逻辑写在这
-                this.visible = true;
-            }, this.$refs));
+        150: {
+          prop: 'withdrawAmount',//支取金额
+          type: '3',
+          "subjectId": 35,
         },
-        submitForm2() {
-            // let nomtimeDepositWithdrawal1 = sessionStorage.getItem('nomtimeDepositWithdrawal1')
-            // let nomtimeDepositWithdrawalPassword = sessionStorage.getItem('nomtimeDepositWithdrawalPassword')
-            const parentId =  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',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)
-            this.submited = 1
+        151: {
+          prop: 'withdrawType',//支取类别
+          type: '1',
+          "subjectId": 36,
         },
-        ismoney: ismoney,
-        checkHanzi: checkHanzi,
-        checkName: checkName,
-        rateListen: rateListen,
-        inputListen: inputListen
+        153: {
+          prop: 'withdrawWay',//支取方式
+          type: '1',
+          "subjectId": 13,
+        },
+        154: {
+          prop: 'drawPassword',//支取密码
+          type: '3',
+          "subjectId": 17,
+        },
+        564: {
+          prop: 'newVoucherNumber',// 新凭证号码
+          type: '3',
+          "subjectId": 44,
+        }
+      },
+      myTable2: {
+        145: {
+          prop: 'customerName',//客户姓名
+          type: '3',
+          "subjectId": 7,
+        },
+        152: {
+          prop: 'interest',//利息
+          type: '3',
+          "subjectId": 26,
+        },
+      },
+      submited: 0
+    }
+  },
+  mounted () {
+  },
+  methods: {
+    ...mapMutations({
+      changeShowGoods: 'system/changeShowGoods',
+      setDataFlow: 'system/setDataFlow',
+      setNeedsModule: 'system/setNeedsModule',
+      setPopId: 'system/setPopId',
+      setTipsOperate: 'system/setTipsOperate'
+    }),
+    getMoneyJudge (val) {
+      // 检查空格
+      const tmpCheck = val.substr(val.length - 1, 1);
+      // 去掉空格
+      if (tmpCheck === ' ') {
+        return;
+      }
+      // 限制最长为15
+      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 === '') {
+        this.form.withdrawAmount = val
+      }
     },
-    computed: {
-        ...mapGetters({
-            dataFlow: 'system/dataFlow',
-            needsModule: 'system/needsModule',
-            idCardNumber: 'system/idCardNumber',
-            inMyWork: 'system/inMyWork',
-            getSelectList: 'system/getSelectList'
-        }),
+    getDataBlur () {
+      if (!this.form.voucherNumber) {
+        return
+      }
+      // 客户姓名、币种、钞汇标识、定存编号（0912）、本金（开户时存的业务中的金额）、支取类别（现金）、支取方式（密码）
+      const { userName, currency, goldLogo, interest, depositNumber, capital, withdrawType, money } = this.dataFlow
+      // this.form.voucherNumber = voucherNumber
+      this.form.customerName = userName
+      this.form.currency = currency
+      this.form.goldLogo = goldLogo
+      // this.form.interest = interest
+      this.form.depositNumber = depositNumber
+      this.form.capital = money || 1000000
+      this.form.withdrawType = withdrawType
+      // this.form.withdrawAmount = Number(this.form.interest) + Number(this.form.capital)
     },
-    watch: {
-        'form.withdrawWay': {
-            handler(newVal, oldVal) {
-                // 这里的数据流withdrawWay纯粹用来判断，因为业务四和五就这个不一样
-                // const { withdrawWay } = this.dataFlow
-                if(newVal === 126) {
-                    
-                    this.capitalDisabled = true
-                    this.form.interest = '15.00'
-                    this.rules.newVoucherNumber = []
-                    sessionStorage.setItem('newVoucherNumber', this.form.newVoucherNumber)
-                    this.form.newVoucherNumber = ''
-                    //this.rules.withdrawAmount[0].required = false
-                    // 计算金额 最后处理
-                    this.form.withdrawAmount = Number(this.form.interest) + Number(this.form.capital)
-                }else  {
-                    if(sessionStorage.getItem('newVoucherNumber')) {
-                        this.form.newVoucherNumber = sessionStorage.getItem('newVoucherNumber')
-                    }
-                    if(oldVal === 126) {
-                        this.form.withdrawAmount = ''
-                    }
-                    
-                    this.form.interest = '0.00'
-                    this.rules.newVoucherNumber = [
-                        { 
-                            required: true, 
-                            message: '请输入新凭证号码',
-                            trigger: 'blur'
-                        }
-                    ]
-                    this.capitalDisabled = false
-                    this.$nextTick(() => {
-                        this.$refs.withdrawAmount.focus()
-                    })
-                    // this.rules.withdrawAmount[0].required = true
-                }
-            },
-            immediate: true
+    getFormData () {
+      const parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,26,58,120'
+      const cards = {
+        // 144: 'nomtimeDepositWithdrawal1',
+        // 154: 'nomtimeDepositWithdrawalPassword'
+      }
+      const callback = () => {
+        if (this.form.depositNumber) {
+          this.form.depositNumber = '0912'
+        }
+      }
+      autoPlay2(parentId, this.form, this.myTable2, this.myTable, cards, callback)
+    },
+    popUp (text) {
+      const { withdrawWay } = this.dataFlow
+      if (withdrawWay === 126) {
+        this.setPopId('144,2')
+      } else {
+        this.setPopId('144,1')
+      }
+
+      this.setTipsOperate('请刷银行卡');
+
+
+      sessionStorage.setItem('computerPath', this.$route.fullPath)
+      this.$router.push('/counter/list/')
+    },
+    popUp2 (text) {
+      // this.$store.commit('system/changePop',{show:true,text, id: '154'})
+      // if(this.isNeedBefore) {
+      //     this.setPopId('154')
+      // }else {
+      //     const { withdrawWay } = this.dataFlow
+      //     if(withdrawWay === 126) {
+      //         this.setPopId('154,2')
+      //     }else {
+      //         this.setPopId('154')
+      //     }
+      // }
+      this.setPopId('154')
+      this.setTipsOperate('请在密码器输入密码');
+
+      sessionStorage.setItem('computerPath', this.$route.fullPath)
+      this.$router.push('/counter/list/')
+    },
+    submitIt () {
+      // if(!this.form.voucherNumber) {
+      //     messageCard()
+      //     return
+      // }
+      if (this.submited) return this.$message.error('已提交！')
+      if (!this.form.drawPassword) {
+        messagePassword()
+        return
+      }
+      this.$refs.form.validate(myValidate(() => {
+        // 验证通过逻辑写在这
+        this.visible = true;
+      }, this.$refs));
+    },
+    submitForm2 () {
+      // let nomtimeDepositWithdrawal1 = sessionStorage.getItem('nomtimeDepositWithdrawal1')
+      // let nomtimeDepositWithdrawalPassword = sessionStorage.getItem('nomtimeDepositWithdrawalPassword')
+      const parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',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)
+      this.submited = 1
+    },
+    ismoney: ismoney,
+    checkHanzi: checkHanzi,
+    checkName: checkName,
+    rateListen: rateListen,
+    inputListen: inputListen
+  },
+  computed: {
+    ...mapGetters({
+      dataFlow: 'system/dataFlow',
+      needsModule: 'system/needsModule',
+      idCardNumber: 'system/idCardNumber',
+      inMyWork: 'system/inMyWork',
+      getSelectList: 'system/getSelectList'
+    }),
+  },
+  watch: {
+    'form.withdrawWay': {
+      handler (newVal, oldVal) {
+        // 这里的数据流withdrawWay纯粹用来判断，因为业务四和五就这个不一样
+        // const { withdrawWay } = this.dataFlow
+        if (newVal === 126) {
+
+          this.capitalDisabled = true
+          this.form.interest = '15.00'
+          this.rules.newVoucherNumber = []
+          sessionStorage.setItem('newVoucherNumber', this.form.newVoucherNumber)
+          this.form.newVoucherNumber = ''
+          //this.rules.withdrawAmount[0].required = false
+          // 计算金额 最后处理
+          this.form.withdrawAmount = Number(this.form.interest) + Number(this.form.capital)
+        } else {
+          if (sessionStorage.getItem('newVoucherNumber')) {
+            this.form.newVoucherNumber = sessionStorage.getItem('newVoucherNumber')
+          }
+          if (oldVal === 126) {
+            this.form.withdrawAmount = ''
+          }
+
+          this.form.interest = '0.00'
+          this.rules.newVoucherNumber = [
+            {
+              required: true,
+              message: '请输入新凭证号码',
+              trigger: 'blur'
+            }
+          ]
+          this.capitalDisabled = false
+          this.$nextTick(() => {
+            this.$refs.withdrawAmount.focus()
+          })
+          // this.rules.withdrawAmount[0].required = true
         }
+      },
+      immediate: true
     }
+  }
 }
 </script>
 <style lang='scss' scoped>
diff --git a/src/pages/manage/navbar/index.vue b/src/pages/manage/navbar/index.vue
index 8070d9f..54e2639 100644
--- a/src/pages/manage/navbar/index.vue
+++ b/src/pages/manage/navbar/index.vue
@@ -1,48 +1,48 @@
 <template>
-    <!-- 商业银行系统菜单文件 -->
-    <el-menu class="sidebar-el-menu" :default-active="onRoutes" @select="select" router  background-color="#313540" text-color="#fff" active-text-color="#ffd04b" unique-opened>
-            <template v-for="(item,index) in menus">
-                <template v-if="item.children">
-                    <el-submenu :index="item.index" :key="item.index">
-                        <template slot="title">
-                            <el-image
-                                style="width: 22px; height: 22px; margin-right: 10px;"
-                                class="align-middle"
-                                :src="item.logo"
-                               ></el-image>
-                            <span slot="title">{{ item.title }}</span>
-                        </template>
-                        <template v-for="(subItem,index) in item.children">
-                            <el-submenu
-                                v-if="subItem.children"
-                                :index="subItem.index"
-                                :key="subItem.index"
-                            >
-                                <template slot="title">{{ subItem.title }}</template>
-                                <el-menu-item
-                                    v-for="(threeItem,i) in subItem.children"
-                                    :key="i"
-                                    :index="threeItem.index"
-                                    
-                                >{{ threeItem.title }}</el-menu-item>
-                            </el-submenu>
-                            <el-menu-item
-                                v-else
-                                :index="subItem.index"
-                                :key="subItem.index"
-                            >{{ subItem.title }}</el-menu-item>
-                        </template>
-                    </el-submenu>
-                </template>
-                <template v-else>
-                    <el-menu-item :index="item.index" :key="item.index">
-                        <i :class="item.icon"></i>
-                        <span slot="title">{{ item.title }}</span>
-                    </el-menu-item>
-                </template>
-            </template>
-        </el-menu>
-    
+  <!-- 商业银行系统菜单文件 -->
+  <el-menu class="sidebar-el-menu"
+           :default-active="onRoutes"
+           @select="select"
+           router
+           background-color="#313540"
+           text-color="#fff"
+           active-text-color="#ffd04b"
+           unique-opened>
+    <template v-for="(item,index) in menus">
+      <template v-if="item.children">
+        <el-submenu :index="item.index"
+                    :key="item.index">
+          <template slot="title">
+            <el-image style="width: 22px; height: 22px; margin-right: 10px;"
+                      class="align-middle"
+                      :src="item.logo"></el-image>
+            <span slot="title">{{ item.title }}</span>
+          </template>
+          <template v-for="(subItem,index) in item.children">
+            <el-submenu v-if="subItem.children"
+                        :index="subItem.index"
+                        :key="subItem.index">
+              <template slot="title">{{ subItem.title }}</template>
+              <el-menu-item v-for="(threeItem,i) in subItem.children"
+                            :key="i"
+                            :index="threeItem.index">{{ threeItem.title }}</el-menu-item>
+            </el-submenu>
+            <el-menu-item v-else
+                          :index="subItem.index"
+                          :key="subItem.index">{{ subItem.title }}</el-menu-item>
+          </template>
+        </el-submenu>
+      </template>
+      <template v-else>
+        <el-menu-item :index="item.index"
+                      :key="item.index">
+          <i :class="item.icon"></i>
+          <span slot="title">{{ item.title }}</span>
+        </el-menu-item>
+      </template>
+    </template>
+  </el-menu>
+
 </template>
 
 <script>
@@ -50,297 +50,295 @@ import { mapState } from 'vuex'
 // import bus from '@/libs/bus';
 import Setting from '@/setting';
 export default {
-    // props: {
-    //     needIndex: {
-    //         type: String,
-    //         required: true
-    //     }
+  // props: {
+  //     needIndex: {
+  //         type: String,
+  //         required: true
+  //     }
+  // },
+  data () {
+    return {
+      // onRoutes:'/counter/list/manage/consumerClient',
+      onRoutes: '',
+      menus: [
+        {
+          icon: 'menu-icon icon-index',
+          index: '/index/list',
+          title: '客户信息',
+          logo: require('@/assets/img/systemInput/客户信息.svg'),
+          children: [
+            {
+              index: '/counter/list/manage/consumerClient',
+              title: '个人客户信息建立',
+            }, {
+              index: '/counter/list/manage/corporateClient',
+              title: '公司客户信息建立',
+            },
+          ]
+        },
+        {
+          icon: 'menu-icon icon-index',
+          index: '/index/list1',
+          title: '个人业务',
+          logo: require('@/assets/img/systemInput/个人业务.svg'),
+          children: [
+            {
+              index: '/counter/list/manage/currentAccount',
+              title: '活期业务',
+            },
+            {
+              index: '/counter/list/manage/timeDeposit',
+              title: '整存整取',
+            },
+            {
+              index: '/counter/list/manage/usefulPhrases',
+              title: '零存整取',
+            },
+            {
+              index: '/counter/list/manage/callDeposits',
+              title: '通知存款',
+            },
+            // {
+            //     index: '/counter/list/manage/accountService',
+            //     title: '账户服务',
+            // },
+          ]
+        },
+        {
+          icon: 'menu-icon icon-index',
+          index: '/index/list2',
+          title: '公司业务',
+          logo: require('@/assets/img/systemInput/公司业务.svg'),
+          children: [
+            {
+              index: "/counter/list/manage/business-openAccount",
+              title: '开户'
+            },
+            {
+              index: "/counter/list/manage/business-deposit",
+              title: '存款'
+            },
+            {
+              index: "/counter/list/manage/business-withdrawal",
+              title: '取款'
+            },
+            {
+              index: "/counter/list/manage/business-transfer",
+              title: '转账'
+            },
+          ]
+        },
+        {
+          icon: 'menu-icon icon-index',
+          index: '/index/list3',
+          title: '账户服务',
+          logo: require('@/assets/img/systemInput/账户服务.svg'),
+          children: [
+            {
+              index: "/counter/list/manage/servicesAccount-passwordChange",
+              title: '密码修改'
+            },
+            {
+              index: "/counter/list/manage/servicesAccount-passwordLost",
+              title: '密码挂失'
+            },
+            {
+              index: "/counter/list/manage/servicesAccount-relieveLost",
+              title: '挂失解挂'
+            }
+          ]
+        },
+        {
+          icon: 'menu-icon icon-index',
+          index: '/index/list4',
+          title: '同城交互',
+          logo: require('@/assets/img/systemInput/同城交互.svg'),
+          children: [
+            {
+              index: "/counter/list/manage/cityWide-out",
+              title: '同城提出'
+            },
+            {
+              index: "/counter/list/manage/cityWide-in",
+              title: '同城提入'
+            }
+          ]
+        },
+        {
+          icon: 'menu-icon icon-index',
+          index: '/index/list5',
+          title: '银行承兑汇票',
+          logo: require('@/assets/img/systemInput/承兑汇票.svg'),
+          children: [
+            {
+              index: "/counter/list/manage/acceptanceDraft-invoice",
+              title: '承兑汇票开票'
+            }
+          ]
+        },
+        {
+          icon: 'menu-icon icon-index',
+          index: '/index/list6',
+          title: '重控现金',
+          logo: require('@/assets/img/systemInput/重空现金.svg'),
+          children: [
+            {
+              index: "/counter/list/manage/importantCash-cashRecipients",
+              title: '现金管理'
+            },
+            {
+              index: "/counter/list/manage/importantCash-cashRecipients2",
+              title: '凭证管理'
+            },
+            {
+              index: "/counter/list/manage/importantCash-cashRecipients3",
+              title: '支票管理'
+            }
+          ]
+        },
+        {
+          icon: 'menu-icon icon-index',
+          index: '/index/list7',
+          title: '日终管理',
+          logo: require('@/assets/img/systemInput/日终管理.svg'),
+          children: [
+            {
+              index: "/counter/list/manage/dayEnd-tellerCash",
+              title: '柜员现金轧帐'
+            },
+            {
+              index: "/counter/list/manage/dayEnd-tellerCertificate",
+              title: '柜员凭证轧帐'
+            },
+            {
+              index: "/counter/list/manage/dayEnd-branchDayEnd",
+              title: '网点日终轧帐'
+            }
+          ]
+        },
+      ],
+    }
+  },
+  watch: {
+    // '$route.path':function (val) {
+    //     this.onRoutes = val
     // },
-    data() {
-        return {
-            // onRoutes:'/counter/list/manage/consumerClient',
-            onRoutes: '',
-            menus: [
-                {
-                    icon: 'menu-icon icon-index',
-                    index: '/index/list',
-                    title: '客户信息',
-                    logo: require('@/assets/img/systemInput/客户信息.svg'),
-                    children: [
-                        {
-                            index: '/counter/list/manage/consumerClient',
-                            title: '个人客户信息建立',
-                        },{
-                            index: '/counter/list/manage/corporateClient',
-                            title: '公司客户信息建立',
-                        },
-                    ]
-                },
-                {
-                    icon: 'menu-icon icon-index',
-                    index: '/index/list1',
-                    title: '个人业务',
-                    logo: require('@/assets/img/systemInput/个人业务.svg'),
-                    children:[
-                        {
-                            index: '/counter/list/manage/currentAccount',
-                            title: '活期业务',
-                        },
-                        {
-                            index: '/counter/list/manage/timeDeposit',
-                            title: '整存整取',
-                        },
-                        {
-                            index: '/counter/list/manage/usefulPhrases',
-                            title: '零存整取',
-                        },
-                        {
-                            index: '/counter/list/manage/callDeposits',
-                            title: '通知存款',
-                        },
-                        // {
-                        //     index: '/counter/list/manage/accountService',
-                        //     title: '账户服务',
-                        // },
-                    ]
-                },
-                {
-                    icon: 'menu-icon icon-index',
-                    index: '/index/list2',
-                    title: '公司业务',
-                    logo: require('@/assets/img/systemInput/公司业务.svg'),
-                    children:[
-                        {
-                            index:"/counter/list/manage/business-openAccount",
-                            title:'开户'
-                        },
-                        {
-                            index:"/counter/list/manage/business-deposit",
-                            title:'存款'
-                        },
-                        {
-                            index:"/counter/list/manage/business-withdrawal",
-                            title:'取款'
-                        },
-                        {
-                            index:"/counter/list/manage/business-transfer",
-                            title:'转账'
-                        },
-                    ]
-                },
-                {
-                    icon: 'menu-icon icon-index',
-                    index: '/index/list3',
-                    title: '账户服务',
-                    logo: require('@/assets/img/systemInput/账户服务.svg'),
-                    children:[
-                        {
-                            index:"/counter/list/manage/servicesAccount-passwordChange",
-                            title:'密码修改'
-                        },
-                        {
-                            index:"/counter/list/manage/servicesAccount-passwordLost",
-                            title:'密码挂失'
-                        },
-                        {
-                            index:"/counter/list/manage/servicesAccount-relieveLost",
-                            title:'挂失解挂'
-                        }
-                    ]
-                },
-                {
-                    icon: 'menu-icon icon-index',
-                    index: '/index/list4',
-                    title: '同城交互',
-                    logo: require('@/assets/img/systemInput/同城交互.svg'),
-                    children:[
-                        {
-                            index:"/counter/list/manage/cityWide-out",
-                            title:'同城提出'
-                        },
-                        {
-                            index:"/counter/list/manage/cityWide-in",
-                            title:'同城提入'
-                        }
-                    ]
-                },
-                {
-                    icon: 'menu-icon icon-index',
-                    index: '/index/list5',
-                    title: '银行承兑汇票',
-                    logo: require('@/assets/img/systemInput/承兑汇票.svg'),
-                    children:[
-                        {
-                            index:"/counter/list/manage/acceptanceDraft-invoice",
-                            title:'承兑汇票开票'
-                        }
-                    ]
-                },
-                {
-                    icon: 'menu-icon icon-index',
-                    index: '/index/list6',
-                    title: '重控现金',
-                    logo: require('@/assets/img/systemInput/重空现金.svg'),
-                    children:[
-                        {
-                            index:"/counter/list/manage/importantCash-cashRecipients",
-                            title:'现金管理'
-                        },
-                        {
-                            index:"/counter/list/manage/importantCash-cashRecipients2",
-                            title:'凭证管理'
-                        },
-                        {
-                            index:"/counter/list/manage/importantCash-cashRecipients3",
-                            title:'支票管理'
-                        }
-                    ]
-                },
-                {
-                    icon: 'menu-icon icon-index',
-                    index: '/index/list7',
-                    title: '日终管理',
-                    logo: require('@/assets/img/systemInput/日终管理.svg'),
-                    children:[
-                        {
-                            index:"/counter/list/manage/dayEnd-tellerCash",
-                            title:'柜员现金轧帐'
-                        },
-                        {
-                            index:"/counter/list/manage/dayEnd-tellerCertificate",
-                            title:'柜员凭证轧帐'
-                        },
-                        {
-                            index:"/counter/list/manage/dayEnd-branchDayEnd",
-                            title:'网点日终轧帐'
-                        }
-                    ]
-                },
-            ],
-        }
-    },
-    watch: {
-        // '$route.path':function (val) {
-        //     this.onRoutes = val
-        // },
-        needIndex(newVal) {
-            this.onRoutes = newVal
-        }
-    },
-    created() {
-        const path = sessionStorage.getItem('computerPath')
-        if(path) {
-            this.onRoutes = path
-        }else {
-            this.onRoutes = this.$route.path
-        }
-        // this.onRoutes = this.$route.path
+    needIndex (newVal) {
+      this.onRoutes = newVal
+    }
+  },
+  created () {
+    const path = sessionStorage.getItem('computerPath')
+    if (path) {
+      this.onRoutes = path
+    } else {
+      this.onRoutes = this.$route.path
+    }
+    // this.onRoutes = this.$route.path
+
+    // this.onRoutes = this.needIndex;
+    // console.log(this.onRoutes)
+    // console.log(this.needIndex)
+    // this.onRoutes = this.$route.path
+  },
+  methods: {
+    select (path) {
+      this.onRoutes = path
+    }
+  },
+  beforeDestroy () {
+    sessionStorage.setItem('computerPath', this.onRoutes)
+    sessionStorage.getItem('submited') || this.$router.push('/counter/list/')
+  },
 
-        // this.onRoutes = this.needIndex;
-        // console.log(this.onRoutes)
-        // console.log(this.needIndex)
-        // this.onRoutes = this.$route.path
-    },
-    methods: {
-        select(path) {
-            this.onRoutes = path
-        }
-    },
-    beforeDestroy() {
-        sessionStorage.setItem('computerPath', this.onRoutes)
-        this.$router.push('/counter/list/')
-    },
-    
 };
 </script>
 
 <style lang="scss" scoped>
-    // /dee/ .el-menu {
-    //     color: red!important;
-    //     overflow: auto;
-    // }
-    // .sidebar-el-menu {
-    //     // max-height: calc(100vh - 110px);
-    //     overflow: auto;
-    // }
-    
-    // .nav{
-    //     background-color: #141414;
-    //     overflow: auto;
-    //     .logo{
-    //         padding: 20px 0;
-    //         text-align: center;
-    //     }
-    //     /deep/.el-menu{
-    //         border-right: 0 !important;
-    //         .el-menu-item{
-    //             display: flex;
-    //             align-items: center;
-    //             &.is-active{
-    //                 background-color: #CC221C !important;
-    //             }
-    //         //     .menu-icon{
-    //         //         width: 24px;
-    //         //         height: 24px;
-    //         //         margin-right: 12px;
-    //         //         background: url(../../assets/img/home.png) no-repeat;
-    //         //         &.icon-ques{
-    //         //             background-image: url(../../assets/img/ques.png);
-    //         //         }
-    //         //         &.icon-testpaper{
-    //         //             background-image: url(../../assets/img/paper.png);
-    //         //         }
-    //         //         &.icon-practise{
-    //         //             background-image: url(../../assets/img/practise.png);
-    //         //         }
-    //         //         &.icon-exam{
-    //         //             background-image: url(../../assets/img/exam.png);
-    //         //         }
-    //         //         &.icon-ache{
-    //         //             background-image: url(../../assets/img/ache.png);
-    //         //         }
-    //         //         &.icon-msg{
-    //         //             background-image: url(../../assets/img/msg.png);
-    //         //         }
-    //         //         &.icon-student{
-    //         //             background-image: url(../../assets/img/student.png);
-    //         //         }
-    //         //         &.icon-system{
-    //         //             background-image: url(../../assets/img/system.png);
-    //         //         }
-    //         //     }
-    //         //     span{
-    //         //         font-size: 15px;
-    //         //     }
-    //         }
-    //     }
-    // }
+// /dee/ .el-menu {
+//     color: red!important;
+//     overflow: auto;
+// }
+// .sidebar-el-menu {
+//     // max-height: calc(100vh - 110px);
+//     overflow: auto;
+// }
 
-    .sidebar::-webkit-scrollbar {
-        width: 0;
-    }
-    .sidebar-el-menu:not(.el-menu--collapse) {
-        width: 100%;
-        border: 0;
-        border-bottom-left-radius: 20px;
-    }
-    .sidebar > ul {
-        height: 100%;
-    }
-    /deep/.el-menu{
-        border: 0;
-    }
-    // 改变menu的字体大小
-    /deep/ .el-submenu__title span {
-        font-size: 18px;
-        
-    }
+// .nav{
+//     background-color: #141414;
+//     overflow: auto;
+//     .logo{
+//         padding: 20px 0;
+//         text-align: center;
+//     }
+//     /deep/.el-menu{
+//         border-right: 0 !important;
+//         .el-menu-item{
+//             display: flex;
+//             align-items: center;
+//             &.is-active{
+//                 background-color: #CC221C !important;
+//             }
+//         //     .menu-icon{
+//         //         width: 24px;
+//         //         height: 24px;
+//         //         margin-right: 12px;
+//         //         background: url(../../assets/img/home.png) no-repeat;
+//         //         &.icon-ques{
+//         //             background-image: url(../../assets/img/ques.png);
+//         //         }
+//         //         &.icon-testpaper{
+//         //             background-image: url(../../assets/img/paper.png);
+//         //         }
+//         //         &.icon-practise{
+//         //             background-image: url(../../assets/img/practise.png);
+//         //         }
+//         //         &.icon-exam{
+//         //             background-image: url(../../assets/img/exam.png);
+//         //         }
+//         //         &.icon-ache{
+//         //             background-image: url(../../assets/img/ache.png);
+//         //         }
+//         //         &.icon-msg{
+//         //             background-image: url(../../assets/img/msg.png);
+//         //         }
+//         //         &.icon-student{
+//         //             background-image: url(../../assets/img/student.png);
+//         //         }
+//         //         &.icon-system{
+//         //             background-image: url(../../assets/img/system.png);
+//         //         }
+//         //     }
+//         //     span{
+//         //         font-size: 15px;
+//         //     }
+//         }
+//     }
+// }
 
-    /deep/.el-menu-item {
-        font-size: 18px!important;
-        
-    }
-    // .myOver {
-    //     overflow: hidden;
-    // }
+.sidebar::-webkit-scrollbar {
+    width: 0;
+}
+.sidebar-el-menu:not(.el-menu--collapse) {
+    width: 100%;
+    border: 0;
+    border-bottom-left-radius: 20px;
+}
+.sidebar > ul {
+    height: 100%;
+}
+/deep/.el-menu {
+    border: 0;
+}
+// 改变menu的字体大小
+/deep/ .el-submenu__title span {
+    font-size: 18px;
+}
+
+/deep/.el-menu-item {
+    font-size: 18px !important;
+}
+// .myOver {
+//     overflow: hidden;
+// }
 </style>
\ No newline at end of file
diff --git a/src/pages/report/index.vue b/src/pages/report/index.vue
index 05736b2..173f5cc 100644
--- a/src/pages/report/index.vue
+++ b/src/pages/report/index.vue
@@ -125,8 +125,7 @@
                              label="判分点"
                              width="200"
                              align="center"></el-table-column>
-            <el-table-column v-if='project'
-                             prop="judgmentName"
+            <el-table-column prop="judgmentName"
                              label="考核点"
                              align="center"
                              width="150">
@@ -156,6 +155,22 @@
                      v-html="scope.row.referenceAnswer"></div>
               </template>
             </el-table-column>
+            <el-table-column prop="userAnswer"
+                             label="学生答案">
+              <template slot-scope="scope">
+                <div v-if='scope.row.lcRuleRecords'>
+                  <div v-for="(item, index) in scope.row.lcRuleRecords"
+                       :key="index">
+                    <span v-if='item.userAnswer'>
+                      <span>{{index+1}}. </span>{{item.userAnswer}}
+                    </span>
+                    <span v-else>
+                      <span>{{index+1}}. </span>未填写
+                    </span>
+                  </div>
+                </div>
+              </template>
+            </el-table-column>
             <el-table-column prop="quesScore"
                              label="分值"
                              width="80"
diff --git a/src/store/modules/system.js b/src/store/modules/system.js
index 8e1c277..8b8fe14 100644
--- a/src/store/modules/system.js
+++ b/src/store/modules/system.js
@@ -454,6 +454,7 @@ const myInitState =  {
             // 身份证号码、客户号、客户姓名、币种（人民币）、钞汇标识（钞户）
             currency:12,
             goldLogo:13,
+            capital: 1000000,
             userName,
             peopleNumber,
             idNumber,