From 01a1f61790a5b3205326b636ae8f5a7923a1a9cd Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Fri, 21 Jan 2022 18:45:24 +0800
Subject: [PATCH] update

---
 src/pages/counter/list/index.vue              | 11 +++
 src/pages/counter/list/myConfig.js            |  2 +-
 .../list/personal/currentAccount/settle.vue   | 31 +++---
 .../currentAccount/transferAccounts.vue       | 22 +++--
 .../personal/currentAccount/withdrawal.vue    | 20 ++--
 .../list/personal/timeDeposit/deposit.vue     | 71 ++++++++-----
 .../list/personal/timeDeposit/openAccount.vue |  8 +-
 .../list/personal/timeDeposit/withdrawal.vue  | 99 +++++++++++++------
 src/store/modules/system.js                   | 19 +++-
 9 files changed, 193 insertions(+), 90 deletions(-)

diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index 84155c0..6ca23ee 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -1004,6 +1004,16 @@ export default {
         id(newVal) {
             console.log('新的id值')
             console.log(newVal)
+        },
+        'passwordForm.password'(newVal) {
+            // passwordForm:{
+            //     password:'',
+            //     passwordAgain: ''
+            // },
+            
+            this.passwordForm.passwordAgain = newVal
+            console.log('???xxxxxxxxxx')
+            console.log(this.passwordForm.passwordAgain)
         }
     },
     created() {
@@ -1417,6 +1427,7 @@ export default {
                         sessionStorage.setItem('nomCurrentWithdrawalCard', JSON.stringify(this.receptionList))
                     }
                 }else if (this.$store.state.system.id == '64,2' && this.popText === '密码器'){
+                    
                     this.nbm = 64
                     if (this.passwordForm.passwordAgain){
                         let accountPassword = '';
diff --git a/src/pages/counter/list/myConfig.js b/src/pages/counter/list/myConfig.js
index 4c7ab33..3cbdba8 100644
--- a/src/pages/counter/list/myConfig.js
+++ b/src/pages/counter/list/myConfig.js
@@ -6,7 +6,7 @@ const myConfig = {
         isPassword: true,
     },
     '117': {
-        nbm: 118,
+        nbm: 117,
         name: 'nomCurrentCancellPassword',
         parentId: '285,287,5,26,57,67',
         isPassword: true
diff --git a/src/pages/manage/list/personal/currentAccount/settle.vue b/src/pages/manage/list/personal/currentAccount/settle.vue
index e96a8a3..53f14b4 100644
--- a/src/pages/manage/list/personal/currentAccount/settle.vue
+++ b/src/pages/manage/list/personal/currentAccount/settle.vue
@@ -13,15 +13,15 @@
                         </div>
                     </el-form-item>
                     <el-form-item label="币种" prop="currency">
-                        <el-select v-model="form.currency" placeholder="请选择" ref="currency">
+                        <el-select v-model="form.currency" disabled placeholder="请选择" ref="currency">
                             <el-option value="CNY人民币">CNY人民币</el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="金额">
-                        <el-input :value="form.money" maxlength="20" @input="val => ismoney(val, form, 'money')"></el-input>
+                    <el-form-item label="余额">
+                        <el-input :value="form.balance" disabled maxlength="20" @input="val => ismoney(val, form, 'balance')"></el-input>
                     </el-form-item>
                     <el-form-item label="总金额">
-                        <el-input v-model="form.totalMoney" maxlength="20" placeholder="显示余额加利息总额"></el-input>
+                        <el-input v-model="form.totalMoney" disabled maxlength="20" placeholder="显示余额加利息总额"></el-input>
                     </el-form-item>
                     <el-form-item label="支取密码" required>
                         <div v-if='!form.drawPassword' class="idCard" @click="popUp2('密码器')">
@@ -34,15 +34,15 @@
                 </el-col>
                 <el-col :span="10" :offset="1">
                     <el-form-item label="客户姓名" prop="userName"  :rules="rules.userName">
-                        <el-input :value="form.userName" maxlength="20" @input="(val) => checkName(val, form, 'userName')" ref="userName"></el-input>
+                        <el-input :value="form.userName" disabled maxlength="20" @input="(val) => checkName(val, form, 'userName')" ref="userName"></el-input>
                     </el-form-item>
                     <el-form-item label="钞汇标识">
-                        <el-select v-model="form.goldLogo" placeholder="请选择">
+                        <el-select v-model="form.goldLogo" disabled placeholder="请选择">
                             <el-option  label="钞户" value="钞户"> </el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="利息">
-                        <el-input v-model="form.interest" maxlength="20"></el-input>
+                        <el-input v-model="form.interest" disabled maxlength="20"></el-input>
                     </el-form-item>
                     <el-form-item label="支取方式" prop="chargeWay">
                         <el-select v-model="form.chargeWay" placeholder="请选择" ref="chargeWay">
@@ -58,7 +58,7 @@
             </el-form>
         </el-row>
         <el-button @click="submitForm" type="primary" class="submitBtn">提交</el-button>
-        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
+        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" :needAuth="needAuth" @submitIt="submitForm2" />
     </div>
     <need-before v-else :moduleName='needBefore' :unNeed="unNeed" />
 </template>
@@ -88,7 +88,7 @@ export default{
               cardNumber: '',
               drawPassword: '',
               currency:'',
-              money:'',
+              balance:'',
               totalMoney:'',
               userName:'',
               goldLogo:'',
@@ -100,7 +100,7 @@ export default{
               cardNumber: '卡号',
               drawPassword: '支取密码',
               currency:'币种',
-              money:'金额',
+              balance:'余额',
               totalMoney:'总金额',
               userName:'客户姓名', // 
               goldLogo:'钞汇标识',
@@ -134,7 +134,7 @@ export default{
                     "subjectId": 9,
                 },
                 107: {
-                    prop: 'money',
+                    prop: 'balance',
                     type: '3',
                     "subjectId": 14,
                 },
@@ -178,13 +178,15 @@ export default{
             if(this.needsModule(moduleName) === '') {
                 if(sessionStorage.getItem('nomCurrentSettleCard')) {
                     this.cardNumberJudge = true
-                    const { currency, userName, goldLogo, chargeWay, interest, voucherNumber } = this.dataFlow
+                    const { currency, userName, goldLogo, chargeWay, interest, voucherNumber, balance, totalMoney } = this.dataFlow
                     this.form.cardNumber = voucherNumber
                     this.form.currency = currency
                     this.form.userName = userName
                     this.form.goldLogo = goldLogo
                     this.form.chargeWay = chargeWay
                     this.form.interest = interest
+                    this.form.balance = balance
+                    this.form.totalMoney = totalMoney
                 }
                 if(sessionStorage.getItem('nomCurrentSettlePassword')) {
                     this.form.drawPassword = sessionStorage.getItem('nomCurrentSettlePassword')
@@ -280,7 +282,10 @@ export default{
             needsModule: 'system/needsModule',
             idCardNumber: 'system/idCardNumber',
             inMyWork: 'system/inMyWork',
-        })	
+        }),
+        needAuth() {
+            return this.form.balance > 50000 || this.totalMoney > 50000
+        }
     },
 }
 </script>
diff --git a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
index 7759777..837d754 100644
--- a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
+++ b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
@@ -53,7 +53,7 @@
             </el-form>
         </el-row>
         <el-button @click="submitForm" type="primary" class="submitBtn">提交</el-button>
-        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
+        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" :needAuth="needAuth" />
     </div>
     <need-before v-else :moduleName='needBefore' :unNeed="unNeed" />
 </template>
@@ -104,10 +104,10 @@ export default{
             rules: {
                 userName: vercustomer ,
                 payeeName: [
-                    {
-                        pattern: namePattern,
-                        message: '收款人名称格式有误'
-                    },
+                    // {
+                    //     pattern: namePattern,
+                    //     message: '收款人名称格式有误'
+                    // },
                     { 
                         required: true, 
                         message: '请输入收款人名称',
@@ -128,6 +128,13 @@ export default{
                         trigger: 'blur'
                     }
                 ],
+                shroffAccount: [
+                    { 
+                        required: true, 
+                        message: '请输入收款卡号',
+                        trigger: 'blur'
+                    }
+                ]
             },
             myTable2: {
                 94: {
@@ -290,7 +297,10 @@ export default{
         needsModule: 'system/needsModule',
         idCardNumber: 'system/idCardNumber',
         inMyWork: 'system/inMyWork',
-    })	
+    }),
+    needAuth() {
+        return this.form.money > 50000
+    }	
   },
 }
 </script>
diff --git a/src/pages/manage/list/personal/currentAccount/withdrawal.vue b/src/pages/manage/list/personal/currentAccount/withdrawal.vue
index e8aa962..389a85d 100644
--- a/src/pages/manage/list/personal/currentAccount/withdrawal.vue
+++ b/src/pages/manage/list/personal/currentAccount/withdrawal.vue
@@ -56,7 +56,7 @@
             </el-form>
         </el-row>
         <el-button @click="submitForm" type="primary" class="submitBtn">提交</el-button>
-        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
+        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" :needAuth="needAuth" />
     </div>
 
     <need-before v-else :moduleName='needBefore' :unNeed="unNeed" />
@@ -83,6 +83,8 @@ 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
@@ -94,9 +96,7 @@ export default{
                     this.form.cardNumber = voucherNumber
                 }
 
-                if(sessionStorage.getItem('nomCurrentWithdrawalPassword')) {
-                    this.form.drawPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword')
-                }
+                
 
                 this.getFormData()
             }else {
@@ -200,7 +200,7 @@ 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') {
+                      else if (list[i].answerId == '91' && !sessionStorage.getItem('nomCurrentWithdrawalPassword')) {
                           this.form.drawPassword = list[i].emptyTwo
                           sessionStorage.setItem('nomCurrentWithdrawalPassword', list[i].emptyTwo)
                       }
@@ -208,6 +208,11 @@ export default{
                       else if (list[i].answerId == '93') {this.form.remark = list[i].emptyTwo} //摘要
                   }
               }
+              if(sessionStorage.getItem('nomCurrentWithdrawalPassword')) {
+                    this.form.drawPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword')
+                }
+                console.log('issue')
+                console.log(sessionStorage.getItem('nomCurrentWithdrawalPassword'))
           }).catch((error)=>{
           })
       },
@@ -283,7 +288,10 @@ export default{
         needsModule: 'system/needsModule',
         idCardNumber: 'system/idCardNumber',
         inMyWork: 'system/inMyWork'
-    })	
+    }),
+    needAuth() {
+        return this.form.money > 50000
+    }
   },
 }
 </script>
diff --git a/src/pages/manage/list/personal/timeDeposit/deposit.vue b/src/pages/manage/list/personal/timeDeposit/deposit.vue
index 4bd4b1b..bafcaea 100644
--- a/src/pages/manage/list/personal/timeDeposit/deposit.vue
+++ b/src/pages/manage/list/personal/timeDeposit/deposit.vue
@@ -13,15 +13,15 @@
                         </div>
                     </el-form-item>
                     <el-form-item label="币种" prop="currency">
-                        <el-select v-model="form.currency" placeholder="请选择" ref="currency">
+                        <el-select v-model="form.currency" disabled placeholder="请选择" ref="currency">
                             <el-option value="CNY人民币">CNY人民币</el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="金额" prop="money">
-                        <el-input :value="form.money" @input="val => ismoney(val, form, 'money')" ref="money"></el-input>
+                        <el-input :value="form.money" maxlength='15' @input="val => ismoney(val, form, 'money')" ref="money"></el-input>
                     </el-form-item>
                     <el-form-item label="利率（%）" prop="interestRate">
-                        <el-input v-model="form.interestRate" ref="interestRate"></el-input>
+                        <el-input v-model="form.interestRate" disabled ref="interestRate"></el-input>
                     </el-form-item>
                     <el-form-item label="支取方式" prop="withdrawingWay">
                         <el-select v-model="form.withdrawingWay" placeholder="请选择" ref="withdrawingWay">
@@ -36,10 +36,10 @@
                 </el-col>
                 <el-col :span="10" :offset="1">
                     <el-form-item label="客户姓名" required prop="customerName">
-                        <el-input ref="customerName" :value="form.customerName" @input="(val) => checkName(val, form, 'customerName')"></el-input>
+                        <el-input ref="customerName" disabled :value="form.customerName" @input="(val) => checkName(val, form, 'customerName')"></el-input>
                     </el-form-item>
                     <el-form-item label="钞汇标识" prop="currencyMark">
-                        <el-select v-model="form.currencyMark" placeholder="请选择" ref="currencyMark">
+                        <el-select v-model="form.currencyMark" disabled placeholder="请选择" ref="currencyMark">
                             <el-option  label="钞户" value="钞户"> </el-option>
                         </el-select>
                     </el-form-item>
@@ -79,7 +79,7 @@
             </el-form>
         </el-row>
         <el-button @click="submitForm" type="primary" class="submitBtn">提交</el-button>
-        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
+        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" :needAuth="false" />
     </div>
     <need-before v-else :moduleName='needBefore' :unNeed="unNeed" />
 </template>
@@ -111,7 +111,7 @@ export default{
                 customerName: '', // 客户姓名
                 currency: '', // 币种
                 currencyMark: '', // 钞汇标识
-                depositTerm: '3个月', // 存期
+                depositTerm: '', // 存期
                 extendPeriod: '', // 续存
                 certificateDeposit: '现金', // 存款类别
                 valueDate: '', // 起息日
@@ -177,26 +177,26 @@ export default{
                         trigger: 'blur'
                     }
                 ],
-                extendPeriod: [
-                    { 
-                        required: true, 
-                        message: '请选择续存',
-                        trigger: 'blur'
-                    }
-                ],
-                interestRate: [{ 
-                    required: true, 
-                    message: '请输入利率',
-                    trigger: 'blur'
-                },
-                {
-                    pattern: ratePattern,
-                    message: '利率格式有误'
-                }],
-                valueDate: { 
-                    required: true, 
-                    message: '请输入起息日' 
-                }
+                // extendPeriod: [
+                //     { 
+                //         required: true, 
+                //         message: '请选择续存',
+                //         trigger: 'blur'
+                //     }
+                // ],
+                // interestRate: [{ 
+                //     required: true, 
+                //     message: '请选择存期',
+                //     trigger: 'blur'
+                // },
+                // {
+                //     pattern: ratePattern,
+                //     message: '利率格式有误'
+                // }],
+                // valueDate: { 
+                //     required: true, 
+                //     message: '请输入起息日' 
+                // }
             },
             myTable: {
                 135: {
@@ -383,6 +383,23 @@ export default{
             inMyWork: 'system/inMyWork',
         })
     },
+    watch: {
+        'form.depositTerm'(newVal) {
+            if(newVal === '3个月') {
+                this.form.interestRate = 1.35
+            }else if(newVal === '6个月') {
+                this.form.interestRate = 1.55
+            }else if(newVal === '1年') {
+                this.form.interestRate = 1.75
+            }else if(newVal === '2年') {
+                this.form.interestRate = 2.25
+            }else if(newVal === '3年') {
+                this.form.interestRate = 2.75
+            }else if(newVal === '5年') {
+                this.form.interestRate = 2.75
+            }
+        }
+    }
 }
 </script>
 <style lang='scss' scoped>
diff --git a/src/pages/manage/list/personal/timeDeposit/openAccount.vue b/src/pages/manage/list/personal/timeDeposit/openAccount.vue
index e7762ee..46df350 100644
--- a/src/pages/manage/list/personal/timeDeposit/openAccount.vue
+++ b/src/pages/manage/list/personal/timeDeposit/openAccount.vue
@@ -13,7 +13,7 @@
                         <el-input ref="clientNumber" disabled maxlength="20" :value="form.clientNumber" @input="(val) => checkHanzi(val, form, 'clientNumber')"></el-input>
                     </el-form-item>
                     <el-form-item label="币种" prop="currency">
-                        <el-select v-model="form.currency" placeholder="请选择" ref="currency">
+                        <el-select v-model="form.currency" disabled placeholder="请选择" ref="currency">
                             <el-option value="CNY人民币">CNY人民币</el-option>
                         </el-select>
                     </el-form-item>
@@ -38,10 +38,10 @@
                         </div>
                     </el-form-item>
                     <el-form-item label="客户姓名"  prop="customerName">
-                        <el-input ref="customerName" maxlength="20" :value="form.customerName" @input="(val) => checkName(val, form, 'customerName')"></el-input>
+                        <el-input ref="customerName" maxlength="20" disabled :value="form.customerName" @input="(val) => checkName(val, form, 'customerName')"></el-input>
                     </el-form-item>
                     <el-form-item label="钞汇标识" prop="currencyMark">
-                        <el-select v-model="form.currencyMark" placeholder="请选择" ref="currencyMark">
+                        <el-select v-model="form.currencyMark" disabled placeholder="请选择" ref="currencyMark">
                             <el-option  label="钞户" value="钞户"> </el-option>
                         </el-select>
                     </el-form-item>
@@ -101,7 +101,7 @@ export default{
                 idNumber: '', // 身份证 
                 customerName: '', // 客户姓名
                 currency: '', // 币种
-                currencyMark: '钞户', // 钞汇标识
+                currencyMark: '', // 钞汇标识
                 voucherType: '存单', // 凭证类型
                 voucherNumber: '', // 凭证号码
                 drawPassword: '', // 支付密码
diff --git a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
index a5d9d47..7d5b86d 100644
--- a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
+++ b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
@@ -13,51 +13,52 @@
                         </div>
                     </el-form-item>
                     <el-form-item label="币种" prop="currencyType">
-                        <el-select v-model="form.currencyType" placeholder="请选择" ref="currencyType">
+                        <el-select v-model="form.currencyType" disabled placeholder="请选择" ref="currencyType">
                             <el-option value="CNY人民币">CNY人民币</el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="定存编号" prop="depositNumber">
-                        <el-input ref="depositNumber" :value="form.depositNumber" @input="(val) => checkHanzi(val, form, 'depositNumber')"></el-input>
+                        <el-input ref="depositNumber" disabled :value="form.depositNumber" @input="(val) => checkHanzi(val, form, 'depositNumber')"></el-input>
                     </el-form-item>
-                    <el-form-item label="支取金额" prop="withdrawAmount">
-                        <el-input  :value="form.withdrawAmount" @input="val => ismoney(val, form, 'withdrawAmount')" ref="withdrawAmount"></el-input>
-                    </el-form-item>
-                    <el-form-item label="利息" prop="interest">
-                        <el-input :value="form.interest" @input="(val) => rateListen(val, form, 'interest')" ref="interest"></el-input>
+                    <el-form-item label="支取方式" prop="withdrawWay">
+                        <el-radio-group v-model="form.withdrawWay"  ref="withdrawWay">
+                            <el-radio label="部分支取">部分支取</el-radio>
+                            <el-radio label="全部支取并销户">全部支取并销户</el-radio>
+                        </el-radio-group>
                     </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="withdrawType">
+                        <el-select v-model="form.withdrawType" disabled placeholder="请选择" ref="withdrawType">
+                            <el-option  label="现金" value="现金"> </el-option>
+                        </el-select>
                     </el-form-item>
                 </el-col>
                 <el-col :span="10" :offset="1">
                     <el-form-item label="客户姓名" prop="customerName">
-                        <el-input :value="form.customerName" @input="(val) => checkName(val, form, 'customerName')" ref="customerName"></el-input>
+                        <el-input :value="form.customerName" disabled @input="(val) => checkName(val, form, 'customerName')" ref="customerName"></el-input>
                     </el-form-item>
                     <el-form-item label="钞汇标识" prop="currencyMark">
-                        <el-select v-model="form.currencyMark" placeholder="请选择" ref="currencyMark">
+                        <el-select v-model="form.currencyMark" disabled placeholder="请选择" ref="currencyMark">
                             <el-option  label="钞户" value="钞户"> </el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="本金" prop="capital">
-                        <el-input  :value="form.capital" @input="val => ismoney(val, form, 'capital')" ref="capital" ></el-input>
+                        <el-input  :value="form.capital" disabled @input="val => ismoney(val, form, 'capital')" ref="capital" ></el-input>
                     </el-form-item>
-                    <el-form-item label="支取类别" prop="withdrawType">
-                        <el-select v-model="form.withdrawType" placeholder="请选择" ref="withdrawType">
-                            <el-option  label="现金" value="现金"> </el-option>
-                        </el-select>
+                    <el-form-item label="支取金额" prop="withdrawAmount">
+                        <el-input  :value="form.withdrawAmount" :disabled="capitalDisabled" @input="val => ismoney(val, form, 'withdrawAmount')" ref="withdrawAmount"></el-input>
                     </el-form-item>
-                    <el-form-item label="支取方式" prop="withdrawWay">
-                        <el-radio-group v-model="form.withdrawWay"  ref="withdrawWay">
-                            <el-radio label="部分支取">部分支取</el-radio>
-                            <el-radio label="全部支取">全部支取</el-radio>
-                        </el-radio-group>
+                    <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>
+                    
                 </el-col>
                 
             </el-form>
@@ -85,9 +86,16 @@ export default{
     created() {
         if(this.inMyWork(moduleName)) {
             if(this.needsModule(moduleName) === '') {
+                const { withdrawWay } = this.dataFlow
+                if(withdrawWay === '全部支取并销户') {
+                    this.form.interest = 5.75
+                    this.rules.withdrawAmount[0].required = false
+                }else {
+                    this.form.interest = 0.00
+                }
                 if(sessionStorage.getItem('nomtimeDepositWithdrawal1')) {
                     this.cardNumberJudge = true
-                    const { userName, currency, goldLogo, interest, depositNumber, capital, withdrawType, withdrawWay, voucherNumber } = this.dataFlow
+                    const { userName, currency, goldLogo, interest, depositNumber, capital, withdrawType, voucherNumber } = this.dataFlow
                     console.log('voucherNumber')
                     console.log(voucherNumber)
                     this.form.voucherNumber = voucherNumber
@@ -98,11 +106,12 @@ export default{
                     this.form.depositNumber = depositNumber
                     this.form.capital = capital
                     this.form.withdrawType = withdrawType
-                    this.form.withdrawWay = withdrawWay
+                    // this.form.withdrawWay = withdrawWay
                 }
 
                 if(sessionStorage.getItem('nomtimeDepositWithdrawalPassword')) {
                     this.form.drawPassword = sessionStorage.getItem('nomtimeDepositWithdrawalPassword')
+                    console.log(this.form.drawPassword)
                 }
 
                 this.getFormData()
@@ -124,6 +133,7 @@ export default{
             unNeed: false,
             isNeedBefore: '',
             needBefore: '',
+            capitalDisabled: false, // 支取金额是否可以手动输入
             cardNumberJudge: false,
             form:{
                 // 必填项
@@ -178,7 +188,21 @@ export default{
                         pattern: ratePattern,
                         message: '利息格式有误'
                     }
-                ]
+                ],
+                withdrawAmount: [
+                    { 
+                        required: true, 
+                        message: '请输入支取金额',
+                        trigger: 'blur'
+                    },
+                ],
+                withdrawWay: [
+                    { 
+                        required: true, 
+                        message: '请选择支取方式',
+                        trigger: 'blur'
+                    },
+                ],
             },
             myTable: {
                 // voucherNumber
@@ -319,6 +343,23 @@ export default{
             inMyWork: 'system/inMyWork',
         })
     },
+    watch: {
+        'form.withdrawWay'(newVal) {
+            // 这里的数据流withdrawWay纯粹用来判断，因为业务四和五就这个不一样
+            const { withdrawWay } = this.dataFlow
+            if(withdrawWay === '全部支取并销户' && newVal === '全部支取并销户') {
+                this.form.withdrawAmount = Number(this.form.interest) + Number(this.form.capital)
+                this.capitalDisabled = true
+            }else if(withdrawWay === '全部支取并销户' && newVal !== '全部支取并销户')  {
+                this.form.withdrawAmount = ''
+                this.capitalDisabled = false
+                this.$nextTick(() => {
+                    this.$refs.withdrawAmount.focus()
+                })
+                
+            }
+        }
+    }
 }
 </script>
 <style lang='scss' scoped>
diff --git a/src/store/modules/system.js b/src/store/modules/system.js
index 5742519..8f9c676 100644
--- a/src/store/modules/system.js
+++ b/src/store/modules/system.js
@@ -783,7 +783,9 @@ export default {
                     goldLogo:'钞户',
                     serviceCharge:'0.00',
                     chargeWay:'密码',
-                    interest: '0.1'
+                    interest: '0.1',
+                    balance: 666,
+                    totalMoney: 9999999999,
                 }
             },
             '项目三': {
@@ -862,8 +864,8 @@ export default {
                     depositNumber: '0912',
                     capital, // 不知道是多少
                     withdrawType: '现金', // 支取类别
-                    withdrawWay: '密码', // 支取方式
-
+                    withdrawWay: '部分支取', // 支取方式
+                    
                 }
             },
             '项目五': {
@@ -903,7 +905,7 @@ export default {
                     depositNumber: '0912',
                     capital, // 不知道是多少
                     withdrawType: '现金', // 支取类别
-                    withdrawWay: '密码', // 支取方式
+                    withdrawWay: '全部支取并销户', // 支取方式
 
                 }
             },
@@ -1617,6 +1619,15 @@ export default {
         // setHeadId(state, id) {
         //     state.businessSelect[state.businessKey].id = id + ','
         // },
+        // randomPeopleNumber() {
+        //     const $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
+        //     const maxPos = $chars.length;
+        //     let str = '';
+        //     for (let i = 0; i < len; i++) {
+        //         str += $chars.charAt(Math.floor(Math.random() * maxPos));
+        //     }
+        //     return str;
+        // },
         setPopId(state, id) {
             state.id = id
         },