diff --git a/src/components/case/index.vue b/src/components/case/index.vue
index 23b8b3f..001b2b2 100644
--- a/src/components/case/index.vue
+++ b/src/components/case/index.vue
@@ -364,6 +364,7 @@ export default {
       let classId = sessionStorage.getItem('classId')
       let timestamp = sessionStorage.getItem('timestamp')
       let startTime = sessionStorage.getItem('startTime')
+      const storeProjectId = sessionStorage.getItem('storeProjectId')
       sessionStorage.clear()
       sessionStorage.setItem('token', token)
       sessionStorage.setItem('cid', cid)
@@ -381,6 +382,9 @@ export default {
       if(startTime) {
         sessionStorage.setItem('startTime', startTime)
       }
+      if(storeProjectId) {
+        sessionStorage.setItem('storeProjectId', storeProjectId)
+      }
       
       
       // 初始化vuex中的state
@@ -439,10 +443,17 @@ export default {
                 //     projectId: projectId
                 //   })
                 // }
-
-                this.selectProjects({
-                  projectId: this.topicList[0].projectId
-                })
+                const storeProjectId = sessionStorage.getItem('storeProjectId')
+                if(storeProjectId) {
+                  this.selectProjects({
+                    projectId: storeProjectId
+                  })
+                }else {
+                  this.selectProjects({
+                    projectId: this.topicList[0].projectId
+                  })
+                }
+                
                 
                 
                 this.gotuQueryVariable()
@@ -511,7 +522,13 @@ export default {
           if(projectId){
               this.projectId = projectId
           }else{
-              this.projectId = this.topicList[0].projectId;
+              const storeProjectId = sessionStorage.getItem('storeProjectId')
+              if(storeProjectId) {
+                this.projectId = storeProjectId;
+              }else {
+                this.projectId = this.topicList[0].projectId;
+              }
+              
           }
           sessionStorage.setItem('projectId', this.projectId)
           let params = {
@@ -568,11 +585,13 @@ export default {
       // sessionStorage.setItem('projectId', projectId)
       // this.topicList[localProjectIndex].projectId
       // localStorage.setItem('localProjectIndex', JSON.stringify(this.projectId))
+      
       this.$nextTick(() => {
         this.clearStore()
       })
       
       
+      
       // deleteCache().then((data)=>{
 
       // }).catch(() => {
@@ -582,6 +601,7 @@ export default {
       let params = {
           "projectId":this.projectId,
       }
+      sessionStorage.setItem('storeProjectId', this.projectId)
       let formList = []
       sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
       sessionStorage.setItem('accountVoucher', JSON.stringify(formList))
@@ -602,9 +622,9 @@ export default {
             // location.href = 'http://124.71.12.62/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
             // location.href = 'http://www.huorantech.cn/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
             //测试服
-            location.href = 'http://39.108.250.202/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
+            // location.href = 'http://39.108.250.202/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
             //本地
-            // location.href = "http://192.168.31.155:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId
+            location.href = "http://192.168.31.155:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId
         }
       }).catch((error)=>{
       })
@@ -835,9 +855,9 @@ export default {
         // location.href = 'http://124.71.12.62/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
         // location.href = 'http://www.huorantech.cn/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
         //测试服
-        location.href = 'http://39.108.250.202/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
+        // location.href = 'http://39.108.250.202/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
         //本地
-        // location.href = "http://192.168.31.155:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId
+        location.href = "http://192.168.31.155:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId
     },
     
     checkVer() {
diff --git a/src/components/dialog/index.vue b/src/components/dialog/index.vue
index dbdc6e6..5cc84cf 100644
--- a/src/components/dialog/index.vue
+++ b/src/components/dialog/index.vue
@@ -10,7 +10,7 @@
         class="apple"
         :close-on-click-modal="true" 
         :show-close="false" 
-        custom-class="w-full bgNone z6000"
+        custom-class="w3w5 bgNone z6000"
         >
         <div class="data-dia23 mx-auto w-9/12  rounded-3xl" :class="{ ['w-full']: flow === 3 }">
             <!-- 2xl:w-3/5 xl:w-4/5 lg:w-full -->
@@ -472,7 +472,7 @@ export default {
 
 <style lang="scss" scoped>
     /deep/.w3w5 {
-        min-width: 1400px;
+        min-width: 1300px;
     }
     /deep/.w4w5 {
         min-width: 800px;
diff --git a/src/components/dialogTwo/index.vue b/src/components/dialogTwo/index.vue
index 3e75ddd..ceeea5f 100644
--- a/src/components/dialogTwo/index.vue
+++ b/src/components/dialogTwo/index.vue
@@ -1,12 +1,121 @@
 <template>
     <el-dialog
+        :visible="visible"
+        append-to-body
+        style="z-index: 6000;"
+        class="apple"
+        :close-on-click-modal="true" 
+        :show-close="false" 
+        custom-class="w4w5 bgNone z6000"
+        >
+        <div class="data-dia23 mx-auto w-9/12  rounded-3xl" :class="{ ['w-full']: flow === 3 }">
+            <!-- 2xl:w-3/5 xl:w-4/5 lg:w-full -->
+            <div slot="title" class="dia-header rounded-3xl">
+                <div class="data-title" v-if="flow === 1 || flow === 2">提示</div>
+                <div class="data-title" v-else-if="flow === 4">提交</div>
+                <div class="data-title" v-else>{{ successName }}</div>
+            </div>
+            <div class="popBody" v-if="flow === 1">
+                <h2 class="text-red-500 text-2xl">本业务需要授权</h2>
+            </div>
+            <div class="popBody" v-else-if="flow === 4">
+                <h2 class="text-red-500 text-2xl">提交后将不可更改，您确定要提交吗？</h2>
+            </div>
+            <div class="popBody" v-else-if="flow === 2">
+                <el-form ref="form2" :model="disForm" label-width="200px" >
+                        <el-form-item label="授权柜员">
+                        <el-input disabled v-model="disForm.name"></el-input>
+                    </el-form-item>
+                    <el-form-item label="授权柜员">
+                        <el-input type="password" disabled v-model="disForm.pass"></el-input>
+                    </el-form-item>
+                </el-form>
+            </div>
+            <div class="popBody w-full" v-else>
+                <el-row :gutter="20">
+                    <el-form label-width="200px">
+                        <el-col :span="12">
+                            <el-form-item v-for="(val, key) in leftObj" :key="key" :label="key + ':'">
+                                <div>{{ val }}</div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item v-for="(val, key) in rightObj" :key="key" :label="key + ':'">
+                                <div>{{ val }}</div>
+                            </el-form-item>
+                        </el-col>
+                    </el-form>
+                </el-row>
+            </div>
+            <div class="popBtns" v-if="flow === 1 || flow === 2 || flow === 4">
+                <el-button class="close btn hover:bg-blue-100 " @click="cancelIt">取 消</el-button>
+                <el-button class="sure btn hover:bg-blue-700 " type="primary" @click="sureIt">确 定</el-button>
+            </div>
+            <div class="myPopBtns" v-else>
+                <el-button class="sure btn hover:bg-blue-700 " type="primary" @click="sureIt">确 定</el-button>
+            </div>
+            </div>
+            
+            
+            
+            
+            
+            
+            <!-- <div width="900px" class="data-dia23 max-h-screen 2xl:-mt-20;" ref="dataDia" v-drag>
+                <div class="dia-header">
+                    <div class="data-title" v-if="flow === 1 || flow === 2">授权</div>
+                    <div class="data-title" v-else>提交成功</div>
+                </div>
+                <div class="popBody w-full" v-if="flow === 1">
+                    <h2 class="text-red-500 text-2xl">本业务需要授权</h2>
+                </div>
+                <div class="popBody" v-else-if="flow === 4">
+                    <h2 class="text-red-500 text-2xl">提交后将不可更改，您确认提交吗？</h2>
+                </div>
+                <div class="popBody" v-else-if="flow === 2">
+                    <el-form ref="form2" :model="disForm" label-width="80px">
+                            <el-form-item label="授权柜员">
+                            <el-input disabled v-model="disForm.name"></el-input>
+                        </el-form-item>
+                        <el-form-item label="授权柜员">
+                            <el-input type="password" disabled v-model="disForm.pass"></el-input>
+                        </el-form-item>
+                    </el-form>
+                </div>
+                <div class="popBody w-full" v-else>
+                    <el-row :gutter="20">
+                        <el-form label-width="100px">
+                            <el-col :span="10"  :offset="1">
+                                <el-form-item v-for="(val, key) in leftObj" :key="key" :label="key + ':'">
+                                    <div>{{ val }}</div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="10"  :offset="1">
+                                <el-form-item v-for="(val, key) in rightObj" :key="key" :label="key + ':'">
+                                    <div>{{ val }}</div>
+                                </el-form-item>
+                            </el-col>
+                        </el-form>
+                    </el-row>
+                </div>
+                <div class="popBtns" v-if="flow === 1 || flow === 2 || flow === 4">
+                    <el-button class="close btn hover:bg-blue-100 " @click="cancelIt">取 消</el-button>
+                    <el-button class="sure btn hover:bg-blue-700 " type="primary" @click="sureIt">确 定</el-button>
+                </div>
+                <div class="myPopBtns" v-else>
+                    <el-button class="sure btn hover:bg-blue-700 " type="primary" @click="sureIt">确 定</el-button>
+                </div>
+            </div> -->
+        
+    </el-dialog>
+    <!-- <el-dialog
         style="margin-top:0vh"
         :visible="visible"
-        class="2xl:w-9/12 xl:w-screen lg:w-full md:w-full h-auto 2xl:inset-x-64"
+        class="w-9/12"
         append-to-body
         :close-on-click-modal="true" 
         :show-close="false" 
-        custom-class="data-dia ">
+        custom-class="data-dia mx-auto">
         <div slot="title" class="dia-header">
             <div class="data-title" v-if="flow === 1 || flow === 2">提交</div>
             <div class="data-title" v-else>{{ successName }}</div>
@@ -47,7 +156,7 @@
         <div class="myPopBtns" v-else>
             <el-button class="sure btn hover:bg-blue-700" type="primary" @click="sureIt">确 定</el-button>
         </div>
-    </el-dialog>
+    </el-dialog> -->
 </template>
 
 <script>
@@ -368,4 +477,142 @@ export default {
     // /deep/.el-dialog {
     //     min-height: 50vh;
     // }
+
+    /deep/.w3w5 {
+        min-width: 1400px;
+    }
+    /deep/.w4w5 {
+        min-width: 800px;
+    }
+    /deep/.el-dialog {
+        -webkit-box-shadow:0;
+        box-shadow: 0 0 0 0!important;
+        border: 0!important;
+    }
+    /deep/.el-form-item {
+        label {
+            font-family: PingFangSC-Regular;
+            font-size: 18px;
+            color: #000000;
+            letter-spacing: 0.21px;
+            font-weight: 400;
+        }
+        .el-form-item__content{
+            padding-left: 30px;
+            text-align: left;
+            font-family: PingFangSC-Semibold;
+            font-size: 20px;
+            color: #000000;
+            letter-spacing: 0.24px;
+            font-weight: 600;
+        }
+    }
+
+
+
+    .test {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 0;
+        height: 0;
+        z-index: 9899999;
+    }
+    .masking{
+        width: 100vw;
+        height: 100vh;
+        top: 0;
+        left: 0;
+        bottom: 0;
+        right: 0;
+        opacity: .5;
+        background-color: rgba(51,51,51,.9);
+    }
+    .data-dia23{
+        // position: absolute;
+        min-width: 40%;
+        background-color: white;
+        z-index: 9999;
+        .popBody {
+            // width: 100%;
+            min-height: 30vh;
+            padding-top: 50px;
+            padding-bottom: 20px;
+            display: flex;
+            align-items: center;
+            /deep/ .el-form {
+                height: 100%;
+                
+            }
+        }
+        .dia-header{
+            height: 100%;
+            // position: relative;
+            .data-title{
+                
+                width: 300px;
+                margin: 0 auto;
+                line-height: 72px;
+                text-align: center;
+                color: #fff;
+                font-size: 24px;
+                background: url(../../assets/img/dia-title.png) 0 0/cover no-repeat;
+            }
+        }
+    }
+
+    /deep/ .el-row {
+        width: 100%;
+        padding: 0 50px;
+    }
+    // /deep/.popbody {
+    //     width: 100vw!important;
+    //     height: 100%!important;
+    //     background-color: red!important;;
+    // }
+    .popBtns {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        padding-bottom: 20px;
+        & > .btn {
+            width: 180px;
+        font-size: 18px;
+        }
+        
+    }
+    .myPopBtns {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        padding-bottom: 20px;
+        & > .btn {
+            width: 180px;
+            font-size: 18px;
+        }
+        
+    }
+
+    // /deep/.el-dialog__header, /deep/.el-dialog__body {
+    //     padding: 0;
+    //     border-radius: 16px;
+    // }
+
+    // /deep/.el-dialog {
+    //     position: absolute;
+    //     left: 50%;
+    //     transform: translateX(-25%);
+    // }
+    /deep/.bgNone {
+        background-color: transparent;
+    }
+    /deep/.myFull {
+        width: 90%;
+    }
+    /deep/.el-dialog {
+        z-index: 9999!important;
+    }
+    /deep/.el-dialog__wrapper {
+        z-index: 9999!important;
+    }
 </style>
\ No newline at end of file
diff --git a/src/components/selectBusiness/index.vue b/src/components/selectBusiness/index.vue
index 0e31b43..262ea18 100644
--- a/src/components/selectBusiness/index.vue
+++ b/src/components/selectBusiness/index.vue
@@ -240,6 +240,7 @@ export default {
             let classId = sessionStorage.getItem('classId')
             let timestamp = sessionStorage.getItem('timestamp')
             let startTime = sessionStorage.getItem('startTime')
+            const storeProjectId = sessionStorage.getItem('storeProjectId')
             sessionStorage.clear()
             sessionStorage.setItem('token', token)
             sessionStorage.setItem('cid', cid)
@@ -257,6 +258,9 @@ export default {
             if(startTime) {
                 sessionStorage.setItem('startTime', startTime)
             }
+            if(storeProjectId) {
+                sessionStorage.setItem('storeProjectId', storeProjectId)
+            }
             
             // sessionStorage.setItem('systemData', systemData)
 
diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue
index adf46e1..a4d4101 100644
--- a/src/pages/index/list/index.vue
+++ b/src/pages/index/list/index.vue
@@ -42,8 +42,10 @@
 
 <script>
 import { mapMutations, mapState } from 'vuex';
+import saveSystemModule from '@/mixins/saveSystemModule'
 export default {
     name: 'index',
+    mixins: [ saveSystemModule ],
     data() {
         return {
             caseVisible: true,
diff --git a/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue b/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue
index 15703eb..9003de2 100644
--- a/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue
+++ b/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue
@@ -119,7 +119,7 @@
             <el-row :gutter="20">
                 <el-col :span="10">
                     <el-form-item label="总金额">
-                        <el-input :value="allSum" placeholder="等待点数量" />
+                        <el-input :value="allSum" disabled placeholder="等待点数量" />
                     </el-form-item>
                 </el-col>
                 <el-col :span="10">
diff --git a/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue b/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue
index fa4fdd1..7d3327c 100644
--- a/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue
+++ b/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue
@@ -24,7 +24,7 @@
                 </el-col>
                 <el-col :span="7">
                     <el-form-item label="总金额">
-                        <el-input :value="allSum" placeholder="等待点数量" />
+                        <el-input :value="allSum" disabled placeholder="等待点数量" />
                     </el-form-item>
                 </el-col>
             </el-row>
diff --git a/src/pages/manage/list/personal/timeDeposit/deposit.vue b/src/pages/manage/list/personal/timeDeposit/deposit.vue
index 4c87530..4fe3d63 100644
--- a/src/pages/manage/list/personal/timeDeposit/deposit.vue
+++ b/src/pages/manage/list/personal/timeDeposit/deposit.vue
@@ -178,6 +178,13 @@ export default{
                         trigger: 'blur'
                     }
                 ],
+                money: [
+                    { 
+                        required: true, 
+                        message: '请填写金额',
+                        trigger: 'blur'
+                    }
+                ]
                 // extendPeriod: [
                 //     { 
                 //         required: true, 
diff --git a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
index eb973fb..44a4945 100644
--- a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
+++ b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
@@ -4,7 +4,7 @@
         <el-row :gutter="20" style="margin: 0">
             <el-form ref="form" :model="form" label-width="120px" :rules="rules">
                 <el-col :span="10" :offset="1">
-                    <el-form-item label="凭证号码" required>
+                    <el-form-item label="凭证号码" prop="voucherNumber">
                         <!-- <div v-if='!cardNumberJudge' class="idCard" @click="popUp('刷卡器')">
                             <p>请刷卡</p>
                         </div>
@@ -32,6 +32,14 @@
                             <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">
@@ -51,13 +59,8 @@
                     <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="支取密码" 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 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>
@@ -87,18 +90,9 @@ export default{
         MyDialog
     },
     created() {
-        if(sessionStorage.getItem('nomtimeDepositWithdrawalPassword2')) {
-            this.form.drawPassword = sessionStorage.getItem('nomtimeDepositWithdrawalPassword2')
+        if(sessionStorage.getItem('nomtimeDepositWithdrawalPassword')) {
+            this.form.drawPassword = sessionStorage.getItem('nomtimeDepositWithdrawalPassword')
         }
-        // if(this.isNeedBefore) {
-        //     if(sessionStorage.getItem('nomtimeDepositWithdrawal1')) {
-        //         this.cardNumberJudge = true
-        //         this.form.voucherNumber = this.dataFlow.voucherNumber || '159753'
-        //     }
-            
-
-        //     return
-        // }
         const { withdrawWay } = this.dataFlow
         console.log('withdrawWay---')
         console.log(withdrawWay)
@@ -113,7 +107,7 @@ export default{
                 this.form.customerName = userName
                 this.form.currency = currency
                 this.form.goldLogo = goldLogo
-                this.form.interest = interest
+                // this.form.interest = interest
                 this.form.depositNumber = depositNumber
                 this.form.capital = capital
                 this.form.withdrawType = withdrawType
@@ -137,16 +131,7 @@ export default{
                 this.form.withdrawType = withdrawType
                 // this.form.withdrawWay = withdrawWay
             }
-
-            if(sessionStorage.getItem('nomtimeDepositWithdrawalPassword')) {
-                this.form.drawPassword = sessionStorage.getItem('nomtimeDepositWithdrawalPassword')
-                console.log(this.form.drawPassword)
-            }
         }
-        
-
-        
-
         this.getFormData()
     },
     data(){
@@ -170,6 +155,7 @@ export default{
                 customerName: '', // 客户姓名
                 depositNumber: '', // 定存编号
                 currency: '', // 币种
+                newVoucherNumber: '', // 新凭证号码
 
                 // userName,  这是vuex里的
                 //     currency:'CNY人民币',
@@ -195,9 +181,24 @@ export default{
                 customerName: '客户姓名', // 
                 depositNumber: '定存编号', // 
                 currency: '币种', // 
+                newVoucherNumber: '新凭证号码', // 
             },
             rules: {
                 customerName: vercustomer,
+                voucherNumber: [
+                    { 
+                        required: true, 
+                        message: '请输入凭证号码',
+                        trigger: 'blur'
+                    }
+                ],
+                newVoucherNumber: [
+                    { 
+                        required: true, 
+                        message: '请输入新凭证号码',
+                        trigger: 'blur'
+                    }
+                ],
                 interest: [
                     // { 
                     //     required: true, 
@@ -306,7 +307,7 @@ export default{
             this.form.customerName = userName
             this.form.currency = currency
             this.form.goldLogo = goldLogo
-            this.form.interest = interest
+            // this.form.interest = interest
             this.form.depositNumber = depositNumber
             this.form.capital = capital
             this.form.withdrawType = withdrawType
@@ -326,49 +327,58 @@ export default{
                 //     this.form.drawPassword = sessionStorage.getItem('nomtimeDepositWithdrawalPassword')
                 // }
 
-                const { withdrawWay } = this.dataFlow
-                if(withdrawWay === 126) {
-                    this.form.interest = 5.75
-                    this.rules.withdrawAmount[0].required = false
+                // 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
 
-                    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(withdrawWay === 126) {
+                //     this.form.interest = 5.75
+                //     this.rules.withdrawAmount[0].required = false
 
-                    if(sessionStorage.getItem('nomtimeDepositWithdrawalPassword2')) {
-                        this.form.drawPassword = sessionStorage.getItem('nomtimeDepositWithdrawalPassword2')
-                    }
-                }else {
-                    this.form.interest = 0.00
-                    // nomtimeDepositWithdrawalPassword2
-                    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(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('nomtimeDepositWithdrawalPassword')) {
-                        this.form.drawPassword = sessionStorage.getItem('nomtimeDepositWithdrawalPassword')
-                    }
-                }
+                //     if(sessionStorage.getItem('nomtimeDepositWithdrawalPassword2')) {
+                //         this.form.drawPassword = sessionStorage.getItem('nomtimeDepositWithdrawalPassword2')
+                //     }
+                // }else {
+                //     this.form.interest = 0.00
+                //     // nomtimeDepositWithdrawalPassword2
+                //     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(sessionStorage.getItem('nomtimeDepositWithdrawalPassword')) {
+                //         this.form.drawPassword = sessionStorage.getItem('nomtimeDepositWithdrawalPassword')
+                //     }
+                // }
             }
             autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cards, callback)
         },
@@ -400,17 +410,17 @@ export default{
         },
         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')
-                }
-            }
-            
+            // 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)
@@ -462,20 +472,38 @@ export default{
         }),
     },
     watch: {
-        'form.withdrawWay'(newVal) {
-            // 这里的数据流withdrawWay纯粹用来判断，因为业务四和五就这个不一样
-            const { withdrawWay } = this.dataFlow
-            if(withdrawWay === 126 && newVal === 126) {
-                this.form.withdrawAmount = Number(this.form.interest) + Number(this.form.capital)
-                this.capitalDisabled = true
-            }else if(withdrawWay === 126 && newVal !== 126)  {
-                this.form.withdrawAmount = ''
-                this.capitalDisabled = false
-                this.$nextTick(() => {
-                    this.$refs.withdrawAmount.focus()
-                })
-                
-            }
+        'form.withdrawWay': {
+            handler(newVal) {
+                // 这里的数据流withdrawWay纯粹用来判断，因为业务四和五就这个不一样
+                const { withdrawWay } = this.dataFlow
+                if(withdrawWay === 126 && newVal === 126) {
+                    this.form.withdrawAmount = Number(this.form.interest) + Number(this.form.capital)
+                    this.capitalDisabled = true
+                    this.form.interest = 5.75
+                    this.rules.newVoucherNumber = []
+                    sessionStorage.setItem('newVoucherNumber', this.form.newVoucherNumber)
+                    this.form.newVoucherNumber = ''
+                }else if(withdrawWay === 126 && newVal !== 126)  {
+                    if(sessionStorage.getItem('newVoucherNumber')) {
+                        this.form.newVoucherNumber = sessionStorage.getItem('newVoucherNumber')
+                    }
+                    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()
+                    })
+                    
+                }
+            },
+            immediate: true
         }
     }
 }