From 5066d14e034e28bc10fd217450255d8e1348a5b0 Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Mon, 24 Jan 2022 11:24:03 +0800
Subject: [PATCH] update

---
 src/components/case/index.vue                 | 11 ++++++
 src/pages/counter/list/index.vue              | 22 +++++------
 .../currentAccount/accountCancellation.vue    | 16 ++++++--
 .../list/personal/currentAccount/deposit.vue  | 31 ++++++++++-----
 .../personal/currentAccount/openAccount.vue   | 38 ++++++++++++++++---
 .../list/personal/currentAccount/settle.vue   | 18 +++++++--
 .../currentAccount/transferAccounts.vue       | 16 +++++---
 .../personal/currentAccount/withdrawal.vue    | 32 ++++++++++------
 .../list/personal/timeDeposit/openAccount.vue | 35 +++++++++++------
 src/utils/utilFunction.js                     | 18 ++++++---
 10 files changed, 170 insertions(+), 67 deletions(-)

diff --git a/src/components/case/index.vue b/src/components/case/index.vue
index 7683520..98b794d 100644
--- a/src/components/case/index.vue
+++ b/src/components/case/index.vue
@@ -543,6 +543,17 @@ export default {
         this.loading = true;
         submit(params).then((data)=>{
             if(data.status == 200){
+               // 清空缓存
+                let token = sessionStorage.getItem('token')
+                let cid = sessionStorage.getItem('cid')
+                let systemId = sessionStorage.getItem('systemId')
+                let projectId = sessionStorage.getItem('projectId')
+                sessionStorage.clear()
+                sessionStorage.setItem('token', token)
+                sessionStorage.setItem('cid', cid)
+                sessionStorage.setItem('systemId', systemId)
+                sessionStorage.setItem('projectId', projectId)
+
                // 初始化vuex中的state
                 this.initState();
                 let datas= data.data.retMap.scoreInfo;
diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index 6ca23ee..dbe8284 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -124,10 +124,10 @@
             <div v-if="popText==='密码器'" style="width:800px;padding-right:150px;padding-top:80px">
                 <el-form :model="passwordForm" :rules="passwordRules" ref="form" label-width="180px">
                     <el-form-item label="密码" prop="password">
-                        <el-input v-focus show-password v-model="passwordForm.password" maxlength="6" onkeyup="{this.value=this.value.replace(/\D/g,'')}" autocomplete="off"></el-input>
+                        <el-input v-focus show-password v-model="passwordForm.passwordAgain" maxlength="6" onkeyup="{this.value=this.value.replace(/\D/g,'')}" autocomplete="off"></el-input>
                     </el-form-item>
                     <el-form-item label="确认密码" prop="passwordAgain" v-if="systemId == '62,1' || systemId == '62,2' || systemId == '62,3'">
-                        <el-input show-password v-model="passwordForm.passwordAgain"  maxlength="6" onkeyup="this.value=this.value.replace(/\D/g,'')" autocomplete="off"></el-input>
+                        <el-input show-password v-model="passwordForm.password"  maxlength="6" onkeyup="this.value=this.value.replace(/\D/g,'')" autocomplete="off"></el-input>
                     </el-form-item>
                 </el-form>
             </div>
@@ -1005,16 +1005,16 @@ export default {
             console.log('新的id值')
             console.log(newVal)
         },
-        'passwordForm.password'(newVal) {
-            // passwordForm:{
-            //     password:'',
-            //     passwordAgain: ''
-            // },
+        // 'passwordForm.password'(newVal) {
+        //     // passwordForm:{
+        //     //     password:'',
+        //     //     passwordAgain: ''
+        //     // },
             
-            this.passwordForm.passwordAgain = newVal
-            console.log('???xxxxxxxxxx')
-            console.log(this.passwordForm.passwordAgain)
-        }
+        //     this.passwordForm.passwordAgain = newVal
+        //     console.log('???xxxxxxxxxx')
+        //     console.log(this.passwordForm.passwordAgain)
+        // }
     },
     created() {
         let arr = this.$route.path.split('/').slice(-2);
diff --git a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
index 68aea15..583f2db 100644
--- a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
+++ b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
@@ -43,7 +43,7 @@
 </template>
 <script>
 import { vercustomer  } from '@/utils/verify.js'
-import { myValidate, checkHanzi, checkName, autoPlay, autoPlay2, inputListen } from '@/utils/utilFunction.js'
+import { myValidate, checkHanzi, checkName, autoPlay, autoPlay2, inputListen, messageIdCard, messagePassword } from '@/utils/utilFunction.js'
 
 import { mapMutations, mapGetters } from 'vuex'
 import NeedBefore from '@/components/needBefore'
@@ -116,7 +116,6 @@ export default{
 
         if(this.inMyWork(moduleName)) {
             if(this.needsModule(moduleName) === '') {
-                console.log(sessionStorage.getItem('nomCurrentCancellCard1'))
                 const { voucherNumber, userName } = this.dataFlow
                 this.form.cardNumber = voucherNumber
                 this.form.userName = userName
@@ -125,6 +124,7 @@ export default{
                     const { idNumber } = this.dataFlow
                     this.form.idNumber = idNumber
                 }
+
                 if(sessionStorage.getItem('nomCurrentCancellPassword')) {
                     this.form.drawPassword = sessionStorage.getItem('nomCurrentCancellPassword')
                 }
@@ -140,8 +140,8 @@ export default{
                     if(this.form.idNumber) {
                         this.idNumberJudge = true
                     }
-                    if(this.form.drawPassword) {
-                        sessionStorage.setItem('nomCurrentCancellPassword', this.form.drawPassword)
+                    if(sessionStorage.getItem('nomCurrentCancellPassword')) {
+                        this.form.drawPassword = sessionStorage.getItem('nomCurrentCancellPassword')
                     }
                 }
                 autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cardArr, callback)
@@ -166,6 +166,14 @@ export default{
             setPopId: 'system/setPopId'
         }),
       submitForm(){
+        if(!this.form.drawPassword) {
+            messagePassword()
+            return
+        }
+        if(!this.form.idNumber) {
+            messageIdCard()
+            return
+        }
         this.visible = true
       },
       submitForm2() {
diff --git a/src/pages/manage/list/personal/currentAccount/deposit.vue b/src/pages/manage/list/personal/currentAccount/deposit.vue
index e338b04..e1b112b 100644
--- a/src/pages/manage/list/personal/currentAccount/deposit.vue
+++ b/src/pages/manage/list/personal/currentAccount/deposit.vue
@@ -10,7 +10,7 @@
                                 <p>请刷卡</p>
                             </div>
                             <div v-else>
-                                <el-input ref="idCardNumber" disabled :value="form.idCardNumber" @input="(val) => inputListen(val, form, 'idCardNumber')"></el-input>
+                                <el-input ref="voucherNumber" disabled :value="form.voucherNumber" @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
                             </div>
                         </el-form-item>
                         <el-form-item label="币种" prop="currency">
@@ -18,8 +18,8 @@
                                 <el-option value="CNY人民币">CNY人民币</el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="金额">
-                            <el-input :value="form.money" disabled maxlength="15" @input="val => ismoney(val, form, 'money')" ref="money"></el-input>
+                        <el-form-item label="金额" prop="money">
+                            <el-input :value="form.money" maxlength="15" @input="val => ismoney(val, form, 'money')" ref="money"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="10" :offset="1">
@@ -51,7 +51,7 @@
 <script> // currentAccount/deposit
 import { mapMutations, mapGetters } from 'vuex'
 import { mobPattern, namePattern, ratePattern, vercustomer  } from '@/utils/verify.js'
-import { ismoney, myValidate, checkName, rateListen } from '@/utils/utilFunction.js'
+import { ismoney, myValidate, checkName, rateListen, messageCard } from '@/utils/utilFunction.js'
 import { addOperation, getOperation } from '@/api/http';
 
 import NeedBefore from '@/components/needBefore'
@@ -78,7 +78,7 @@ export default{
               goldLogo:'',
               annualInterest:'0.30%',
               remark:'',
-              idCardNumber: '', // 银行卡号
+              voucherNumber: '', // 银行卡号
             },
             formName: {
                 currency:'币种', // 
@@ -87,7 +87,7 @@ export default{
                 goldLogo:'炒汇标识', // 
                 annualInterest:'年利率', // 
                 remark:'摘要', // 
-                idCardNumber: '银行卡号', // 
+                voucherNumber: '银行卡号', // 
             },
             rules: {
                 userName: vercustomer ,
@@ -98,6 +98,13 @@ export default{
                         trigger: 'blur'
                     }
                 ],
+                money: [
+                    { 
+                        required: true, 
+                        message: '请填写金额',
+                        trigger: 'blur'
+                    }
+                ],
                 annualInterest: [
                     { 
                         required: true, 
@@ -119,7 +126,7 @@ export default{
                 this.form.userName = userName
                 this.form.goldLogo = goldLogo // goldLogo // 13是什么鬼
                 this.form.currency = currency
-                this.form.idCardNumber = voucherNumber
+                this.form.voucherNumber = voucherNumber
                 this.cardNumberJudge = true
             }
             this.getFormData()
@@ -144,7 +151,7 @@ export default{
                   for (var i = 0; i < list.length; i++) {
                       // if (list[i].answerId == '78') {sessionStorage.setItem('nomBusinessDepositCard', list[i].emptyTwo)} //卡号
                       if (list[i].answerId == '78') {
-                          this.form.idCardNumber = list[i].emptyTwo
+                          this.form.voucherNumber = list[i].emptyTwo
                           this.cardNumberJudge = true
                       } //卡号
                       if (list[i].answerId == '79') {this.form.userName = list[i].emptyTwo} //客户姓名
@@ -166,6 +173,11 @@ export default{
     }),
     //提交表单
     submitForm(){
+        
+        if(!this.form.voucherNumber) {
+            messageCard()
+            return
+        }
         this.$refs.form.validate(myValidate(() => {
             // 验证通过逻辑写在这
             this.visible = true;
@@ -179,7 +191,7 @@ export default{
         let nomBusinessDepositCards = nomBusinessDepositCard // JSON.parse(nomBusinessDepositCard);
         if (this.cardNumberJudge){
                 // formList.push({"answerId":78,"emptyOne": "", "emptyTwo": nomBusinessDepositCards, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,63,78","type": ""})// 卡号
-                formList.push({"answerId":78,"emptyOne": "", "emptyTwo": this.form.idCardNumber, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,63,78","type": ""})
+                formList.push({"answerId":78,"emptyOne": "", "emptyTwo": this.form.voucherNumber, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,63,78","type": ""})
             if(this.form.currency){
                 formList.push({ "answerId":'80', "emptyOne": "8", "emptyTwo": this.form.currency, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,63,80", "type": "1" })//币种
             }
@@ -228,7 +240,6 @@ export default{
         dataFlow: 'system/dataFlow',
         dataFlowPassword: 'system/dataFlowPassword',
         needsModule: 'system/needsModule',
-        idCardNumber: 'system/idCardNumber',
         inMyWork: 'system/inMyWork'
     })	
   },
diff --git a/src/pages/manage/list/personal/currentAccount/openAccount.vue b/src/pages/manage/list/personal/currentAccount/openAccount.vue
index 964a797..45d5cb1 100644
--- a/src/pages/manage/list/personal/currentAccount/openAccount.vue
+++ b/src/pages/manage/list/personal/currentAccount/openAccount.vue
@@ -360,9 +360,11 @@ export default {
                 this.cardNumberJudge3 = true
             }
 
-            // 判断是否使用密码器
+            // 无缓存的话密码出不来
             if(sessionStorage.getItem('accountPassword')) {
                 this.form.drawPassword = sessionStorage.getItem('accountPassword')
+                console.log('drawPassword')
+                console.log(this.form.drawPassword)
             }
             if(sessionStorage.getItem('accountPasswordTwo')) {
                 this.form.drawPassword2 = sessionStorage.getItem('accountPasswordTwo')
@@ -403,7 +405,7 @@ export default {
                     if(data.status == 200) {
                         var list = data.data.judgmentRuleReqs
                         for (var i = 0; i < list.length; i++) {
-                          console.log(list[i].emptyTwo)
+                          console.log('kao?' + 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}
@@ -420,8 +422,6 @@ export default {
                             // else if (list[i].answerId == '77') {sessionStorage.setItem('accountPasswordAll', list[i].emptyTwo)}
                             else if (list[i].answerId == '77') {
                               this.form.drawPassword = list[i].emptyTwo
-                              sessionStorage.setItem('accountPassword', list[i].emptyTwo)
-                              console.log(sessionStorage.getItem('accountPassword'))
                             }
                             else if (list[i].answerId == '270') {this.form.accountQualitysTwo = list[i].emptyTwo}
                             else if (list[i].answerId == '271') {this.form.voucherTypesTwo = list[i].emptyTwo}
@@ -431,11 +431,25 @@ export default {
                             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}
-                            
+                        }
+                        console.log('kao?')
+                        if(sessionStorage.getItem('accountPassword')) {
+                            this.form.drawPassword = sessionStorage.getItem('accountPassword')
+                            console.log('drawPassword')
+                            console.log(this.form.drawPassword)
+                        }
+                        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)=>{
             })
         },
@@ -453,6 +467,18 @@ export default {
                           this.cardNumberJudge = true
                         }
                     }
+
+                    if(sessionStorage.getItem('accountPassword')) {
+                        this.form.drawPassword = sessionStorage.getItem('accountPassword')
+                        console.log('drawPassword')
+                        console.log(this.form.drawPassword)
+                    }
+                    if(sessionStorage.getItem('accountPasswordTwo')) {
+                        this.form.drawPassword2 = sessionStorage.getItem('accountPasswordTwo')
+                    }
+                    if(sessionStorage.getItem('accountPasswordThree')) {
+                        this.form.drawPassword3 = sessionStorage.getItem('accountPasswordThree')
+                    }
                 }
             }).catch((error)=>{
             })
@@ -558,6 +584,8 @@ export default {
           //   return;
           // }
           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)
diff --git a/src/pages/manage/list/personal/currentAccount/settle.vue b/src/pages/manage/list/personal/currentAccount/settle.vue
index 53f14b4..c03d9b7 100644
--- a/src/pages/manage/list/personal/currentAccount/settle.vue
+++ b/src/pages/manage/list/personal/currentAccount/settle.vue
@@ -64,7 +64,7 @@
 </template>
 <script>
 import { mobPattern, namePattern, ratePattern, vercustomer  } from '@/utils/verify.js'
-import { myValidate, checkHanzi, checkName, ismoney, autoPlay, autoPlay2, inputListen } from '@/utils/utilFunction.js'
+import { myValidate, checkHanzi, checkName, ismoney, autoPlay, autoPlay2, inputListen, messageCard, messagePassword } from '@/utils/utilFunction.js'
 
 import { mapMutations, mapGetters } from 'vuex'
 import NeedBefore from '@/components/needBefore'
@@ -188,9 +188,11 @@ export default{
                     this.form.balance = balance
                     this.form.totalMoney = totalMoney
                 }
+
                 if(sessionStorage.getItem('nomCurrentSettlePassword')) {
                     this.form.drawPassword = sessionStorage.getItem('nomCurrentSettlePassword')
                 }
+                
 
                 const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,57,66'
                 const cardArr = {
@@ -205,8 +207,8 @@ export default{
                     if(this.form.userName) {
                         this.setDataFlow({ userName: this.form.userName })
                     }
-                    if(this.form.drawPassword) {
-                        sessionStorage.setItem('nomCurrentSettlePassword', this.form.drawPassword)
+                    if(sessionStorage.getItem('nomCurrentSettlePassword')) {
+                        this.form.drawPassword = sessionStorage.getItem('nomCurrentSettlePassword')
                     }
                 }
                 autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cardArr, callback)
@@ -232,6 +234,16 @@ export default{
         }),
 //提交表单
       submitForm(){
+        if(!this.form.cardNumber) {
+            messageCard()
+            return
+        }
+
+        if(!this.form.drawPassword) {
+            messagePassword()
+            return
+        }
+        
         this.$refs.form.validate(myValidate(() => {
             // 验证通过逻辑写在这
             this.visible = true
diff --git a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
index 837d754..21ce11e 100644
--- a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
+++ b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
@@ -59,7 +59,7 @@
 </template>
 <script>
 import { mobPattern, namePattern, ratePattern, vercustomer  } from '@/utils/verify.js'
-import { myValidate, checkHanzi, ismoney, checkName, autoPlay, autoPlay2 } from '@/utils/utilFunction.js'
+import { myValidate, checkHanzi, ismoney, checkName, autoPlay, autoPlay2, messageCard, messagePassword } from '@/utils/utilFunction.js'
 import { mapMutations, mapGetters } from 'vuex'
 
 const moduleName = 'currentAccount/transferAccounts'
@@ -208,7 +208,6 @@ export default{
                 this.form.drawPassword = sessionStorage.getItem('nomCurrentTransferPassword')
             }
 
-
             const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,57,65'
             const cardArr = {
                 // 94: 'nomCurrentTransferCard',
@@ -218,8 +217,8 @@ export default{
                 if(this.form.cardNumber) {
                     this.cardNumberJudge = true
                 }
-                if(this.form.drawPassword) {
-                    sessionStorage.setItem('nomCurrentTransferPassword', this.form.drawPassword)
+                if(sessionStorage.getItem('nomCurrentTransferPassword')) {
+                    this.form.drawPassword = sessionStorage.getItem('nomCurrentTransferPassword')
                 }
             }
             autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cardArr, callback)
@@ -245,7 +244,14 @@ export default{
     }),
     //提交表单
     submitForm(){
-        
+        if(!this.form.cardNumber) {
+            messageCard()
+            return
+        }
+        if(!this.form.drawPassword) {
+            messagePassword()
+            return
+        }
         this.$refs.form.validate(myValidate(() => {
             
             // 验证通过逻辑写在这
diff --git a/src/pages/manage/list/personal/currentAccount/withdrawal.vue b/src/pages/manage/list/personal/currentAccount/withdrawal.vue
index 389a85d..b171729 100644
--- a/src/pages/manage/list/personal/currentAccount/withdrawal.vue
+++ b/src/pages/manage/list/personal/currentAccount/withdrawal.vue
@@ -64,7 +64,7 @@
 </template>
 <script>
 import { mobPattern, namePattern, ratePattern, vercustomer  } from '@/utils/verify.js'
-import { myValidate, ismoney, checkName, checkHanzi  } from '@/utils/utilFunction.js'
+import { myValidate, ismoney, checkName, checkHanzi, messagePassword  } from '@/utils/utilFunction.js'
 import { addOperation, getOperation } from '@/api/http';
 import { mapMutations, mapGetters } from 'vuex'
 
@@ -83,8 +83,6 @@ export default{
     created() {
         if(this.inMyWork(moduleName)) {
             if(this.needsModule(moduleName) === '') {
-                console.log('what?>>>>>>>>>>>>>>>>>>>>>>>>')
-                console.log(sessionStorage.getItem('nomCurrentWithdrawalPassword'))
                 if(sessionStorage.getItem('nomCurrentWithdrawalCard')) {
                     this.cardNumberJudge = true
                     const { currency, userName, goldLogo, serviceCharge, chargeWay, voucherNumber } = this.dataFlow
@@ -96,6 +94,10 @@ export default{
                     this.form.cardNumber = voucherNumber
                 }
 
+                if(sessionStorage.getItem('nomCurrentWithdrawalPassword')) {
+                    this.form.drawPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword')
+                }
+
                 
 
                 this.getFormData()
@@ -185,6 +187,7 @@ export default{
               parentId: this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,57,64'
           }
           getOperation(param).then((data)=>{
+              console.log(data)
               if(data.status == 200) {
                   var list = data.data.judgmentRuleReqs
                   for (var i = 0; i < list.length; i++) {
@@ -192,7 +195,6 @@ export default{
                           // sessionStorage.setItem('nomCurrentWithdrawalCard', list[i].emptyTwo)
                           this.form.cardNumber = list[i].emptyTwo
                           this.cardNumberJudge = true
-                          // console.log(list[i].emptyTwo)
                       } //卡号
                       else if (list[i].answerId == '86') {this.form.userName = list[i].emptyTwo} //客户姓名
                       else if (list[i].answerId == '87') {this.form.currency = list[i].emptyTwo} //币种
@@ -200,24 +202,30 @@ export default{
                       else if (list[i].answerId == '89') {this.form.money = list[i].emptyTwo} //金额
                       else if (list[i].answerId == '90') {this.form.chargeWay = list[i].emptyTwo} //支取方式
                       // if (list[i].answerId == '91') {sessionStorage.setItem('nomCurrentWithdrawalPassword', list[i].emptyTwo)} //支取密码
-                      else if (list[i].answerId == '91' && !sessionStorage.getItem('nomCurrentWithdrawalPassword')) {
-                          this.form.drawPassword = list[i].emptyTwo
-                          sessionStorage.setItem('nomCurrentWithdrawalPassword', list[i].emptyTwo)
+                      else if (list[i].answerId == '91') {
+                          console.log(91)
+                        if(sessionStorage.getItem('nomCurrentWithdrawalPassword')) {
+                            this.form.drawPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword')
+                        }else {
+                            this.form.drawPassword = list[i].emptyTwo
+                        }
                       }
                       else if (list[i].answerId == '92') {this.form.serviceCharge = list[i].emptyTwo} //手续费
                       else if (list[i].answerId == '93') {this.form.remark = list[i].emptyTwo} //摘要
                   }
               }
-              if(sessionStorage.getItem('nomCurrentWithdrawalPassword')) {
-                    this.form.drawPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword')
-                }
+                console.log('fffs')
+                
                 console.log('issue')
                 console.log(sessionStorage.getItem('nomCurrentWithdrawalPassword'))
           }).catch((error)=>{
           })
       },
     submitForm(){
-        console.log(this.form.money)
+        if(!this.form.drawPassword) {
+            messagePassword()
+            return
+        }
         this.$refs.form.validate(myValidate(() => {
             this.visible = true;
         }, this.$refs));
@@ -273,7 +281,7 @@ export default{
         this.$router.push('/counter/list/')
     },
     popUp2(text) {
-        this.$message.warning('请输入密码');
+        this.$message.warning('请在密码器输入密码');
         this.setPopId('64,2')
         sessionStorage.setItem('computerPath', this.$route.fullPath)
         this.$router.push('/counter/list/')
diff --git a/src/pages/manage/list/personal/timeDeposit/openAccount.vue b/src/pages/manage/list/personal/timeDeposit/openAccount.vue
index 46df350..067894e 100644
--- a/src/pages/manage/list/personal/timeDeposit/openAccount.vue
+++ b/src/pages/manage/list/personal/timeDeposit/openAccount.vue
@@ -45,7 +45,7 @@
                             <el-option  label="钞户" value="钞户"> </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="凭证号码">
+                    <el-form-item label="凭证号码" required>
                         <div v-if='!cardNumberJudge' class="idCard" @click="popUp2('刷卡器')">
                             <p>请刷卡</p>
                         </div>
@@ -74,7 +74,7 @@
     <need-before v-else :moduleName='needBefore' :unNeed="unNeed" />
 </template>
 <script>
-import { myValidate, checkHanzi, checkName, autoPlay, autoPlay2, inputListen } from '@/utils/utilFunction.js';
+import { myValidate, checkHanzi, checkName, autoPlay, autoPlay2, inputListen, messageIdCard,messageCard, messagePassword } from '@/utils/utilFunction.js';
 import { mobPattern, namePattern, ratePattern, vercustomer } from '@/utils/verify.js'
 
 import { mapMutations, mapGetters } from 'vuex'
@@ -233,17 +233,9 @@ export default{
 
                 if(sessionStorage.getItem('nomtimeOpenAccount2')) {
                     const { voucherNumber } = this.dataFlow
-                    console.log('xs')
-                    console.log(voucherNumber)
                     this.cardNumberJudge = true
                     this.form.voucherNumber = voucherNumber
-                    console.log(this.form.voucherNumber)
                 }
-
-                if(sessionStorage.getItem('nomtimeOpenAccountPassword')) {
-                    this.form.drawPassword = sessionStorage.getItem('nomtimeOpenAccountPassword')
-                }
-
                 this.getFormData()
             }else {
                 this.isNeedBefore = true
@@ -281,8 +273,14 @@ export default{
                 if(this.form.voucherNumber) {
                     this.cardNumberJudge = true
                 }
-                if(this.form.drawPassword) {
-                    sessionStorage.setItem('nomtimeOpenAccountPassword', this.form.drawPassword)
+                // 因为这个是非必填的，所以传上去的值有可能是空
+                if(sessionStorage.getItem('nomtimeOpenAccount2')) {
+                    const { voucherNumber } = this.dataFlow
+                    this.cardNumberJudge = true
+                    this.form.voucherNumber = voucherNumber
+                }
+                if(sessionStorage.getItem('nomtimeOpenAccountPassword')) {
+                    this.form.drawPassword = sessionStorage.getItem('nomtimeOpenAccountPassword')
                 }
                 
             }
@@ -313,8 +311,21 @@ export default{
             this.$router.push('/counter/list/')
         },
         submitForm() {
+            if(!this.form.voucherNumber) {
+                messageCard()
+                return
+            }
+            if(!this.form.idNumber) {
+                messageIdCard()
+                return
+            }
+            if(!this.form.drawPassword) {
+                messagePassword()
+                return
+            }
             this.$refs.form.validate(myValidate(() => {
                     // 验证通过逻辑写在这
+                    
                     this.visible = true;
                     
             }, this.$refs));
diff --git a/src/utils/utilFunction.js b/src/utils/utilFunction.js
index d4340a4..2d10884 100644
--- a/src/utils/utilFunction.js
+++ b/src/utils/utilFunction.js
@@ -247,17 +247,24 @@ const getNowDate = () => {
     return y + '-' + m + '-' + d;
 }
 
-const messageIdCard = () => {
+const messageIdCard = (message='请刷身份证') => {
     Message.warning({
         center: true,
-        message: '请刷身份证',
+        message,
     })
 }
 
-const messageCard = () => {
+const messageCard = (message='请填写卡号') => {
     Message.warning({
         center: true,
-        message: '请刷银行卡',
+        message
+    })
+}
+
+const messagePassword = (message='请填写支取密码') => {
+    Message.warning({
+        center: true,
+        message,
     })
 }
 
@@ -290,5 +297,6 @@ const randomPeopleNumber = () => {
      getNowDate,
      inputListen2,
      messageIdCard,
-     messageCard
+     messageCard,
+     messagePassword
  }
\ No newline at end of file