update

src/App.vue

@@ -25,10 +25,15 @@
             if (util.local.get(Setting.storeKey) ) {
                 this.$store.replaceState(Object.assign({}, this.$store.state,util.local.get(Setting.storeKey)))
                 this.$store.system.replaceState(Object.assign({}, sessionStorage.getItem('systemData')))
+                
             } 
 
             //在页面刷新时将vuex里的信息保存到localStorage里
             window.addEventListener("beforeunload",()=>{
+                if(this.$route.fullPath.includes('/counter/list/manage')) {
+                    sessionStorage.setItem('computerPath', this.$route.fullPath)
+                }
+                
                 util.local.get(Setting.tokenKey) && util.local.set(Setting.storeKey,this.$store.state)
                 sessionStorage.setItem('systemData', this.$store.system.state)
             })                                                                                      

src/components/dialog/index.vue

@@ -140,6 +140,11 @@ const obj = {
     'timeDeposit/withdrawal': '整存整取取款',
     'timeDeposit/deposit': '整存整取存款',
     'business/openAccount': '公司业务开户',
+    'servicesAccount/passwordChange': '密码修改',
+    'servicesAccount/passwordLost': '密码挂失登记',
+    'servicesAccount/relieveLost': '挂失解挂登记',
+    'controlCash/cashRecipients': '现金管理',
+    
     'spacial': '提交'
 }
 const nameMap = {

src/components/dialogTwo/index.vue

@@ -15,7 +15,7 @@
             <h2 class="text-red-500 text-2xl">本业务需要授权</h2>
         </div>
         <div class="popBody" v-else-if="flow === 2">
-            <el-form ref="form2" :model="disForm" label-width="80px">
+            <el-form ref="form2" :model="disForm" label-width="120px">
                     <el-form-item label="授权柜员">
                     <el-input disabled v-model="disForm.name"></el-input>
                 </el-form-item>
@@ -68,6 +68,15 @@ const obj = {
     'timeDeposit/withdrawal': '整存整取取款',
     'timeDeposit/deposit': '整存整取存款',
     'business/openAccount': '公司业务开户',
+    'controlCash/cashRecipients': '现金领用',
+    'controlCash/cashTransferInto': '现金上缴',
+    'controlCash/cashPaid': '现金调入',
+    'controlCash/cashOut': '现金调出',
+    'controlCash2/cashRecipients': '凭证领用',
+    'controlCash2/cashTransferInto': '凭证上缴',
+    'controlCash2/cashPaid': '凭证调入',
+    'controlCash2/cashOut': '凭证调出',
+    'controlCash3/index': '支票出售',
     'spacial': '提交'
 }
 const nameMap = {
@@ -232,6 +241,7 @@ export default {
         }
     },
     created() {
+        console.log('神马情况！')
         if(!this.needAuth) {
             this.flow = 3
         }
@@ -290,9 +300,7 @@ export default {
         
     },
     methods: {
-        successName() {
-            return obj[ this.moduleName ] + '成功'
-        },
+        
         cancel() {
             this.visible = false;
         },
@@ -318,7 +326,11 @@ export default {
             return (val, key) => {
                 return key + ': ' + val
             }
-        }
+        },
+        successName() {
+            console.log(this.moduleName)
+            return obj[ this.moduleName ] + '成功'
+        },
     }
 }
 </script>

src/pages/counter/list/index.vue

@@ -105,7 +105,7 @@
         <!-- 物品栏 -->
         <div ref="goods" class="goods-dia" :class="{ active: showGoods }">
             <!-- goodsShelfTotalData goods2 -->
-            <div :id="item.name" v-for="(item) in goodsShelfTotalData" :key="item.id" class=" justify-center" :class="{ checked: checkList.includes(item.id),file:true }" @click="goodsDblClickFn(item)">
+            <div :id="item.name" v-for="(item) in goodsShelfTotalData" :key="item.id" class=" justify-center img-wrap" :class="{ checked: checkList.includes(item.id),file:true }" @click="goodsDblClickFn(item)">
                 <!-- <img :style="item.name==='开户申请书'?'margin-top:10px;':''" :src="item.src" alt="" /> -->
                 <el-image
                     style="width: 90%; height: 70px; top: 10px;"

src/pages/lobbyManager/list/index.vue

@@ -61,7 +61,7 @@
             </div>
         </el-dialog>
 
-        <el-dialog :visible.sync="dataVisible" style="width: 100%" @close="closeData" :close-on-click-modal="false" :show-close="false" custom-class="data-dia">
+        <el-dialog :visible.sync="dataVisible" style="width: 100%;margin-top: -90px;" @close="closeData" :close-on-click-modal="false" :show-close="false" custom-class="data-dia">
             <div slot="title" class="dia-header">
                 <div class="data-title">银行单据</div>
                 <img class="close" src="@/assets/svg/close.svg" alt="" @click="closeDataDia">
@@ -142,9 +142,7 @@
                 </li>
                 <!-- 这个是占位的！ -->
                 <li class="sitting2"></li>
-                <li class="sitting2"></li>
-                <li class="sitting2"></li>
-                <li class="sitting2"></li>
+                
             </ul>
             
             
@@ -821,6 +819,11 @@ export default {
             }
             
         }
+
+
+        .dia-footer23 {
+            background-color: red;
+        }
     }
 
     .sitting2 {

src/pages/manage/index/index.vue

@@ -191,6 +191,7 @@ export default {
         &:focus {
             border-color: skyblue;
         }
+        
     }
 
     // 校验错误变红
@@ -198,6 +199,15 @@ export default {
         border-color: #f40!important;;
     }
 
+    /deep/.el-input {
+        // width: 15vw!important;
+        width: 100%;
+        input {
+            font-size: $font_size_All!important;
+        }
+        
+    }
+
     /deep/ .text-xl p {
         font-size: $font_size_All!important;
     }
@@ -234,10 +244,16 @@ export default {
     // }
     @media screen and (min-width: 1200px) and (max-width: 1700px) {
         /deep/.el-input {
-            width: 15vw!important;
+            // width: 15vw!important;
+            width: 100%;
+            input {
+                font-size: $font_size_All!important;
+            }
+            
         }
         /deep/ .idCard {
-            width: 15vw;
+            // width: 15vw;
+            width: 100%;
         }
     }
     @media screen and (min-width: 1200px) and (max-width: 1900px) {

src/pages/manage/list/ImportantCash/controlCash/cashOut.vue

@@ -140,7 +140,7 @@ import { addOperation } from '@/api/http';
 const moduleName = 'controlCash/cashOut'
 import { mapMutations, mapGetters } from 'vuex'
 import NeedBefore from '@/components/needBefore'
-import MyDialog from '@/components/dialog'
+import MyDialog from '@/components/dialogTwo'
 export default {
     name: 'index',
     components:{
@@ -342,7 +342,7 @@ export default {
     }
     .submitBtn{
         position: relative;
-        width: 300px;
+        width: 200px;
         font-size: 18px;
         height: 45px;
         margin-top: 50px;

src/pages/manage/list/ImportantCash/controlCash/cashPaid.vue

@@ -72,7 +72,7 @@ import { getNowDate } from '@/utils/utilFunction'
 const moduleName = 'controlCash/cashPaid'
 import { mapMutations, mapGetters } from 'vuex'
 import NeedBefore from '@/components/needBefore'
-import MyDialog from '@/components/dialog'
+import MyDialog from '@/components/dialogTwo'
 import { addOperation } from '@/api/http';
 export default {
     name: 'index',
@@ -218,7 +218,7 @@ export default {
 
     .submitBtn{
         position: relative;
-        width: 300px;
+        width: 200px;
         font-size: 18px;
         height: 45px;
         margin-top: 50px;

src/pages/manage/list/ImportantCash/controlCash/cashRecipients.vue

@@ -70,7 +70,7 @@
 <script>
 import { tableRowClassName, headerCellStyle } from '@/assets/js/myConfig'
 import { getNowDate } from '@/utils/utilFunction'
-import MyDialog from '@/components/dialog'
+import MyDialog from '@/components/dialogTwo'
 import NeedBefore from '@/components/needBefore'
 import { addOperation } from '@/api/http';
 

src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue

@@ -137,7 +137,7 @@ import { tableRowClassName, headerCellStyle, cellStyle } from '@/assets/js/myCon
 const moduleName = 'controlCash/cashTransferInto'
 import { mapMutations, mapGetters } from 'vuex'
 import NeedBefore from '@/components/needBefore'
-import MyDialog from '@/components/dialog'
+import MyDialog from '@/components/dialogTwo'
 import { addOperation } from '@/api/http';
 
 export default {

src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue

@@ -46,7 +46,7 @@
                 </el-form>
         </el-row>
         <el-button @click="submitClick" type="primary" class="submitBtn">提交</el-button>
-        <my-dialog :moduleName="moduleName"2 v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
+        <my-dialog-two :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
     </div>
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
 </template>
@@ -58,13 +58,13 @@ 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'
+import MyDialogTwo from '@/components/dialogTwo'
 import { addOperation } from '@/api/http';
 export default {
     name: 'index',
     components: {
         NeedBefore,
-        MyDialog2
+        MyDialogTwo
     },
     data() {
         return {
@@ -152,7 +152,7 @@ export default {
         submitClick() {
             this.$refs.form.validate(myValidate(() => {
                 if(this.form.number <= 0) {
-                     this.setTipsOperate('您的起始号码卡号比结束号码卡号排序更后,请检查一下哈。')
+                     this.setTipsOperate('您的起始号码卡号比结束号码卡号排序更后,请检查一下。')
                     return
                 }
                 this.visible = true
@@ -241,7 +241,7 @@ export default {
 
     .submitBtn{
         position: relative;
-        width: 300px;
+        width: 200px;
         font-size: 18px;
         height: 45px;
         margin-top: 50px;

src/pages/manage/list/ImportantCash/controlCash2/cashPaid.vue

@@ -75,7 +75,7 @@
             </el-table-column>
         </el-table>
         <el-button @click="submitClick" type="primary" class="submitBtn">提交</el-button>
-        <my-dialog :moduleName="moduleName"2 v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
+        <my-dialog-two :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
     </div>
 
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
@@ -88,13 +88,14 @@ import { getNowDate } from '@/utils/utilFunction'
 const moduleName = 'controlCash2/cashPaid'
 import { mapMutations, mapGetters } from 'vuex'
 import NeedBefore from '@/components/needBefore'
-import MyDialog2 from '@/components/dialog'
+import MyDialogTwo from '@/components/dialogTwo'
+
 import { addOperation } from '@/api/http';
 export default {
     name: 'index',
     components: {
         NeedBefore,
-        MyDialog2
+        MyDialogTwo
     },
     data() {
         return {
@@ -228,7 +229,7 @@ export default {
 
     .submitBtn{
         position: relative;
-        width: 300px;
+        width: 200px;
         font-size: 18px;
         height: 45px;
         margin-top: 50px;

src/pages/manage/list/ImportantCash/controlCash2/cashRecipients.vue

@@ -67,7 +67,7 @@
             </el-table-column>
         </el-table>
         <el-button @click="submitClick" type="primary" class="submitBtn">提交</el-button>
-        <my-dialog :moduleName="moduleName"2 v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
+        <my-dialog-two :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
     </div>
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
 </template>
@@ -80,12 +80,12 @@ import { addOperation } from '@/api/http';
 const moduleName = 'controlCash2/cashRecipients'
 import { mapMutations, mapGetters } from 'vuex'
 import NeedBefore from '@/components/needBefore'
-import MyDialog2 from '@/components/dialog'
+import MyDialogTwo from '@/components/dialogTwo'
 export default {
     name: 'index',
     components: {
         NeedBefore,
-        MyDialog2
+        MyDialogTwo
     },
     data() {
         return {
@@ -220,7 +220,7 @@ export default {
 
     .submitBtn{
         position: relative;
-        width: 300px;
+        width: 200px;
         font-size: 18px;
         height: 45px;
         margin-top: 50px;

src/pages/manage/list/ImportantCash/controlCash2/cashTransferInto.vue

@@ -49,7 +49,7 @@
                 </el-form>
         </el-row>
         <el-button @click="submitClick" type="primary" class="submitBtn">提交</el-button>
-        <my-dialog :moduleName="moduleName"2 v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
+        <my-dialog-two :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
     </div>
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
 </template>
@@ -61,13 +61,13 @@ 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'
+import MyDialogTwo from '@/components/dialogTwo'
 import { addOperation } from '@/api/http';
 export default {
     name: 'index',
     components: {
         NeedBefore,
-        MyDialog2
+        MyDialogTwo
     },
     data() {
         return {
@@ -146,7 +146,7 @@ export default {
         submitClick() {
             this.$refs.form.validate(myValidate(() => {
                 if(this.form.number <= 0) {
-                    this.setTipsOperate('您的起始号码卡号比结束号码卡号排序更后,请检查一下哈。')
+                    this.setTipsOperate('您的起始号码卡号比结束号码卡号排序更后,请检查一下。')
                     return
                 }
                 this.visible = true
@@ -233,7 +233,7 @@ export default {
 
     .submitBtn{
         position: relative;
-        width: 300px;
+        width: 200px;
         font-size: 18px;
         height: 45px;
         margin-top: 50px;

src/pages/manage/list/ImportantCash/controlCash3/index.vue

@@ -227,16 +227,18 @@ export default {
             this.form.number = number
         },
         submitIt() {
-            if(this.form.number <= 0) {
-                this.$message({
-                    message: '您的起始号码卡号比结束号码卡号排序更后,请检查一下哈。',
-                    type: 'warning',
-                    center: true
-                });
-                return
-            }
+            
 
             this.$refs.form.validate(myValidate(() => {
+                if(this.form.number <= 0) {
+                    // this.$message({
+                    //     message: '您的起始号码卡号比结束号码卡号排序更后,请检查一下。',
+                    //     type: 'warning',
+                    //     center: true
+                    // });
+                    this.setTipsOperate('您的起始号码卡号比结束号码卡号排序更后,请检查一下。')
+                    return
+                }
                 this.visible = true
             }, this.$refs));
         },
@@ -263,17 +265,21 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-    .submitBtn{
-        position: relative;
-        width: 200px;
-        font-size: 18px;
-        height: 45px;
-        margin-top: 50px;
-        border-radius: 10px;
-        bottom: 10px;
-        left: 50%;
-        transform: translate(-50%,-20%);
+    // .submitBtn{
+    //     position: relative;
+    //     width: 200px;
+    //     font-size: 18px;
+    //     height: 45px;
+    //     margin-top: 50px;
+    //     border-radius: 10px;
+    //     bottom: 10px;
+    //     left: 50%;
+    //     transform: translate(-50%,-20%);
+    // }
+    .el-input, .el-select {
+        width: 100%!important;
     }
+    
     .wrap{
         width: 100%;
         display: flex;
@@ -340,10 +346,10 @@ export default {
         }
         .submitBtn{
             position: relative;
-            width: 300px;
+            width: 200px;
             font-size: 18px;
             height: 45px;
-            margin-top: 50px;
+            margin-top: 180px;
             border-radius: 10px;
             bottom: 10px;
             left: 50%;

src/pages/manage/list/acceptanceDraft/invoice.vue

@@ -1,119 +1,122 @@
 // 个人客户
 <template>
-    <div class="wrap wrap2">
-        <MyTitle :titleArr="['客户信息', '个人客户信息建立']"/>
-        <div class="body">
-            <el-row :gutter="20">
-                <el-form ref="form" :model="form" label-width="140px" :rules="rules">
-                    <el-col :span="10"  :offset="1">
-                        <el-form-item label="出票人账号" prop="accountNumber">
-                            <el-input :value="form.accountNumber" @input="val => checkHanzi(val, form, 'accountNumber')" ref="accountNumber"></el-input>
-                        </el-form-item>
-                        <el-form-item label="出票人名称" prop="accountName">
-                            <el-input :value="form.accountName" @input="val => checkName(val, form, 'accountName')" ref="accountName"></el-input>
-                        </el-form-item>
-                        <el-form-item label="收款人账号" prop="collectionNumber">
-                            <el-input :value="form.collectionNumber" @input="val => checkHanzi(val, form, 'collectionNumber')" ref="collectionNumber"></el-input>
-                        </el-form-item>
-                        <el-form-item label="收款人名称" prop="collectionName">
-                            <el-input :value="form.collectionName" @input="val => checkName(val, form, 'collectionName')" ref="collectionName"></el-input>
-                        </el-form-item>
+    <div class="wrap">
+        <div class="wrap2">
+            <MyTitle :titleArr="['客户信息', '个人客户信息建立']"/>
+            <div class="body">
+                <el-row :gutter="20">
+                    <el-form ref="form" :model="form" label-width="140px" :rules="rules">
+                        <el-col :span="10"  :offset="1">
+                            <el-form-item label="出票人账号" prop="accountNumber">
+                                <el-input :value="form.accountNumber" @input="val => checkHanzi(val, form, 'accountNumber')" ref="accountNumber"></el-input>
+                            </el-form-item>
+                            <el-form-item label="出票人名称" prop="accountName">
+                                <el-input :value="form.accountName" @input="val => checkName(val, form, 'accountName')" ref="accountName"></el-input>
+                            </el-form-item>
+                            <el-form-item label="收款人账号" prop="collectionNumber">
+                                <el-input :value="form.collectionNumber" @input="val => checkHanzi(val, form, 'collectionNumber')" ref="collectionNumber"></el-input>
+                            </el-form-item>
+                            <el-form-item label="收款人名称" prop="collectionName">
+                                <el-input :value="form.collectionName" @input="val => checkName(val, form, 'collectionName')" ref="collectionName"></el-input>
+                            </el-form-item>
 
-                        <el-form-item label="币种" prop="currencyType">
-                            <el-select v-model="form.currencyType" placeholder="请选择" ref="currencyType">
-                                <el-option value="CNY人民币">CNY人民币</el-option>
-                            </el-select>
-                        </el-form-item>
+                            <el-form-item label="币种" prop="currencyType">
+                                <el-select v-model="form.currencyType" placeholder="请选择" ref="currencyType">
+                                    <el-option value="CNY人民币">CNY人民币</el-option>
+                                </el-select>
+                            </el-form-item>
 
-                        <el-form-item label="汇票号码" prop="moneyOrderNumber">
-                            <el-input :value="form.moneyOrderNumber" @input="val => checkHanzi(val, form, 'moneyOrderNumber')" ref="moneyOrderNumber"></el-input>
-                        </el-form-item>
-                        <el-form-item label="到期日期" prop="expireDate">
-                            <el-date-picker
-                                v-model="form.expireDate"
-                                type="date"
-                                placeholder="选择日期"
-                                ref="expireDate">
-                            </el-date-picker>
-                        </el-form-item>
-                        <el-form-item label="汇划费金额" prop="moneyOrderMoney">
-                            <el-input :value="form.moneyOrderMoney" @input="val => ismoney(val, form, 'moneyOrderMoney')" ref="moneyOrderMoney"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" :offset="1">
-                        <el-form-item label="出票人行名" prop="accountTradeName">
-                            <el-input :value="form.accountTradeName" @input="val => checkHanzi(val, form, 'accountTradeName')"></el-input>
-                        </el-form-item>
-                        <el-form-item label="出票行地址" prop="tradeAddress">
-                            <el-input v-model="form.tradeAddress" ref="tradeAddress"></el-input>
-                        </el-form-item>
-                        <el-form-item label="收款人行名" prop="collectionTradeName">
-                            <el-input :value="form.collectionTradeName" @input="val => checkHanzi(val, form, 'collectionTradeName')" ref="collectionTradeName"></el-input>
-                        </el-form-item>
-                        <el-form-item label="票据类型" prop="billType">
-                            <el-select v-model="form.billType" placeholder="请选择" ref="billType">
-                                <el-option value="银行承兑汇票">银行承兑汇票</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-form-item>
-                        <el-form-item label="出票日期" prop="drawBillDate">
-                            <el-date-picker
-                                v-model="form.drawBillDate"
-                                type="date"
-                                placeholder="选择日期"
-                                ref="drawBillDate">
-                            </el-date-picker>
-                        </el-form-item>
-                        <el-form-item label="是否转让" prop="isTransfer">
-                            <el-select v-model="form.isTransfer" placeholder="请选择" ref="isTransfer">
-                                <el-option value="是">是</el-option>
-                                <el-option value="否">否</el-option>
-                            </el-select>
+                            <el-form-item label="汇票号码" prop="moneyOrderNumber">
+                                <el-input :value="form.moneyOrderNumber" @input="val => checkHanzi(val, form, 'moneyOrderNumber')" ref="moneyOrderNumber"></el-input>
+                            </el-form-item>
+                            <el-form-item label="到期日期" prop="expireDate">
+                                <el-date-picker
+                                    v-model="form.expireDate"
+                                    type="date"
+                                    placeholder="选择日期"
+                                    ref="expireDate">
+                                </el-date-picker>
+                            </el-form-item>
+                            <el-form-item label="汇划费金额" prop="moneyOrderMoney">
+                                <el-input :value="form.moneyOrderMoney" @input="val => ismoney(val, form, 'moneyOrderMoney')" ref="moneyOrderMoney"></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="10" :offset="1">
+                            <el-form-item label="出票人行名" prop="accountTradeName">
+                                <el-input :value="form.accountTradeName" @input="val => checkHanzi(val, form, 'accountTradeName')"></el-input>
+                            </el-form-item>
+                            <el-form-item label="出票行地址" prop="tradeAddress">
+                                <el-input v-model="form.tradeAddress" ref="tradeAddress"></el-input>
+                            </el-form-item>
+                            <el-form-item label="收款人行名" prop="collectionTradeName">
+                                <el-input :value="form.collectionTradeName" @input="val => checkHanzi(val, form, 'collectionTradeName')" ref="collectionTradeName"></el-input>
+                            </el-form-item>
+                            <el-form-item label="票据类型" prop="billType">
+                                <el-select v-model="form.billType" placeholder="请选择" ref="billType">
+                                    <el-option value="银行承兑汇票">银行承兑汇票</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-form-item>
+                            <el-form-item label="出票日期" prop="drawBillDate">
+                                <el-date-picker
+                                    v-model="form.drawBillDate"
+                                    type="date"
+                                    placeholder="选择日期"
+                                    ref="drawBillDate">
+                                </el-date-picker>
+                            </el-form-item>
+                            <el-form-item label="是否转让" prop="isTransfer">
+                                <el-select v-model="form.isTransfer" placeholder="请选择" ref="isTransfer">
+                                    <el-option value="是">是</el-option>
+                                    <el-option 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-form-item>
+                        </el-col>
+
+                    </el-form>
+                </el-row>
+            </div>
+            <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
+            <!-- <el-dialog
+                style="margin-top:10vh"
+                :visible.sync="visible"
+                :modal="false"
+                width="40%"
+                :close-on-click-modal="false" 
+                :show-close="false" 
+                custom-class="data-dia">
+                <div slot="title" class="dia-header">
+                    <div class="data-title">提交</div>
+                </div>
+                <div class="popBody" v-if="!authorization&&!success">
+                    <h2>本业务需要授权</h2>
+                </div>
+                <div class="popBody" v-if="authorization&&!success">
+                    <el-form ref="form" :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="手续费金额" prop="serviceCharge">
-                            <el-input :value="form.serviceCharge" @input="val => ismoney(val, form, 'serviceCharge')" ref="serviceCharge"></el-input>
+                        <el-form-item label="授权柜员">
+                            <el-input type="password" disabled v-model="disForm.pass"></el-input>
                         </el-form-item>
-                    </el-col>
-
-                </el-form>
-            </el-row>
+                    </el-form>
+                </div>
+                <div class="popBody" v-if="success">
+                    <h2>完成表单form</h2>
+                </div>
+                <div class="popBtns">
+                    <el-button class="close btn" @click="[visible = false,authorization=false,success=false]">取 消</el-button>
+                    <el-button class="sure btn" type="primary" @click="popSure">确 定</el-button>
+                </div>
+            </el-dialog> -->
         </div>
-        <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
-        <!-- <el-dialog
-            style="margin-top:10vh"
-            :visible.sync="visible"
-            :modal="false"
-            width="40%"
-            :close-on-click-modal="false" 
-            :show-close="false" 
-            custom-class="data-dia">
-            <div slot="title" class="dia-header">
-                <div class="data-title">提交</div>
-            </div>
-            <div class="popBody" v-if="!authorization&&!success">
-                <h2>本业务需要授权</h2>
-            </div>
-            <div class="popBody" v-if="authorization&&!success">
-                <el-form ref="form" :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-if="success">
-                <h2>完成表单form</h2>
-            </div>
-            <div class="popBtns">
-                <el-button class="close btn" @click="[visible = false,authorization=false,success=false]">取 消</el-button>
-                <el-button class="sure btn" type="primary" @click="popSure">确 定</el-button>
-            </div>
-        </el-dialog> -->
     </div>
+    
 </template>
 
 <script>

src/pages/manage/list/dayEnd/branchDayEnd.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="wrap">
+    <div class="wrap2">
         <div class="title">
             <p>日终管理</p>
             <i class="el-icon-arrow-right"></i>
@@ -18,8 +18,9 @@
                     </el-form-item>
                 </el-form>
             </el-row>
-            <el-button @click="submitIt()" type="primary" class="submitBtn" v-throttle>提交</el-button>
+            
         </div>
+        <el-button @click="submitIt()" type="primary" class="submitBtn" v-throttle>提交</el-button>
     </div>
 </template>
 
@@ -75,71 +76,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-    .wrap{
-        width: 100%;
-        display: flex;
-        flex-direction: column;
-        overflow: auto;
-        padding: 24px 0 24px 24px;
-        .nav{
-            /deep/ .el-menu.el-menu--horizontal{
-                border: 0;
-            }
-            /deep/ .el-menu--horizontal > .el-menu-item.is-active{
-                border:2px solid #568DF2;
-                border-radius: 10px;
-                color: #000;
-            }
-            /deep/ .el-menu--horizontal > .el-menu-item{
-                border: 2px solid transparent;
-                border-radius: 10px;
-                margin-right: 10px;
-                height: 30px;
-                line-height: 28px;
-            }
-        }
     
-        .body{
-            margin-top: 50px;
-            overflow: auto;
-        }
-        .submitBtn{
-            position: relative;
-            width: 300px;
-            font-size: 18px;
-            height: 45px;
-            margin-top: 50px;
-            border-radius: 10px;
-            bottom: 10px;
-            left: 50%;
-            transform: translate(-50%,-20%);
-        }
-        .popBody{
-            min-height: 200px;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            text-align: center;
-        }
-        .popBtns{
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            .btn{
-                width: 180px;
-                border-radius: 10px;
-                font-size: 18px;
-            }
-            .close{
-                background: #CFDEFF;
-                color: #6191FF;
-            }
-            .sure{
-                background: #6191FF;
-                color: #fff;
-            }
-        }
-    }
 
     /deep/.el-input input {
         width: 420px;

src/pages/manage/list/dayEnd/tellerCash.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="wrap">
+    <div class="wrap2">
         <div class="title">
             <p>日终管理</p>
             <i class="el-icon-arrow-right"></i>
@@ -150,30 +150,6 @@ export default {
     .bggray {
         background-color: gray;
     }
-    .wrap{
-        width: 100%;
-        display: flex;
-        flex-direction: column;
-        overflow: auto;
-        padding: 24px 0 24px 24px;
-        position: relative;
-        
-        .body{
-            margin-top: 50px;
-            overflow: auto;
-        }
-        .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-input input {
         text-align: center;

src/pages/manage/list/dayEnd/tellerCertificate.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="wrap">
+    <div class="wrap2">
         <div class="title">
             <p>日终管理</p>
             <i class="el-icon-arrow-right"></i>
@@ -137,101 +137,7 @@ export default {
 
 <style lang="scss" scoped>
     @import '@/assets/css/tablebg.scss';
-    .wrap{
-        width: 100%;
-        display: flex;
-        flex-direction: column;
-        overflow: hidden;
-        padding: 24px 0 24px 24px;
-        position: relative;
-        .nav{
-            /deep/ .el-menu.el-menu--horizontal{
-                border: 0;
-            }
-            /deep/ .el-menu--horizontal > .el-menu-item.is-active{
-                border:2px solid #568DF2;
-                border-radius: 10px;
-                color: #000;
-            }
-            /deep/ .el-menu--horizontal > .el-menu-item{
-                border: 2px solid transparent;
-                border-radius: 10px;
-                margin-right: 10px;
-                height: 30px;
-                line-height: 28px;
-            }
-        }
     
-        .body{
-            margin-top: 50px;
-            overflow: auto;
-            .idCard{
-                border-radius: 5px;
-                background: #CFDDFF;
-                text-align: center;
-                height: 40px;
-                line-height: 40px;
-                font-size: 18px;
-                color: #6191FF;
-            }
-            .add{
-                position: relative;
-                &::after{
-                    content: '';
-                    display: block;
-                    position: absolute;
-                    right: 3%;
-                    top: -4%;
-                    border: 1px dashed #CFDDFF;
-                    width: 88%;
-                    height: 268px;
-                }
-                .addBtn{
-                    position: absolute;
-                    left: 0;
-                    top: 50%;
-                    transform: translate(50%,-50%);
-                    font-size: 22px;
-                }
-            }
-        }
-        .submitBtn{
-            position: relative;
-            width: 300px;
-            font-size: 18px;
-            height: 45px;
-            margin-top: 50px;
-            border-radius: 10px;
-            bottom: 10px;
-            left: 50%;
-            transform: translate(-50%,-20%);
-        }
-        .popBody{
-            min-height: 200px;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            text-align: center;
-        }
-        .popBtns{
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            .btn{
-                width: 180px;
-                border-radius: 10px;
-                font-size: 18px;
-            }
-            .close{
-                background: #CFDEFF;
-                color: #6191FF;
-            }
-            .sure{
-                background: #6191FF;
-                color: #fff;
-            }
-        }
-    }
     /deep/.numrule input {
         appearance: textField!important;
         -webkit-appearance: textField!important;

src/pages/manage/list/servicesAccount/passwordLost.vue

@@ -47,7 +47,7 @@
 </template>
 <script>
 import { vercustomer } from '@/utils/verify.js'
-import { myValidate, checkHanzi, checkName, autoPlay, autoPlay2 } from '@/utils/utilFunction.js'
+import { myValidate, checkHanzi, checkName, autoPlay, autoPlay2, messageIdCard, messageCard, messagePassword } from '@/utils/utilFunction.js'
 import MyTitle from '@/components/myTitle'
 
 const moduleName = 'servicesAccount/passwordLost'
@@ -69,7 +69,6 @@ export default{
             moduleName: 'servicesAccount/passwordLost',
             idNumberJudge: false,
             cardNumberJudge: false,
-            idNumberJudge: false,
             visible: false,
             form:{
                 // 必填项
@@ -210,6 +209,14 @@ export default{
             //     });
             // }).catch((error)=>{
             // })
+            if(!this.form.voucherNumber) {
+                messageCard('请刷卡识别账号')
+                return
+            }
+            if(!this.form.idNumber) {
+                messageIdCard('请刷身份证')
+                return
+            }
             this.$refs.form.validate(myValidate(() => {
                 this.visible = true;
             }, this.$refs));

src/styles/system.scss

@@ -13,7 +13,7 @@
     }
     .submitBtn{
         position: relative;
-        width: 10vw!important;
+        width: 200px!important;
         font-size: 18px;
         min-height: 45px;
         border-radius: 10px;

src/utils/utilFunction.js

@@ -2,6 +2,7 @@ import { MessageBox, Message } from 'element-ui';
 import { addOperation, getOperation } from '@/api/http';
 
 
+
 const phoneListen = function(val, form, prop) {
     if(/^[0-9]*$/.test(val)) {
         form[prop] = val;
@@ -267,6 +268,7 @@ const getNowDate = () => {
 }
 
 const messageIdCard = (message='请刷身份证') => {
+    console.log('=*************************')
     Message.warning({
         center: true,
         message,