From 9deace50e9a1c02702d998a41035b482bba82954 Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Fri, 21 Jan 2022 16:19:55 +0800
Subject: [PATCH] update

---
 src/components/dialog/index.vue               |  24 +-
 src/components/dialog2/index.vue              | 169 ++++++++++
 .../ImportantCash/controlCash/cashOut.vue     |  43 ++-
 .../ImportantCash/controlCash/cashPaid.vue    |   8 +-
 .../controlCash/cashRecipients.vue            |   8 +-
 .../list/ImportantCash/controlCash/index.vue  |  17 +-
 .../ImportantCash/controlCash2/cashOut.vue    | 307 ++++++++++--------
 .../ImportantCash/controlCash2/cashPaid.vue   | 158 +++++----
 .../controlCash2/cashRecipients.vue           | 152 +++++----
 .../controlCash2/cashTransferInto.vue         | 277 +++++++++-------
 .../list/ImportantCash/controlCash2/index.vue |  16 +-
 .../manage/list/client/consumerClient.vue     |  51 +--
 .../personal/callDeposits/accountClosed.vue   |  55 ++--
 .../list/personal/currentAccount/deposit.vue  |   8 +-
 .../personal/currentAccount/openAccount.vue   |  36 +-
 .../currentAccount/transferAccounts.vue       |   6 +-
 .../personal/currentAccount/withdrawal.vue    |  22 +-
 src/store/modules/system.js                   |  20 +-
 src/utils/utilFunction.js                     |  60 +++-
 19 files changed, 927 insertions(+), 510 deletions(-)
 create mode 100644 src/components/dialog2/index.vue

diff --git a/src/components/dialog/index.vue b/src/components/dialog/index.vue
index 7ba3f9d..2a4095b 100644
--- a/src/components/dialog/index.vue
+++ b/src/components/dialog/index.vue
@@ -14,6 +14,9 @@
         <div class="popBody" v-if="flow === 1">
             <h2>本业务需要授权</h2>
         </div>
+        <div class="popBody" v-else-if="flow === 4">
+            <h2>提交后将不可更改，您确认提交吗？</h2>
+        </div>
         <div class="popBody" v-else-if="flow === 2">
             <el-form ref="form2" :model="disForm" label-width="80px">
                     <el-form-item label="授权柜员">
@@ -40,7 +43,7 @@
                 </el-form>
             </el-row>
         </div>
-        <div class="popBtns" v-if="flow === 1 || flow === 2">
+        <div class="popBtns" v-if="flow === 1 || flow === 2 || flow === 4">
             <el-button class="close btn" @click="cancelIt">取 消</el-button>
             <el-button class="sure btn" type="primary" @click="sureIt">确 定</el-button>
         </div>
@@ -72,7 +75,7 @@ export default {
     },
     created() {
         if(!this.needAuth) {
-            this.flow = 3
+            this.flow = 4
         }
         let num = 0;
         for(const key in this.showForm) {
@@ -86,7 +89,20 @@ export default {
             }
             num++;
         }
-        this.leftObj['流水号'] = '2333333333333'
+        // 客户号：A100000001一个字母跟9位数字随机生成不可重复、证件类型：身份证
+        // 、证件号码、客户名称、联系电话、通讯地址、流水号：9位数字随机生成不可重
+        // 复、经办柜员：6位数字固定使用、经办机构：7位数字固定使用、会计日期：默认
+        // 示当前虚拟日期）点击确定按钮收起成功提示弹窗；
+        const tmpFunc2 = () => {
+            const $chars2 = '1234567890'
+            const maxPos = $chars2.length;
+            let str = '';
+            for (let i = 0; i < 9; i++) {
+                str += $chars2.charAt(Math.floor(Math.random() * maxPos));
+            }
+            return str;
+        }
+        this.leftObj['流水号'] = tmpFunc2()
         this.leftObj['经办机构'] = '国税支行营业部'
         this.rightObj['经办柜员'] = '002110'
         const tmpFunc = () => {
@@ -122,6 +138,8 @@ export default {
                 this.flow = 2
             }else if(this.flow === 2) {
                 this.flow = 3
+            }else if(this.flow === 4) {
+                this.flow = 3
             }else {
                 // 调用父函数
                 // 然后关掉
diff --git a/src/components/dialog2/index.vue b/src/components/dialog2/index.vue
new file mode 100644
index 0000000..4f1d969
--- /dev/null
+++ b/src/components/dialog2/index.vue
@@ -0,0 +1,169 @@
+<template>
+    <el-dialog
+        style="margin-top:0vh"
+        :visible="visible"
+        width="55%"
+        append-to-body
+        :close-on-click-modal="true" 
+        :show-close="false" 
+        custom-class="data-dia">
+        <div slot="title" 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" v-if="flow === 1">
+            <h2>本业务需要授权</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" 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">
+            <el-button class="close btn" @click="cancelIt">取 消</el-button>
+            <el-button class="sure btn" type="primary" @click="sureIt">确 定</el-button>
+        </div>
+        <div class="myPopBtns" v-else>
+            <el-button class="sure btn" type="primary" @click="sureIt">确 定</el-button>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+export default {
+    props: {
+        visible: {
+            type: Boolean,
+            default: false
+        },
+        showForm: {
+            type: Object,
+            default: () => ({})
+        },
+        formName: {
+            type: Object,
+            default: () => ({})
+        },
+        needAuth: {
+            type: Boolean,
+            default: true
+        }
+    },
+    created() {
+        if(!this.needAuth) {
+            this.flow = 3
+        }
+        let num = 0;
+        for(const key in this.showForm) {
+            if(!this.showForm[key]) {
+                continue;
+            }
+            if(num%2 === 0) {
+                this.leftObj[this.formName[key]] = this.showForm[key]
+            }else {
+                this.rightObj[this.formName[key]] = this.showForm[key]
+            }
+            num++;
+        }
+        this.leftObj['上缴柜员号'] = '002119'
+        this.leftObj['接收柜员号'] = '002110'
+        
+        this.rightObj['机构号'] = '1234100'
+        const tmpFunc = () => {
+            const date = new Date()
+            var y = date.getFullYear();  
+            var m = date.getMonth() + 1;  
+            m = m < 10 ? '0' + m : m;  
+            var d = date.getDate();  
+            d = d < 10 ? ('0' + d) : d;  
+            return y + '-' + m + '-' + d; 
+        }
+        this.rightObj['调入日期'] = tmpFunc()
+        // 流水号（研发自定义号码生成规则）、经办柜员（002110）、经办机构：国税支行营业部、会计时间：展示操作当日日期
+    },
+    data() {
+        return {
+            flow: 1,
+            disForm:{
+                name:'002009',
+                pass:'123456'
+            },
+            leftObj: {},
+            rightObj: {}
+        }
+        
+    },
+    methods: {
+        cancel() {
+            this.visible = false;
+        },
+        sureIt() {
+            if(this.flow === 1) {
+                this.flow = 2
+            }else if(this.flow === 2) {
+                this.flow = 3
+            }else {
+                // 调用父函数
+                // 然后关掉
+                this.$emit('submitIt')
+                this.cancelIt()
+            }
+        },
+        cancelIt() {
+            this.$emit('update:visible', false) // 那边写 :visible.sync="visible"
+        }
+    },
+    computed: {
+        showItem() {
+            return (val, key) => {
+                return key + ': ' + val
+            }
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+    /deep/ .el-row {
+        width: 100%;
+    }
+    /deep/.popbody {
+        width: 100vw!important;
+    }
+    .myPopBtns {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        & > .btn {
+            width: 180px;
+        border-radius: 10px;
+        font-size: 18px;
+        }
+        
+    }
+
+    // /deep/.el-dialog {
+    //     min-height: 50vh;
+    // }
+</style>
\ No newline at end of file
diff --git a/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue b/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue
index 97a7bf0..992a0ac 100644
--- a/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue
+++ b/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue
@@ -1,27 +1,22 @@
 // 存款
 <template>
     <div class="body" v-if="!isNeedBefore">
-        <el-form ref="form" :model="form" label-width="120px">
+        <el-form ref="form" :model="form" label-width="120px" :rules="rules">
             <el-row :gutter="20">
-                <el-col :span="7">
+                <el-col :span="10">
                     <el-form-item label="币种">
                         <el-select v-model="form.identification" placeholder="请选择">
                             <el-option  label="CNY人民币" value="CNY人民币"> </el-option>
                         </el-select>
                     </el-form-item>
                 </el-col>
-                <el-col :span="7">
+                <el-col :span="10">
                     <el-form-item label="状态">
                         <el-select v-model="form.state" placeholder="请选择">
                             <el-option  label="正常" value="正常"> </el-option>
                         </el-select>
                     </el-form-item>
                 </el-col>
-                <el-col :span="7">
-                    <el-form-item label="总金额">
-                        <el-input :value="allSum" placeholder="等待点数量" />
-                    </el-form-item>
-                </el-col>
             </el-row>
             <el-row :gutter="20">
                 <el-col :span="12">
@@ -117,6 +112,18 @@
                     </el-table>
                 </el-col>
             </el-row>
+            <el-row :gutter="20">
+                <el-col :span="10">
+                    <el-form-item label="总金额">
+                        <el-input :value="allSum" placeholder="等待点数量" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="10">
+                    <el-form-item label="接收柜员" prop="receiveCounter">
+                        <el-input :value="form.receiveCounter" ref='receiveCounter' maxlength="20" @input="(val) => checkName(val, form, 'receiveCounter')"></el-input>
+                    </el-form-item>
+                </el-col>
+            </el-row>
             <el-button @click="submitClick" type="primary" class="submitBtn">提交</el-button>
         </el-form>
         <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
@@ -126,6 +133,7 @@
 
 <script>
 import { tableRowClassName, headerCellStyle, cellStyle } from '@/assets/js/myConfig'
+import { myValidate, checkHanzi, checkName, ismoney, autoPlay, autoPlay2 } from '@/utils/utilFunction.js'
 
 const moduleName = 'controlCash/cashOut'
 import { mapMutations, mapGetters } from 'vuex'
@@ -150,11 +158,20 @@ export default {
                 identification: 'CNY人民币',
                 state: '正常',
                 moneyTotal: 0,
+                receiveCounter: '',
             },
             formName:{
                 identification: '币种',
                 state: '状态',
                 moneyTotal: '总金额',
+                receiveCounter: '接收柜员',
+            },
+            rules: {
+                receiveCounter: {
+                    required: true, 
+                    message: '请填写接收柜员',
+                    trigger: 'blur'
+                },
             },
             tableData: [
                 {
@@ -261,19 +278,19 @@ export default {
             row.moneyNumber = Number(val.replace(/\D+/, ''))
         },
         submitClick() {
-            this.visible = true
+            this.$refs.form.validate(myValidate(() => {
+                this.visible = true
+            }, this.$refs));
         },
         submitForm2() {},
-        tableRowClassName: tableRowClassName
+        tableRowClassName: tableRowClassName,
+        checkName
     }
 };
 </script>
 
 <style lang="scss" scoped>
 @import '@/assets/css/tablebg.scss';
-    .body {
-        overflow: auto;
-    }
     .wrap{
         width: 100%;
         // padding: 24px 0 24px 24px;
diff --git a/src/pages/manage/list/ImportantCash/controlCash/cashPaid.vue b/src/pages/manage/list/ImportantCash/controlCash/cashPaid.vue
index 2c04543..aa00ebf 100644
--- a/src/pages/manage/list/ImportantCash/controlCash/cashPaid.vue
+++ b/src/pages/manage/list/ImportantCash/controlCash/cashPaid.vue
@@ -13,7 +13,7 @@
                 align="center"
                 >
                 <template slot-scope="scope">
-                    {{ scope.row.issueDate | dateRule }}
+                    {{ getNowDate() }}
                 </template>
             </el-table-column>
             <el-table-column
@@ -67,6 +67,7 @@
 
 <script>
 import { tableRowClassName, headerCellStyle } from '@/assets/js/myConfig'
+import { getNowDate } from '@/utils/utilFunction'
 
 const moduleName = 'controlCash/cashPaid'
 import { mapMutations, mapGetters } from 'vuex'
@@ -96,7 +97,7 @@ export default {
             },
             tableData: [
                 {
-                    issueDate: new Date,
+                    // issueDate: new Date,
                     organizationNumber: '1234100',
                     calloutNumber: '002118',
                     foldNumber: '002110',
@@ -148,7 +149,8 @@ export default {
         },
         submitClick() {
             this.visible = true
-        }
+        },
+        getNowDate
     },
     computed: {
         ...mapGetters({
diff --git a/src/pages/manage/list/ImportantCash/controlCash/cashRecipients.vue b/src/pages/manage/list/ImportantCash/controlCash/cashRecipients.vue
index f47e56e..6910d9e 100644
--- a/src/pages/manage/list/ImportantCash/controlCash/cashRecipients.vue
+++ b/src/pages/manage/list/ImportantCash/controlCash/cashRecipients.vue
@@ -12,7 +12,7 @@
                 align="center"
                 >
                 <template slot-scope="scope">
-                    {{ scope.row.issueDate | dateRule }}
+                    {{ getNowDate() }}
                 </template>
             </el-table-column>
             <el-table-column
@@ -69,6 +69,7 @@
 
 <script>
 import { tableRowClassName, headerCellStyle } from '@/assets/js/myConfig'
+import { getNowDate } from '@/utils/utilFunction'
 import MyDialog from '@/components/dialog'
 import NeedBefore from '@/components/needBefore'
 
@@ -98,7 +99,7 @@ export default {
             },
             tableData: [
                 {
-                    issueDate: new Date(),
+                    // issueDate: new Date(),
                     organizationNumber: '1234100',
                     issueTeller: '002119',
                     receiveTeller: '002110',
@@ -153,7 +154,8 @@ export default {
         submitForm2() {
             // 不删
         },
-        tableRowClassName: tableRowClassName
+        tableRowClassName: tableRowClassName,
+        getNowDate
     },
     computed: {
         ...mapGetters({
diff --git a/src/pages/manage/list/ImportantCash/controlCash/index.vue b/src/pages/manage/list/ImportantCash/controlCash/index.vue
index bb8e5ca..a76caac 100644
--- a/src/pages/manage/list/ImportantCash/controlCash/index.vue
+++ b/src/pages/manage/list/ImportantCash/controlCash/index.vue
@@ -81,13 +81,6 @@ export default {
             
         }
     },
-    created() {
-        if(sessionStorage.getItem('importantCashIndex')) {
-            this.handleSelect(sessionStorage.getItem('importantCashIndex'))
-        }else {
-            this.handleSelect('1')
-        }
-    },
     methods: {
         handleSelect(val){
             this.text = this.textObj[val]
@@ -95,6 +88,13 @@ export default {
             this.cacheVal = val
         },
     },
+    created() {
+        if(sessionStorage.getItem('importantCashIndex')) {
+            this.handleSelect(sessionStorage.getItem('importantCashIndex'))
+        }else {
+            this.handleSelect('1')
+        }
+    },
     destroyed() {
         sessionStorage.setItem('importantCashIndex', this.cacheVal)
     }
@@ -135,7 +135,8 @@ export default {
         }
         .body{
             margin-top: 50px;
-            overflow: auto;
+            overflow-y: auto;
+            overflow-x: hidden;
             .idCard{
                 border-radius: 5px;
                 background: #CFDDFF;
diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue
index 7a26162..b131f63 100644
--- a/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue
+++ b/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue
@@ -1,131 +1,122 @@
-// 存款
 <template>
-    <div class="body">
-        <el-table
-            ref="filterTable"
-            :data="tableData"
-            height="450"
-            :row-class-name="tableRowClassName"
-            :header-cell-style="headerCellStyle"
-            style="width: 95%">
-            <el-table-column
-                prop="t1"
-                label="调出日期"
-                align="center"
-                >
-            </el-table-column>
-            <el-table-column
-                prop="t2"
-                label="机构号"
-                align="center"
-                >
-            </el-table-column>
-            <el-table-column
-                prop="t3"
-                label="接收柜员号"
-                class="blueText"
-                align="center"
-                >
-            </el-table-column>
-            <el-table-column
-                prop="t4"
-                label="凭证类型"
-                align="center"
-                >
-            </el-table-column>
-            <el-table-column
-                prop="t5"
-                label="起始号"
-                align="center"
-                >
-            </el-table-column>
-            <el-table-column
-                prop="t6"
-                label="结束号"
-                align="center"
-                >
-            </el-table-column>
-            <el-table-column
-                prop="t7"
-                label="数量"
-                align="center"
-                >
-            </el-table-column>
-            <el-table-column
-                label="操作"
-                align="center"
-                width="180"
-                >
-                <template slot-scope="scope">
-                    <el-button @click="sure(scope.row)" size="small" type='text'>确认</el-button>
-                    <el-button @click="back(scope.row)" size="small" type='text'>退回</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-
+    <div class="body" v-if="!isNeedBefore">
+        <el-row :gutter="20">
+                <el-form ref="form" :model="form" label-width="140px" class="heightLint" :rules="rules">
+                    <el-col :span="10"  :offset="1">
+                        <el-form-item label="凭证类型" prop="voucherType">
+                            <el-select v-model="form.voucherType" placeholder="请选择" ref="voucherType">
+                                <el-option
+                                    label="IC卡"
+                                    value="IC卡">
+                                </el-option>
+                                <el-option
+                                    label="存折"
+                                    value="存折">
+                                </el-option>
+                                <el-option
+                                    label="存单"
+                                    value="存单">
+                                </el-option>
+                                <el-option
+                                    label="现金支票"
+                                    value="现金支票">
+                                </el-option>
+                                <el-option
+                                    label="转账支票"
+                                    value="转账支票">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="起始号码" prop="startNumber">
+                            <el-input :value="form.startNumber" @input="(val) => inputListen2(val, form, 'startNumber')"  maxlength="20" ref='startNumber'></el-input>
+                        </el-form-item>
+                        <el-form-item label="数量">
+                            <el-input :value="form.number" disabled  ref='number'></el-input>
+                        </el-form-item>
+                        
+                    </el-col>
+                    <el-col :span="10"  :offset="1">
+                        <el-form-item label="接收柜员" prop="receiveCounter">
+                            <el-input :value="form.receiveCounter" @input="(val) => checkName(val, form, 'receiveCounter')"  maxlength="20" ref='receiveCounter'></el-input>
+                        </el-form-item>
+                        <el-form-item label="结束号码" prop="endNumber">
+                            <el-input @focus="getFocus" @blur="getBlur" :value="form.endNumber" @input="(val) => inputListen2(val, form, 'endNumber')"  maxlength="20" ref='endNumber'></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-form>
+        </el-row>
+        <el-button @click="submitClick" type="primary" class="submitBtn">提交</el-button>
+        <my-dialog2 v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
     </div>
+    <need-before v-else :moduleName='needBefore' :unNeed="unNeed" />
 </template>
 
 <script>
-import { headerCellStyle, tableRowClassName } from '@/assets/js/myConfig.js'
+import { tableRowClassName, headerCellStyle } from '@/assets/js/myConfig'
+
+const moduleName = 'controlCash2/cashOut'
+import { inputListen2, myValidate, checkName } from '@/utils/utilFunction'
+import { mapMutations, mapGetters } from 'vuex'
+import NeedBefore from '@/components/needBefore'
+import MyDialog2 from '@/components/dialog2'
 export default {
     name: 'index',
-    components:{},
+    components: {
+        NeedBefore,
+        MyDialog2
+    },
     data() {
         return {
             headerCellStyle: headerCellStyle,
             text:'柜员现金轧账',/* 顶部文字 */
+            visible: false,
+            unNeed: false,
+            isNeedBefore: '',
+            needBefore: '',
             form:{
-                date: '',
-                counterNumber: ''
+                voucherType: '',
+                receiveCounter: '',
+                endNumber: '',
+                startNumber: '',
+                number: '',
+            },
+            formName: {
+                voucherType: '凭证类型',
+                receiveCounter: '接收柜员',
+                startNumber: '起始号码',
+                endNumber: '结束号码',
+                number: '数量',
+            },
+            rules: {
+                voucherType: [
+                    { 
+                        required: true, 
+                        message: '请输入凭证类型',
+                        trigger: 'blur'
+                    },
+                ],
+                receiveCounter: [
+                    { 
+                        required: true, 
+                        message: '请输入接收柜员名称',
+                        trigger: 'blur'
+                    },
+                ],
+                startNumber: [
+                    { 
+                        required: true, 
+                        message: '请输入起始号码',
+                        trigger: 'blur'
+                    },
+                ],
+                endNumber: [
+                    { 
+                        required: true, 
+                        message: '请输入结束号码',
+                        trigger: 'blur'
+                    },
+                ],
             },
-            tableData: [
-                {
-                    t1: 1,
-                    t2: 2,
-                    t3: 1,
-                    t4: 2,
-                    t5: 1,
-                    t6: 2,
-                    t7: 4
-                },
-                {
-                    t1: 1,
-                    t2: 2,
-                    t3: 1,
-                    t4: 2,
-                    t5: 1,
-                    t6: 2,
-                    t7: 4
-                },
-                {
-                    t1: 1,
-                    t2: 2,
-                    t3: 1,
-                    t4: 2,
-                    t5: 1,
-                    t6: 2,
-                    t7: 4
-                },
-                {
-                    t1: 1,
-                    t2: 2,
-                    t3: 1,
-                    t4: 2,
-                    t5: 1,
-                    t6: 2,
-                    t7: 4
-                },
-                {
-                    t1: 1,
-                    t2: 2,
-                    t3: 1,
-                    t4: 2,
-                    t5: 1,
-                    t6: 2,
-                    t7: 4
-                }
-            ],
             visible:false,
         }
     },
@@ -140,22 +131,68 @@ export default {
         }
     },
     created() {
-        
+        if(this.inMyWork(moduleName)) {
+                if(this.needsModule(moduleName) === '') {
+                    
+                }else {
+                    this.isNeedBefore = true
+                    this.needBefore = this.needsModule(moduleName)
+                }
+            }else {
+                this.isNeedBefore = true
+                this.unNeed = true
+            }
     },
     methods: {
-        sure(row) {
-            console.log(row)
+        submitClick() {
+            this.$refs.form.validate(myValidate(() => {
+                if(this.form.number <= 0) {
+                    this.$message({
+                        message: '您的起始号码卡号比结束号码卡号排序更后,请检查一下哈。',
+                        type: 'warning',
+                        center: true
+                    });
+                    return
+                }
+                this.visible = true
+            } , this.$refs));
+            
         },
-        back(row) {
-            console.log(row)
+        submitForm2() {
+
+        },
+        getFocus() {
+            if(!this.form.startNumber) {
+                this.$message({
+                    message: '请先输入起始号码',
+                    type: 'warning'
+                });
+                this.$refs.startNumber.focus()
+            }
+        },
+        getBlur() {
+            const number = Number(this.form.endNumber) - Number(this.form.startNumber)
+            if(number<0 || this.form.endNumber.length<this.form.startNumber.length) {
+                this.form.number = 0
+                return
+            }
+            this.form.number = number
         },
-        tableRowClassName: tableRowClassName
+        tableRowClassName: tableRowClassName,
+        inputListen2,
+        checkName
+    },
+    computed: {
+        ...mapGetters({
+            needsModule: 'system/needsModule',
+            inMyWork: 'system/inMyWork',
+        })
     }
 };
 </script>
 
 <style lang="scss" scoped>
-@import '@/assets/css/tablebg.scss';
+    @import '@/assets/css/tablebg.scss';
     .body {
         overflow: auto;
     }
@@ -163,6 +200,9 @@ export default {
         width: 100%;
         // padding: 24px 0 24px 24px;
     }
+    .heightLint {
+        min-height: 350px;
+    }
 
     /deep/.el-input input {
         text-align: center;
@@ -175,11 +215,24 @@ export default {
     /deep/ .blueText{
         color: blue;
     }
-    /deep/.el-table .warning-row {
-        background: oldlace;
-    }
 
-    /deep/.el-table .success-row {
-        background: #f0f9eb;
+    .submitBtn{
+        position: relative;
+        width: 300px;
+        font-size: 18px;
+        height: 45px;
+        margin-top: 50px;
+        border-radius: 10px;
+        bottom: 10px;
+        left: 50%;
+        transform: translate(-50%,-20%);
     }
+    // /deep/.el-table .warning-row {
+    //     // background: oldlace;
+    //     background: rgb(167, 186, 194);
+    // }
+
+    // /deep/.el-table .success-row {
+    //     background: rgb(242,242,242);
+    // }
 </style>
\ No newline at end of file
diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashPaid.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashPaid.vue
index 38e0cb2..dc4f287 100644
--- a/src/pages/manage/list/ImportantCash/controlCash2/cashPaid.vue
+++ b/src/pages/manage/list/ImportantCash/controlCash2/cashPaid.vue
@@ -1,136 +1,126 @@
 <template>
-    <div class="body">
+    <div class="body" v-if="!isNeedBefore">
         <el-table
             ref="filterTable"
             :data="tableData"
-            height="450"
+            height="350"
             :header-cell-style="headerCellStyle"
             :row-class-name="tableRowClassName"
             style="width: 95%">
             <el-table-column
-                prop="t1"
                 label="调入日期"
                 align="center"
+                width="120"
                 >
+                <template>
+                    {{ getNowDate() }}
+                </template>
             </el-table-column>
             <el-table-column
-                prop="t2"
+                prop="organizationNumber"
                 label="机构号"
                 align="center"
                 >
             </el-table-column>
             <el-table-column
-                prop="t3"
+                prop="calloutCounter"
                 label="调出柜员号"
                 class="blueText"
                 align="center"
                 >
             </el-table-column>
             <el-table-column
-                prop="t3"
+                prop="calloutCounter"
                 label="调入柜员号"
                 class="blueText"
                 align="center"
                 >
             </el-table-column>
             <el-table-column
-                prop="t4"
+                prop="voucherType"
                 label="凭证类型"
                 align="center"
                 >
             </el-table-column>
             <el-table-column
-                prop="t5"
+                prop="startNumber"
                 label="起始号"
                 align="center"
                 >
             </el-table-column>
             <el-table-column
-                prop="t6"
+                prop="endNumber"
                 label="结束号"
                 align="center"
                 >
             </el-table-column>
             <el-table-column
-                prop="t7"
+                prop="number"
                 label="数量"
                 align="center"
                 >
+                <template slot-scope="scope">
+                    {{ count(scope.row.startNumber, scope.row.endNumber) }}
+                </template>
             </el-table-column>
             <el-table-column
                 label="操作"
                 align="center"
-                width="180"
+                width="150"
                 >
                 <template slot-scope="scope">
-                    <el-button @click="sure(scope.row)" size="small" type='text'>确认</el-button>
-                    <el-button @click="back(scope.row)" size="small" type='text'>退回</el-button>
+                    <el-button :disabled="form.clickIt1 === '已领用'" @click="sure(scope.row)" size="small" >确认</el-button>
+                    <el-button :disabled="form.clickIt2 === '已退回'" @click="back(scope.row)" size="small">退回</el-button>
                 </template>
             </el-table-column>
         </el-table>
-
+        <el-button @click="submitClick" type="primary" class="submitBtn">提交</el-button>
+        <my-dialog2 v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
     </div>
+
+    <need-before v-else :moduleName='needBefore' :unNeed="unNeed" />
 </template>
 
 <script>
 import { tableRowClassName, headerCellStyle } from '@/assets/js/myConfig'
+import { getNowDate } from '@/utils/utilFunction'
+
+const moduleName = 'controlCash2/cashPaid'
+import { mapMutations, mapGetters } from 'vuex'
+import NeedBefore from '@/components/needBefore'
+import MyDialog2 from '@/components/dialog'
 export default {
     name: 'index',
-    components:{},
+    components: {
+        NeedBefore,
+        MyDialog2
+    },
     data() {
         return {
             headerCellStyle: headerCellStyle,
             text:'柜员现金轧账',/* 顶部文字 */
+            visible: false,
+            unNeed: false,
+            isNeedBefore: '',
+            needBefore: '',
             form:{
-                date: '',
-                counterNumber: ''
+                clickIt1: '未领用', // 点击过一次就不能点击了
+                clickIt2: '未退回',// 点击过一次就不能点击了
+            },
+            formName: {
+                clickIt1: '领用状态',
+                clickIt2: '退回状态',
             },
             tableData: [
                 {
-                    t1: 1,
-                    t2: 2,
-                    t3: 1,
-                    t4: 2,
-                    t5: 1,
-                    t6: 2,
-                    t7: 4
-                },
-                {
-                    t1: 1,
-                    t2: 2,
-                    t3: 1,
-                    t4: 2,
-                    t5: 1,
-                    t6: 2,
-                    t7: 4
+                    organizationNumber: '1234100',
+                    calloutCounter: '002119',
+                    // 调入柜员号: 002110
+                    voucherType: '银行卡',
+                    startNumber: '10000401',
+                    endNumber: '10000420',
+                    number: 'xx' // endNumber-startNumber
                 },
-                {
-                    t1: 1,
-                    t2: 2,
-                    t3: 1,
-                    t4: 2,
-                    t5: 1,
-                    t6: 2,
-                    t7: 4
-                },
-                {
-                    t1: 1,
-                    t2: 2,
-                    t3: 1,
-                    t4: 2,
-                    t5: 1,
-                    t6: 2,
-                    t7: 4
-                },
-                {
-                    t1: 1,
-                    t2: 2,
-                    t3: 1,
-                    t4: 2,
-                    t5: 1,
-                    t6: 2,
-                    t7: 4
-                }
             ],
             visible:false,
         }
@@ -146,16 +136,44 @@ export default {
         }
     },
     created() {
-        
+        if(this.inMyWork(moduleName)) {
+            if(this.needsModule(moduleName) === '') {
+                
+            }else {
+                this.isNeedBefore = true
+                this.needBefore = this.needsModule(moduleName)
+            }
+        }else {
+            this.isNeedBefore = true
+            this.unNeed = true
+        }
     },
     methods: {
         sure(row) {
-            console.log(row)
+            this.form.clickIt1 = '已领用'
         },
         back(row) {
-            console.log(row)
+            this.form.clickIt2 = '已退回'
+        },
+        submitClick() {
+            this.visible = true
         },
-        tableRowClassName: tableRowClassName
+        submitForm2() {
+            // 提交完想做啥？
+        },
+        tableRowClassName: tableRowClassName,
+        getNowDate
+    },
+    computed: {
+        ...mapGetters({
+            needsModule: 'system/needsModule',
+            inMyWork: 'system/inMyWork',
+        }),
+        count() {
+            return (start, end) => {
+                return Number(end) - Number(start) + 1
+            }
+        }
     }
 };
 </script>
@@ -181,4 +199,16 @@ export default {
     /deep/ .blueText{
         color: blue;
     }
+
+    .submitBtn{
+        position: relative;
+        width: 300px;
+        font-size: 18px;
+        height: 45px;
+        margin-top: 50px;
+        border-radius: 10px;
+        bottom: 10px;
+        left: 50%;
+        transform: translate(-50%,-20%);
+    }
 </style>
\ No newline at end of file
diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashRecipients.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashRecipients.vue
index fbb99aa..abc7ce8 100644
--- a/src/pages/manage/list/ImportantCash/controlCash2/cashRecipients.vue
+++ b/src/pages/manage/list/ImportantCash/controlCash2/cashRecipients.vue
@@ -1,55 +1,59 @@
 // 存款
 <template>
-    <div class="body">
+    <div class="body" v-if="!isNeedBefore">
         <el-table
             ref="filterTable"
             :data="tableData"
-            height="450"
+            height="350"
             :header-cell-style="headerCellStyle"
             :row-class-name="tableRowClassName"
             style="width: 95%">
             <el-table-column
-                prop="t1"
                 label="下发日期"
                 align="center"
                 >
+                <template>
+                    {{ getNowDate() }}
+                </template>
             </el-table-column>
             <el-table-column
-                prop="t2"
+                prop="organizationNumber"
                 label="机构号"
                 align="center"
                 >
             </el-table-column>
             <el-table-column
-                prop="t3"
+                prop="issueCounter"
                 label="下发柜员号"
                 class="blueText"
                 align="center"
                 >
             </el-table-column>
             <el-table-column
-                prop="t4"
+                prop="voucherType"
                 label="凭证类型"
                 align="center"
                 >
             </el-table-column>
             <el-table-column
-                prop="t5"
+                prop="startNumber"
                 label="起始号"
                 align="center"
                 >
             </el-table-column>
             <el-table-column
-                prop="t6"
+                prop="endNumber"
                 label="结束号"
                 align="center"
                 >
             </el-table-column>
             <el-table-column
-                prop="t7"
                 label="数量"
                 align="center"
                 >
+                <template slot-scope="scope">
+                    {{ count(scope.row.startNumber, scope.row.endNumber) }}
+                </template>
             </el-table-column>
             <el-table-column
                 label="操作"
@@ -57,73 +61,56 @@
                 width="180"
                 >
                 <template slot-scope="scope">
-                    <el-button @click="sure(scope.row)" size="small" type='text'>确认</el-button>
-                    <el-button @click="back(scope.row)" size="small" type='text'>退回</el-button>
+                    <el-button :disabled="form.clickIt1 === '已领用'" @click="sure(scope.row)" size="small" >确认</el-button>
+                    <el-button :disabled="form.clickIt2 === '已退回'" @click="back(scope.row)" size="small">退回</el-button>
                 </template>
             </el-table-column>
         </el-table>
-
+        <el-button @click="submitClick" type="primary" class="submitBtn">提交</el-button>
+        <my-dialog2 v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
     </div>
+    <need-before v-else :moduleName='needBefore' :unNeed="unNeed" />
 </template>
 
 <script>
 import { tableRowClassName, headerCellStyle } from '@/assets/js/myConfig'
+import { getNowDate } from '@/utils/utilFunction'
+
+const moduleName = 'controlCash2/cashRecipients'
+import { mapMutations, mapGetters } from 'vuex'
+import NeedBefore from '@/components/needBefore'
+import MyDialog2 from '@/components/dialog'
 export default {
     name: 'index',
-    components:{},
+    components: {
+        NeedBefore,
+        MyDialog2
+    },
     data() {
         return {
             headerCellStyle: headerCellStyle,
             text:'柜员现金轧账',/* 顶部文字 */
+            visible: false,
+            unNeed: false,
+            isNeedBefore: '',
+            needBefore: '',
             form:{
-                date: '',
-                counterNumber: ''
+                clickIt1: '未领用', // 点击过一次就不能点击了
+                clickIt2: '未退回',// 点击过一次就不能点击了
+            },
+            formName: {
+                clickIt1: '领用状态',
+                clickIt2: '退回状态',
             },
             tableData: [
                 {
-                    t1: 1,
-                    t2: 2,
-                    t3: 1,
-                    t4: 2,
-                    t5: 1,
-                    t6: 2,
-                    t7: 4
-                },
-                {
-                    t1: 1,
-                    t2: 2,
-                    t3: 1,
-                    t4: 2,
-                    t5: 1,
-                    t6: 2,
-                    t7: 4
-                },
-                {
-                    t1: 1,
-                    t2: 2,
-                    t3: 1,
-                    t4: 2,
-                    t5: 1,
-                    t6: 2,
-                    t7: 4
-                },
-                {
-                    t1: 1,
-                    t2: 2,
-                    t3: 1,
-                    t4: 2,
-                    t5: 1,
-                    t6: 2,
-                    t7: 4
-                },
-                {
-                    t1: 1,
-                    t2: 2,
-                    t3: 1,
-                    t4: 2,
-                    t5: 1,
-                    t6: 2,
-                    t7: 4
+                    organizationNumber: '1234100',
+                    issueCounter: '002119',
+                    // 领用柜员号: '002110' ???
+                    voucherType: '银行卡',
+                    startNumber: '10000401',
+                    endNumber: '10000420',
+                    number: 20
                 }
             ],
             visible:false,
@@ -140,17 +127,46 @@ export default {
         }
     },
     created() {
-        
+        if(this.inMyWork(moduleName)) {
+            if(this.needsModule(moduleName) === '') {
+                
+            }else {
+                this.isNeedBefore = true
+                this.needBefore = this.needsModule(moduleName)
+            }
+        }else {
+            this.isNeedBefore = true
+            this.unNeed = true
+        }
     },
     methods: {
         sure(row) {
-            console.log(row)
+            this.form.clickIt1 = '已领用'
         },
         back(row) {
-            console.log(row)
+            this.form.clickIt2 = '已退回'
         },
-        tableRowClassName: tableRowClassName
+        submitClick() {
+            this.visible = true
+        },
+        submitForm2() {
+            // 提交完想做啥？
+        },
+        tableRowClassName: tableRowClassName,
+        getNowDate
+    },
+    computed: {
+        ...mapGetters({
+            needsModule: 'system/needsModule',
+            inMyWork: 'system/inMyWork',
+        }),
+        count() {
+            return (start, end) => {
+                return Number(end) - Number(start) + 1
+            }
+        }
     }
+    
 };
 </script>
 
@@ -175,4 +191,16 @@ export default {
     /deep/ .blueText{
         color: blue;
     }
+
+    .submitBtn{
+        position: relative;
+        width: 300px;
+        font-size: 18px;
+        height: 45px;
+        margin-top: 50px;
+        border-radius: 10px;
+        bottom: 10px;
+        left: 50%;
+        transform: translate(-50%,-20%);
+    }
 </style>
\ No newline at end of file
diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashTransferInto.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashTransferInto.vue
index 40364c9..669babd 100644
--- a/src/pages/manage/list/ImportantCash/controlCash2/cashTransferInto.vue
+++ b/src/pages/manage/list/ImportantCash/controlCash2/cashTransferInto.vue
@@ -1,130 +1,109 @@
 <template>
-    <div class="body">
-        <el-table
-            ref="filterTable"
-            :data="tableData"
-            height="450"
-            :row-class-name="tableRowClassName"
-            :header-cell-style="headerCellStyle"
-            style="width: 95%">
-            <el-table-column
-                prop="t1"
-                label="下发日期"
-                align="center"
-                >
-            </el-table-column>
-            <el-table-column
-                prop="t2"
-                label="机构号"
-                align="center"
-                >
-            </el-table-column>
-            <el-table-column
-                prop="t3"
-                label="下发柜员号"
-                class="blueText"
-                align="center"
-                >
-            </el-table-column>
-            <el-table-column
-                prop="t4"
-                label="凭证类型"
-                align="center"
-                >
-            </el-table-column>
-            <el-table-column
-                prop="t5"
-                label="起始号"
-                align="center"
-                >
-            </el-table-column>
-            <el-table-column
-                prop="t6"
-                label="结束号"
-                align="center"
-                >
-            </el-table-column>
-            <el-table-column
-                prop="t7"
-                label="数量"
-                align="center"
-                >
-            </el-table-column>
-            <el-table-column
-                label="操作"
-                align="center"
-                width="180"
-                >
-                <template slot-scope="scope">
-                    <el-button @click="sure(scope.row)" size="small"  type='text'>确认</el-button>
-                    <el-button @click="back(scope.row)" size="small" type='text'>退回</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-
+    <div class="body" v-if="!isNeedBefore">
+        <el-row :gutter="20">
+                <el-form ref="form" :model="form" label-width="140px" class="heightLint" :rules="rules">
+                    <el-col :span="10"  :offset="1">
+                        <el-form-item label="凭证类型" prop="voucherType">
+                            <el-select v-model="form.voucherType" placeholder="请选择" ref="voucherType">
+                                <el-option
+                                    label="IC卡"
+                                    value="IC卡">
+                                </el-option>
+                                <el-option
+                                    label="存折"
+                                    value="存折">
+                                </el-option>
+                                <el-option
+                                    label="存单"
+                                    value="存单">
+                                </el-option>
+                                <el-option
+                                    label="现金支票"
+                                    value="现金支票">
+                                </el-option>
+                                <el-option
+                                    label="转账支票"
+                                    value="转账支票">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="结束号码" prop="endNumber">
+                            <el-input @focus="getFocus" @blur="getBlur" :value="form.endNumber" @input="(val) => inputListen2(val, form, 'endNumber')"  maxlength="20" ref='endNumber'></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10"  :offset="1">
+                        <el-form-item label="起始号码" prop="startNumber">
+                            <el-input :value="form.startNumber" @input="(val) => inputListen2(val, form, 'startNumber')"  maxlength="20" ref='startNumber'></el-input>
+                        </el-form-item>
+                        <el-form-item label="数量">
+                            <el-input :value="form.number" disabled  ref='number'></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-form>
+        </el-row>
+        <el-button @click="submitClick" type="primary" class="submitBtn">提交</el-button>
+        <my-dialog2 v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
     </div>
+    <need-before v-else :moduleName='needBefore' :unNeed="unNeed" />
 </template>
 
 <script>
 import { tableRowClassName, headerCellStyle } from '@/assets/js/myConfig'
+
+const moduleName = 'controlCash2/cashTransferInto'
+import { inputListen2, myValidate } from '@/utils/utilFunction'
+import { mapMutations, mapGetters } from 'vuex'
+import NeedBefore from '@/components/needBefore'
+import MyDialog2 from '@/components/dialog2'
 export default {
     name: 'index',
-    components:{},
+    components: {
+        NeedBefore,
+        MyDialog2
+    },
     data() {
         return {
             headerCellStyle: headerCellStyle,
             text:'柜员现金轧账',/* 顶部文字 */
+            visible: false,
+            unNeed: false,
+            isNeedBefore: '',
+            needBefore: '',
             form:{
-                date: '',
-                counterNumber: ''
+                voucherType: '',
+                endNumber: '',
+                startNumber: '',
+                number: '',
+            },
+            formName: {
+                voucherType: '凭证类型',
+                endNumber: '结束号码',
+                startNumber: '起始号码',
+                number: '数量',
+            },
+            rules: {
+                voucherType: [
+                    { 
+                        required: true, 
+                        message: '请输入凭证类型',
+                        trigger: 'blur'
+                    },
+                ],
+                startNumber: [
+                    { 
+                        required: true, 
+                        message: '请输入起始号码',
+                        trigger: 'blur'
+                    },
+                ],
+                endNumber: [
+                    { 
+                        required: true, 
+                        message: '请输入结束号码',
+                        trigger: 'blur'
+                    },
+                ],
             },
-            tableData: [
-                {
-                    t1: 1,
-                    t2: 2,
-                    t3: 1,
-                    t4: 2,
-                    t5: 1,
-                    t6: 2,
-                    t7: 4
-                },
-                {
-                    t1: 1,
-                    t2: 2,
-                    t3: 1,
-                    t4: 2,
-                    t5: 1,
-                    t6: 2,
-                    t7: 4
-                },
-                {
-                    t1: 1,
-                    t2: 2,
-                    t3: 1,
-                    t4: 2,
-                    t5: 1,
-                    t6: 2,
-                    t7: 4
-                },
-                {
-                    t1: 1,
-                    t2: 2,
-                    t3: 1,
-                    t4: 2,
-                    t5: 1,
-                    t6: 2,
-                    t7: 4
-                },
-                {
-                    t1: 1,
-                    t2: 2,
-                    t3: 1,
-                    t4: 2,
-                    t5: 1,
-                    t6: 2,
-                    t7: 4
-                }
-            ],
             visible:false,
         }
     },
@@ -139,16 +118,61 @@ export default {
         }
     },
     created() {
-        
+        if(this.inMyWork(moduleName)) {
+                if(this.needsModule(moduleName) === '') {
+                    
+                }else {
+                    this.isNeedBefore = true
+                    this.needBefore = this.needsModule(moduleName)
+                }
+            }else {
+                this.isNeedBefore = true
+                this.unNeed = true
+            }
     },
     methods: {
-        sure(row) {
-            console.log(row)
+        submitClick() {
+            this.$refs.form.validate(myValidate(() => {
+                if(this.form.number <= 0) {
+                    this.$message({
+                        message: '您的起始号码卡号比结束号码卡号排序更后,请检查一下哈。',
+                        type: 'warning',
+                        center: true
+                    });
+                    return
+                }
+                this.visible = true
+            } , this.$refs));
+            
         },
-        back(row) {
-            console.log(row)
+        submitForm2() {
+
+        },
+        getFocus() {
+            if(!this.form.startNumber) {
+                this.$message({
+                    message: '请先输入起始号码',
+                    type: 'warning'
+                });
+                this.$refs.startNumber.focus()
+            }
+        },
+        getBlur() {
+            const number = Number(this.form.endNumber) - Number(this.form.startNumber)
+            if(number<0 || this.form.endNumber.length<this.form.startNumber.length) {
+                this.form.number = 0
+                return
+            }
+            this.form.number = number
         },
-        tableRowClassName: tableRowClassName
+        tableRowClassName: tableRowClassName,
+        inputListen2
+    },
+    computed: {
+        ...mapGetters({
+            needsModule: 'system/needsModule',
+            inMyWork: 'system/inMyWork',
+        })
     }
 };
 </script>
@@ -162,6 +186,9 @@ export default {
         width: 100%;
         // padding: 24px 0 24px 24px;
     }
+    .heightLint {
+        min-height: 350px;
+    }
 
     /deep/.el-input input {
         text-align: center;
@@ -174,6 +201,18 @@ export default {
     /deep/ .blueText{
         color: blue;
     }
+
+    .submitBtn{
+        position: relative;
+        width: 300px;
+        font-size: 18px;
+        height: 45px;
+        margin-top: 50px;
+        border-radius: 10px;
+        bottom: 10px;
+        left: 50%;
+        transform: translate(-50%,-20%);
+    }
     // /deep/.el-table .warning-row {
     //     // background: oldlace;
     //     background: rgb(167, 186, 194);
diff --git a/src/pages/manage/list/ImportantCash/controlCash2/index.vue b/src/pages/manage/list/ImportantCash/controlCash2/index.vue
index 7d877a7..c5579a7 100644
--- a/src/pages/manage/list/ImportantCash/controlCash2/index.vue
+++ b/src/pages/manage/list/ImportantCash/controlCash2/index.vue
@@ -62,6 +62,7 @@ export default {
     data() {
         return {
             text:'',/* 顶部文字 */
+            cacheVal: '',
             textObj:{
                 '1':'凭证领用',
                 '2':'凭证上缴',
@@ -83,14 +84,20 @@ export default {
         }
     },
     created() {
-        this.handleSelect('1')
+        if(sessionStorage.getItem('importantCashIndex2')) {
+            this.handleSelect(sessionStorage.getItem('importantCashIndex2'))
+        }else {
+            this.handleSelect('1')
+        }
+    },
+    destroyed() {
+        sessionStorage.setItem('importantCashIndex2', this.cacheVal)
     },
     methods: {
         handleSelect(val){
-            console.log(typeof(val),this.activeIndex,'xuanze');
-            
             this.text = this.textObj[val]
             this.activeIndex = val
+            this.cacheVal = val
         },
         
 
@@ -132,7 +139,8 @@ export default {
         }
         .body{
             margin-top: 50px;
-            overflow: auto;
+            overflow-x: hidden;
+            overflow-y: auto;
             .idCard{
                 border-radius: 5px;
                 background: #CFDDFF;
diff --git a/src/pages/manage/list/client/consumerClient.vue b/src/pages/manage/list/client/consumerClient.vue
index f0b0b5c..fa21f17 100644
--- a/src/pages/manage/list/client/consumerClient.vue
+++ b/src/pages/manage/list/client/consumerClient.vue
@@ -7,15 +7,7 @@
                 <el-form ref="form" :model="form" label-width="140px" :rules="rules">
                     <el-col :span="10"  :offset="1">
                         <el-form-item label="证件类型">
-                            <!-- <el-select v-model="form.idType" placeholder="请选择" ref="idType">
-                                <el-option
-                                v-for="(item,index) in papers"
-                                :key="index"
-                                :label="item.name"
-                                :value="item.id">
-                                </el-option>
-                            </el-select> -->
-                            <el-select v-model="form.idType" placeholder="请选择" ref="idType">
+                            <el-select v-model="form.idType" disabled placeholder="请选择" ref="idType">
                                 <el-option
                                 label="身份证"
                                 value="身份证">
@@ -30,9 +22,8 @@
                                 v-model="form.birthday"
                                 type="date"
                                 placeholder="选择日期"
-                                value-format="yyyy-MM-dd HH:mm"
-                                format="yyyy-MM-dd HH:mm"
-                                ref="birthday">
+                                format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd">
                             </el-date-picker>
                         </el-form-item>
                         <el-form-item label="通讯地址">
@@ -59,16 +50,6 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <!-- <el-form-item label="民族">
-                            <el-select v-model="form.nationality" placeholder="请选择" ref="nationality">
-                                <el-option
-                                v-for="(item,index) in nations"
-                                :key="index"
-                                :label="item.description"
-                                :value="item.itemId">
-                                </el-option>
-                            </el-select>
-                        </el-form-item> -->
                         <el-form-item label="联系电话" :rules="rules.phone" prop="phone">
                             <el-input :value="form.phone" @input="(val) => phoneListen(val, form, 'phone')"  maxlength="12" ref='phone'></el-input>
                         </el-form-item>
@@ -90,7 +71,7 @@ import { mapState, mapMutations, mapGetters } from 'vuex'
 import { vername, vermob } from '@/utils/verify.js'
 import { addOperation, getOperation } from '@/api/http';
 import { mobPattern, namePattern, ratePattern, vercustomer  } from '@/utils/verify.js'
-import { phoneListen, mailBoxListen, checkRequired, myValidate, checkName } from '@/utils/utilFunction.js'
+import { phoneListen, mailBoxListen, checkRequired, randomPeopleNumber, myValidate, checkName, messageIdCard } from '@/utils/utilFunction.js'
 
 import MyTitle from '@/components/myTitle'
 import MyDialog from '@/components/dialog'
@@ -111,10 +92,11 @@ export default {
               idNumber:'',//证件号码
               userName:'',//客户名字
               sex:'',//性别
-              birthday:'',//出生日期
+              birthday:null,//出生日期
               nationality:'',//民族
               mailbox:'',//通讯地址
               phone:'',//联系电话
+              peopleNumber: '',
             },
             formName: {
                 idType: '证件类型',
@@ -125,6 +107,7 @@ export default {
                 nationality:'民族',
                 mailbox:'通讯地址',
                 phone:'联系电话',
+                peopleNumber: '客户号'
             },
             rules: {
                 userName: vercustomer ,
@@ -228,8 +211,6 @@ export default {
     created() {
         if(this.inMyWork(moduleName)) {
             if(this.needsModule(moduleName) === '') {
-                
-
                 if(sessionStorage.getItem('nomClientIdentity')) {
                     this.idNumberJudge = true
                     const { idType, userName, sex, birthday, nationality, mailbox, idNumber } = this.dataFlow
@@ -273,7 +254,9 @@ export default {
                     for (var i = 0; i < list.length; i++) {
                         if (list[i].answerId == '40') {this.form.idType = list[i].emptyTwo}
                         // if (list[i].answerId == '41') {sessionStorage.setItem('nomClientIdentity', list[i].emptyTwo)}
-                        if (list[i].answerId == '41') {
+                        if (list[i].answerId == '41' && list[i].emptyTwo) {
+                            console.log('---')
+                            console.log(list[i].emptyTwo)
                             this.idNumberJudge = true
                             this.form.idNumber = list[i].emptyTwo
                         }
@@ -330,16 +313,14 @@ export default {
           let nomClientIdentity = sessionStorage.getItem('nomClientIdentity')
             let consumerClientDragList = JSON.parse(nomClientIdentity);
             let nomClientIdentitys = JSON.parse(nomClientIdentity);
+            if(!this.form.idNumber) {
+                messageIdCard()
+                return
+            }
           this.$refs.form.validate(myValidate(() => {
-              // console.log(this.form.birthday)
-              this.form.birthday = this.form.birthday.slice(0, 10)
+            //   this.form.birthday = this.form.birthday.slice(0, 10)
+              this.form.peopleNumber = randomPeopleNumber()
               this.visible = true;
-            //   if (nomClientIdentitys && nomClientIdentitys.length > 0){
-            //       this.visible = true;
-            //   }else{
-            //       this.$message.error('请刷身份证');
-            //   }
-                
           } , this.$refs));
       },
       submitForm2() {
diff --git a/src/pages/manage/list/personal/callDeposits/accountClosed.vue b/src/pages/manage/list/personal/callDeposits/accountClosed.vue
index d35fc4a..534f609 100644
--- a/src/pages/manage/list/personal/callDeposits/accountClosed.vue
+++ b/src/pages/manage/list/personal/callDeposits/accountClosed.vue
@@ -296,24 +296,6 @@ export default{
     created() {
         if(this.inMyWork(moduleName)) {
                 if(this.needsModule(moduleName) === '') {
-                    // idNumber: '', // 身份证号码
-                    // voucherNumber: '', // 凭证号码
-                    // drawPassword: '', // 支付密码
-
-                    // depositDate: '存单',
-                    // noticeType: '1天',
-                    // depositNumber: '0816',
-                    // capital: 100,
-                    // interest: 2.8,
-                    // totalMoney: 102.8,
-                    // payType: '现金',
-                    // payMoney: 102.8,
-                    // idNumber,
-                    // peopleNumber,
-                    // userName,
-                    // currency:'CNY人民币',
-                    // goldLogo:'钞户',
-                    // voucherNumber
                     console.log('nomCallDepositClosedCard --------------')
                     console.log(sessionStorage.getItem('nomCallDepositClosedCard'))
                     if(sessionStorage.getItem('nomCallDepositClosedCard')) {
@@ -400,25 +382,28 @@ export default{
             this.$refs.form.validate(myValidate(() => {
                 // 验证通过逻辑写在这
                 this.visible = true;
-                const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,38,289'
-                const nomCallDepositCard = sessionStorage.getItem('nomCallDepositCard')
-                const nomCallDepositCard2 = sessionStorage.getItem('nomCallDepositCard2')
-                const nomCallDepositClosedPassword = sessionStorage.getItem('nomCallDepositClosedPassword')
-                const cards = [
-                    // {
-                    //     302: nomCallDepositCard
-                    // },
-                    // {
-                    //     392: nomCallDepositCard2
-                    // },
-                    // {
-                    //     394: nomCallDepositClosedPassword,
-                    //   "subjectId": 17,
-                    // }
-                ]
-                autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
+                
             }, this.$refs));
         },
+        submitForm2() {
+            const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,38,289'
+            const nomCallDepositCard = sessionStorage.getItem('nomCallDepositCard')
+            const nomCallDepositCard2 = sessionStorage.getItem('nomCallDepositCard2')
+            const nomCallDepositClosedPassword = sessionStorage.getItem('nomCallDepositClosedPassword')
+            const cards = [
+                // {
+                //     302: nomCallDepositCard
+                // },
+                // {
+                //     392: nomCallDepositCard2
+                // },
+                // {
+                //     394: nomCallDepositClosedPassword,
+                //   "subjectId": 17,
+                // }
+            ]
+            autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
+        },
         ismoney: ismoney,
         checkHanzi: checkHanzi,
         checkName: checkName
diff --git a/src/pages/manage/list/personal/currentAccount/deposit.vue b/src/pages/manage/list/personal/currentAccount/deposit.vue
index db6f7ca..e338b04 100644
--- a/src/pages/manage/list/personal/currentAccount/deposit.vue
+++ b/src/pages/manage/list/personal/currentAccount/deposit.vue
@@ -14,20 +14,20 @@
                             </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="15" @input="val => ismoney(val, form, 'money')" ref="money"></el-input>
+                            <el-input :value="form.money" disabled maxlength="15" @input="val => ismoney(val, form, 'money')" ref="money"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="10" :offset="1">
                         <el-form-item label="客户姓名" prop="userName">
-                            <el-input ref="userName"  :value="form.userName" maxlength="20" @input="(val) => checkName(val, form, 'userName')"></el-input>
+                            <el-input ref="userName" disabled  :value="form.userName" maxlength="20" @input="(val) => checkName(val, form, 'userName')"></el-input>
                         </el-form-item>
                         <el-form-item label="钞汇标识" prop="goldLogo">
-                            <el-select v-model="form.goldLogo" ref="goldLogo" placeholder="请选择">
+                            <el-select v-model="form.goldLogo" disabled ref="goldLogo" placeholder="请选择">
                                 <el-option  label="钞户" value="钞户"> </el-option>
                             </el-select>
                         </el-form-item>
diff --git a/src/pages/manage/list/personal/currentAccount/openAccount.vue b/src/pages/manage/list/personal/currentAccount/openAccount.vue
index 5866df6..964a797 100644
--- a/src/pages/manage/list/personal/currentAccount/openAccount.vue
+++ b/src/pages/manage/list/personal/currentAccount/openAccount.vue
@@ -25,7 +25,7 @@
                         </el-select>
                     </el-form-item> -->
                     <el-form-item label="钞汇标识" prop="goldLogo" disabled>
-                        <el-select v-model="form.goldLogo" placeholder="请选择" ref="goldLogo">
+                        <el-select v-model="form.goldLogo" disabled placeholder="请选择" ref="goldLogo">
                             <el-option label="钞户" value="钞户"> </el-option>
                         </el-select>
                     </el-form-item>
@@ -241,19 +241,19 @@ export default {
               userNumber: '', // 客户号
               currency: 'CNY人民币', // 币种
               userName: '', // 客户姓名
-              goldLogo: '', // 钞汇标识
-              accountQuality: '', // 账户性质
+              goldLogo: '钞户', // 钞汇标识
+              accountQuality: '个人结算户', // 账户性质
               accountType: '', // 账户类型
               drawWay: '', // 支取方式
-              voucherType: '', // 凭证类型
-              accountQualitysTwo: '', // 账户性质2
+              voucherType: 'IC卡', // 凭证类型
+              accountQualitysTwo: '个人结算户', // 账户性质2
               accountTypesTwo: '', // 账户类型2
               drawWaysTwo: '', // 支取方式2
-              voucherTypesTwo: '', // 凭证类型2
-              accountQualitysThree: '', // 账户性质3
+              voucherTypesTwo: 'IC卡', // 凭证类型2
+              accountQualitysThree: '个人结算户', // 账户性质3
               accountTypesThree: '', // 账户类型3
               drawWaysThree: '', // 支取方式3
-              voucherTypesThree: '', // 凭证类型3
+              voucherTypesThree: 'IC卡', // 凭证类型3
             },
             formName:{
               cardNumber: '卡号', // 
@@ -409,7 +409,8 @@ export default {
                             else if (list[i].answerId == '70') {this.form.currency = list[i].emptyTwo}
                             else if (list[i].answerId == '71') {this.form.goldLogo = list[i].emptyTwo}
                             else if (list[i].answerId == '72') {this.form.accountQuality = list[i].emptyTwo}
-                            else if (list[i].answerId == '73') {this.form.voucherType = list[i].emptyTwo}
+                            // else if (list[i].answerId == '73') {this.form.voucherType = list[i].emptyTwo}
+                            else if (list[i].answerId == '73') {this.form.voucherType = 'IC卡'}
                             else if (list[i].answerId == '74') {this.form.accountType = list[i].emptyTwo}
                             else if (list[i].answerId == '75') {
                               this.form.cardNumber = list[i].emptyTwo
@@ -497,17 +498,18 @@ export default {
             if (item == '8'){
               this.currencySelectList = data.data.items;
             }else if (item == '9'){
-                this.goldLogoSelectList = data.data.items;
-                this.form.goldLogo = this.goldLogoSelectList[0].itemId
-                // ???
+                // this.goldLogoSelectList = data.data.items;
+                // this.form.goldLogo = this.goldLogoSelectList[0].itemId
                 this.form.goldLogo = '钞户'
             }else if (item == '10'){
-              this.accountQualitySelectList = data.data.items;
-              console.log(this.accountQualitySelectList)
-              this.form.accountQuality =  this.accountQualitySelectList[0].itemId
+              // this.accountQualitySelectList = data.data.items;
+              // console.log(this.accountQualitySelectList)
+              // this.form.accountQuality =  this.accountQualitySelectList[0].itemId
+              this.form.accountQuality = '个人接算户';
             }else if (item == '11'){
-              this.voucherTypeSelectList = data.data.items;
-              this.form.voucherType = this.voucherTypeSelectList[0].itemId
+              // this.voucherTypeSelectList = data.data.items;
+              // this.form.voucherType = this.voucherTypeSelectList[0].itemId
+              this.form.voucherType = 'IC卡'
             }else if (item == '12'){
               this.accountTypeSelectList = data.data.items;
             }else if (item == '13'){
diff --git a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
index a202cf1..7759777 100644
--- a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
+++ b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
@@ -13,7 +13,7 @@
                         </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>
@@ -26,10 +26,10 @@
                 </el-col>
                 <el-col :span="10" :offset="1">
                     <el-form-item label="客户姓名" prop="username">
-                        <el-input :value="form.userName" @input="(val) => checkName(val, form, 'userName')"></el-input>
+                        <el-input :value="form.userName" disabled @input="(val) => checkName(val, form, 'userName')"></el-input>
                     </el-form-item>
                     <el-form-item label="钞汇标识" prop="goldLogo">
-                        <el-select v-model="form.goldLogo" placeholder="请选择" ref="goldLogo">
+                        <el-select v-model="form.goldLogo" disabled placeholder="请选择" ref="goldLogo">
                             <el-option  label="钞户" value="钞户" ref="goldLogo"> </el-option>
                         </el-select>
                     </el-form-item>
diff --git a/src/pages/manage/list/personal/currentAccount/withdrawal.vue b/src/pages/manage/list/personal/currentAccount/withdrawal.vue
index c5ea45d..e8aa962 100644
--- a/src/pages/manage/list/personal/currentAccount/withdrawal.vue
+++ b/src/pages/manage/list/personal/currentAccount/withdrawal.vue
@@ -13,12 +13,12 @@
                         </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" @input="val => ismoney(val, form, 'money')"></el-input>
+                    <el-form-item label="金额" prop="money">
+                        <el-input :value="form.money" maxlength="15" @input="val => ismoney(val, form, 'money')"></el-input>
                     </el-form-item>
                     <el-form-item label="支取密码" required>
                         <div v-if='!form.drawPassword' class="idCard" @click="popUp2('密码器')">
@@ -31,21 +31,21 @@
                 </el-col>
                 <el-col :span="10" :offset="1">
                     <el-form-item label="客户姓名" prop="userName">
-                        <el-input ref="userName" :value="form.userName" @input="(val) => checkName(val, form, 'userName')"></el-input>
+                        <el-input ref="userName" disabled :value="form.userName" @input="(val) => checkName(val, form, 'userName')"></el-input>
                     </el-form-item>
                     <el-form-item label="钞汇标识" prop="goldLogo">
-                        <el-select v-model="form.goldLogo" placeholder="请选择" ref="goldLogo">
+                        <el-select v-model="form.goldLogo" disabled placeholder="请选择" ref="goldLogo">
                             <el-option  label="钞户" value="钞户"> </el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="支取方式" prop="chargeWay">
-                        <el-select v-model="form.chargeWay" placeholder="请选择" ref="chargeWay">
+                        <el-select v-model="form.chargeWay" disabled placeholder="请选择" ref="chargeWay">
                             <el-option  label="现金" value="现金"> </el-option>
                             <el-option  label="转账" value="转账"> </el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="手续费" prop="serviceCharge">
-                        <el-input :value="form.serviceCharge" @input="val => ismoney(val, form, 'serviceCharge')" ref="serviceCharge"></el-input>
+                        <el-input :value="form.serviceCharge" disabled @input="val => ismoney(val, form, 'serviceCharge')" ref="serviceCharge"></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="21" :offset="1">
@@ -160,6 +160,13 @@ export default{
                         message: '请输入手续费',
                         trigger: 'blur'
                     }
+                ],
+                money: [
+                    { 
+                        required: true, 
+                        message: '请输入金额',
+                        trigger: 'blur'
+                    }
                 ]
             }
         }
@@ -205,6 +212,7 @@ export default{
           })
       },
     submitForm(){
+        console.log(this.form.money)
         this.$refs.form.validate(myValidate(() => {
             this.visible = true;
         }, this.$refs));
diff --git a/src/store/modules/system.js b/src/store/modules/system.js
index c594c1d..5742519 100644
--- a/src/store/modules/system.js
+++ b/src/store/modules/system.js
@@ -1435,6 +1435,10 @@ export default {
 
                 importanceArr: [], // 重要空白凭证箱
                 commonArr: [], // 普通凭证箱
+
+                needsModule: {
+                    'controlCash2/cashRecipients' : false
+                },
             },
             '项目二十二': {
                 id: 510,
@@ -1456,9 +1460,13 @@ export default {
 
                 importanceArr: [], // 重要空白凭证箱
                 commonArr: [], // 普通凭证箱
+
+                needsModule: {
+                    'controlCash2/cashTransferInto' : false
+                },
             },
             '项目二十三': {
-                id: '',
+                id: 511,
                 data: [ ], //
                 needs: [ 438 ],
                 isStamp: {
@@ -1477,9 +1485,13 @@ export default {
 
                 importanceArr: [], // 重要空白凭证箱
                 commonArr: [], // 普通凭证箱
+
+                needsModule: {
+                    'controlCash2/cashPaid' : false
+                },
             },
             '项目二十四': {
-                id: '',
+                id: 512,
                 data: [ ], //
                 needs: [ 438 ],
                 isStamp: {
@@ -1498,6 +1510,10 @@ export default {
 
                 importanceArr: [], // 重要空白凭证箱
                 commonArr: [], // 普通凭证箱
+                // 'controlCash2/cashOut'
+                needsModule: {
+                    'controlCash2/cashOut' : false
+                },
             },
             '项目二十五': {
                 id: '',
diff --git a/src/utils/utilFunction.js b/src/utils/utilFunction.js
index a7bff2b..d4340a4 100644
--- a/src/utils/utilFunction.js
+++ b/src/utils/utilFunction.js
@@ -67,6 +67,23 @@ const inputListen = function(val, row, prop) {
     row[prop] = Number(val.replace(/\D+/, ''))
 }
 
+const inputListen2 = function(val, row, prop) {
+    // 检查空格
+    const tmpCheck = val.substr(val.length-1, 1);
+    if(tmpCheck === ' ') {
+        return;
+    }
+    // 可以删光
+    if(val === '') {
+        row[prop] = val;
+        return;
+    }
+    if(Number(val) || Number(val)===0) {
+        console.log(val)
+        row[prop] = val
+    }
+}
+
 const ismoney = function(val, row, prop) {
     // 检查空格
     const tmpCheck = val.substr(val.length-1, 1);
@@ -220,7 +237,44 @@ const autoPlay3 = (name, allName, arr) => { // 要接收的， 所有的， 要
     }
 }
 
+const getNowDate = () => {
+    const date = new Date()
+    var y = date.getFullYear();  
+    var m = date.getMonth() + 1;  
+    m = m < 10 ? '0' + m : m;  
+    var d = date.getDate();  
+    d = d < 10 ? ('0' + d) : d;  
+    return y + '-' + m + '-' + d;
+}
+
+const messageIdCard = () => {
+    Message.warning({
+        center: true,
+        message: '请刷身份证',
+    })
+}
+
+const messageCard = () => {
+    Message.warning({
+        center: true,
+        message: '请刷银行卡',
+    })
+}
+
+const randomPeopleNumber = () => {
+    const $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+    const $chars2 = '1234567890'
+    const maxPos = $chars2.length;
+    let str = '';
+    str += $chars.charAt(Math.floor(Math.random() * maxPos))
+    for (let i = 0; i < 9; i++) {
+        str += $chars2.charAt(Math.floor(Math.random() * maxPos));
+    }
+    return str;
+}
+
  export {
+     randomPeopleNumber,
      phoneListen,
      mailBoxListen,
      checkRequired,
@@ -232,5 +286,9 @@ const autoPlay3 = (name, allName, arr) => { // 要接收的， 所有的， 要
      rateListen,
      autoPlay,
      autoPlay2,
-     autoPlay3
+     autoPlay3,
+     getNowDate,
+     inputListen2,
+     messageIdCard,
+     messageCard
  }
\ No newline at end of file