From 31c1600d4d8188dd0501ffe2f5e6d14325491d2a Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Tue, 28 Dec 2021 17:04:22 +0800
Subject: [PATCH] update

---
 .../personal/callDeposits/accountClosed.vue   | 114 ++++++++++++------
 1 file changed, 74 insertions(+), 40 deletions(-)

diff --git a/src/pages/manage/list/personal/callDeposits/accountClosed.vue b/src/pages/manage/list/personal/callDeposits/accountClosed.vue
index 736faae..12359c2 100644
--- a/src/pages/manage/list/personal/callDeposits/accountClosed.vue
+++ b/src/pages/manage/list/personal/callDeposits/accountClosed.vue
@@ -4,43 +4,66 @@
         <el-row :gutter="20" style="margin: 0">
             <el-form ref="form" :model="form" label-width="120px" :rules="rules">
                 <el-col :span="10" :offset="1">
-                    <el-form-item label="证件类型" prop="certificateType">
-                        <el-select v-model="form.certificateType" placeholder="请选择" ref="certificateType">
-                            <el-option label="身份证" value="身份证"> </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="凭证号码" prop="voucherNumber">
+                    <el-form-item label="凭证号码" required="">
                         <div class="idCard" @click="popUp('银行卡扫描器')">
-                            <p>请刷银行卡</p>
+                            <p>请填凭证号</p>
                         </div>
                         <!-- <el-select v-model="form.voucherNumber" placeholder="请选择" ref="voucherNumber">
                             <el-option  label="存单" value="存单"> </el-option>
                         </el-select> -->
                     </el-form-item>
+                    <el-form-item label="客户号" prop="customerNumber">
+                        <el-input v-model="form.customerNumber"></el-input>
+                    </el-form-item>
                     <el-form-item label="币种" prop="currency">
                         <el-select v-model="form.currency" placeholder="请选择" ref="currency">
                             <el-option  label="CYN人民币" value="CYN人民币"> </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="定存编号" prop="depositNumber">
-                        <el-input v-model="form.depositNumber"></el-input>
+                    <el-form-item label="通知类型" prop="noticeType">
+                        <el-select v-model="form.noticeType" placeholder="请选择" ref="noticeType">
+                            <el-option label="1天" value="1天"> </el-option>
+                        </el-select>
                     </el-form-item>
-                    <el-form-item label="利率（%）"  prop="interestRate">
-                        <el-input :value="form.interestRate" @input="(val) => checkHanzi(val, form, 'interestRate')" ref="interestRate"></el-input>
+                    <el-form-item label="起息日期" prop="breathDate">
+                        <el-input v-model="breathDate"></el-input>
                     </el-form-item>
                     <el-form-item label="利息" prop="interest">
                         <el-input :value="form.interest" @input="val => ismoney(val, form, 'interest')" ref="interest"></el-input>
                     </el-form-item>
-                    <el-form-item label="起息日期" prop="breathDate">
-                        <el-input v-model="breathDate"></el-input>
+                    <el-form-item label="支取类别" prop="payType">
+                        <el-select v-model="form.payType" placeholder="请选择" ref="payType">
+                            <el-option label="现金" value="现金"> </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="证件类型" prop="certificateType">
+                        <el-select v-model="form.certificateType" placeholder="请选择" ref="certificateType">
+                            <el-option label="身份证" value="身份证"> </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="支取密码" required>
+                        <div class="idCard" @click="popUp3('密码器')">
+                            <p>请输入密码</p>
+                        </div>
                     </el-form-item>
+
+
+                    
+                    
+                    
+                    
+                    <!-- <el-form-item label="利率（%）"  prop="interestRate">
+                        <el-input :value="form.interestRate" @input="(val) => checkHanzi(val, form, 'interestRate')" ref="interestRate"></el-input>
+                    </el-form-item> -->
+                    
+                    
                     
                 </el-col>
                 <el-col :span="10" :offset="1">
-                    <el-form-item label="身份证" required>
-                        <div class="idCard" @click="popUp2('身份证扫描器')">
-                            <p>请刷身份证</p>
-                        </div>
+                    <el-form-item label="凭证类型" prop="depositDate">
+                        <el-select v-model="form.voucherType" placeholder="请选择" ref="voucherType">
+                            <el-option  label="存单" value="存单"> </el-option>
+                        </el-select>
                     </el-form-item>
                     <el-form-item label="客户姓名" prop="clientName">
                         <el-input :value="form.clientName" @input="(val) => checkName(val, form, 'clientName')" ref="clientName"></el-input>
@@ -50,22 +73,29 @@
                             <el-option  label="钞户" value="钞户"> </el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="定存编号" prop="depositNumber">
+                        <el-input v-model="form.depositNumber"></el-input>
+                    </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-form-item>
-                    <el-form-item label="存期" prop="depositDate">
+                    <el-form-item label="总金额" prop="totalMoney">
+                        <el-input :value="form.totalMoney" @input="val => ismoney(val, form, 'totalMoney')" ref="totalMoney" ></el-input>
+                    </el-form-item>
+                    <el-form-item label="支取金额" prop="payMoney">
+                        <el-input :value="form.payMoney" @input="val => ismoney(val, form, 'payMoney')" ref="payMoney" ></el-input>
+                    </el-form-item>
+                    <!-- <el-form-item label="存期" prop="depositDate">
                         <el-select v-model="form.depositDate" placeholder="请选择" ref="depositDate">
                             <el-option  label="1年" value="1年"> </el-option>
                             <el-option  label="3年" value="3年"> </el-option>
                             <el-option  label="5年" value="5年"> </el-option>
                         </el-select>
-                    </el-form-item>
-                    <el-form-item label="总金额" prop="totalMoney">
-                        <el-input :value="form.totalMoney" @input="val => ismoney(val, form, 'totalMoney')" ref="totalMoney" ></el-input>
-                    </el-form-item>
-                    <el-form-item label="支取密码" required>
-                        <div class="idCard" @click="popUp3('密码器')">
-                            <p>请填凭证号码</p>
+                    </el-form-item> -->
+                    
+                    <el-form-item label="身份证" required>
+                        <div class="idCard" @click="popUp2('身份证扫描器')">
+                            <p>请刷身份证</p>
                         </div>
                     </el-form-item>
                     <!-- <el-form-item label="续存标识" required>
@@ -106,23 +136,27 @@ export default{
                 totalMoney: '', // 总金额
                 certificateType: '', //证件类型
                 breathDate: '', // 起息日期
+                customerNumber: '', // 客户号(未对标)
+                noticeType: '', // 通知类型(未对标)
+                payType: '', // 支取类别(未对标)
+                payMoney: '', // 支取金额(未对标)
+                voucherType: '', // 凭证类型(未对标)
             },
             rules: {
-                clientName: vercustomer,
-                currency: [
-                    { 
-                        required: true, 
-                        message: '请选择币种',
-                        trigger: 'blur'
-                    }
-                ],
-                certificateType: [
-                    { 
-                        required: true, 
-                        message: '请选择证件类型',
-                        trigger: 'blur'
-                    }
-                ],
+                clientName: {
+                    pattern: /(^[A-Z][a-z]*(\s[A-Z][a-z]*)*$)|(^[\u4e00-\u9fa5]{2,4}$)/,
+                    message: '该名字格式有误'
+                },
+                voucherNumber: {
+                    required: true, 
+                    message: '请填写凭证号码',
+                    trigger: 'blur'
+                },
+                payMoney: {
+                    required: true, 
+                    message: '请填写支取金额',
+                    trigger: 'blur'
+                },
                 interestRate: [
                     {
                         pattern: ratePattern,