From 567d2db326c940e2b43053ab2f0dc2ececb69e10 Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Fri, 4 Mar 2022 18:26:11 +0800
Subject: [PATCH 1/4] update

---
 src/components/dialog/index.vue               | 37 ++++++++++++++-----
 src/components/dialog2/index.vue              | 28 +++++++++++++-
 src/pages/counter/list/index.vue              | 25 ++++++++-----
 src/pages/lobbyManager/list/index.vue         | 17 +++++----
 .../ImportantCash/controlCash/cashOut.vue     |  3 +-
 .../ImportantCash/controlCash/cashPaid.vue    |  3 +-
 .../controlCash/cashRecipients.vue            |  5 ++-
 .../controlCash/cashTransferInto.vue          |  5 ++-
 .../ImportantCash/controlCash2/cashOut.vue    |  3 +-
 .../ImportantCash/controlCash2/cashPaid.vue   |  3 +-
 .../controlCash2/cashRecipients.vue           |  3 +-
 .../controlCash2/cashTransferInto.vue         |  3 +-
 .../list/ImportantCash/controlCash3/index.vue |  5 ++-
 src/pages/manage/list/business/deposit.vue    |  2 +-
 .../manage/list/business/openAccount.vue      |  2 +-
 src/pages/manage/list/business/transfer.vue   |  2 +-
 src/pages/manage/list/business/withdrawal.vue |  2 +-
 .../manage/list/client/consumerClient.vue     |  2 +-
 .../manage/list/client/corporateClient.vue    |  2 +-
 .../personal/callDeposits/accountClosed.vue   |  2 +-
 .../personal/callDeposits/openAccount.vue     |  2 +-
 .../currentAccount/accountCancellation.vue    |  2 +-
 .../list/personal/currentAccount/deposit.vue  |  2 +-
 .../personal/currentAccount/openAccount.vue   |  2 +-
 .../list/personal/currentAccount/settle.vue   |  2 +-
 .../currentAccount/transferAccounts.vue       |  2 +-
 .../personal/currentAccount/withdrawal.vue    |  2 +-
 .../list/personal/timeDeposit/deposit.vue     |  2 +-
 .../list/personal/timeDeposit/openAccount.vue |  2 +-
 .../list/personal/timeDeposit/withdrawal.vue  |  2 +-
 .../personal/usefulPhrases/accountClosed.vue  |  2 +-
 .../usefulPhrases/continueDeposit.vue         |  2 +-
 .../personal/usefulPhrases/openAccount.vue    |  2 +-
 .../list/servicesAccount/passwordChange.vue   |  2 +-
 .../list/servicesAccount/passwordLost.vue     |  2 +-
 .../list/servicesAccount/relieveLost.vue      |  2 +-
 36 files changed, 123 insertions(+), 63 deletions(-)

diff --git a/src/components/dialog/index.vue b/src/components/dialog/index.vue
index d796bea..9a85d82 100644
--- a/src/components/dialog/index.vue
+++ b/src/components/dialog/index.vue
@@ -17,7 +17,7 @@
             <div slot="title" class="dia-header rounded-3xl">
                 <div class="data-title" v-if="flow === 1 || flow === 2">提示</div>
                 <div class="data-title" v-else-if="flow === 4">提交</div>
-                <div class="data-title" v-else>提交成功</div>
+                <div class="data-title" v-else>{{ successName }}</div>
             </div>
             <div class="popBody" v-if="flow === 1">
                 <h2 class="text-red-500 text-2xl">本业务需要授权</h2>
@@ -65,14 +65,6 @@
             
             
             
-            
-            
-            
-            
-            
-            
-            
-            
             <!-- <div width="900px" class="data-dia23 max-h-screen 2xl:-mt-20;" ref="dataDia" v-drag>
                 <div class="dia-header">
                     <div class="data-title" v-if="flow === 1 || flow === 2">授权</div>
@@ -131,6 +123,25 @@
 </template>
 
 <script>
+const obj = {
+    // 'consumerClient': '/counter/list/manage/consumerClient',
+    // 'currentAccount/openAccount': '/counter/list/manage/currentAccount',
+    // 'currentAccount/deposit': '/counter/list/manage/currentAccount'
+    'consumerClient': '个人客户信息建立',
+    'corporateClient': '公司客户信息建立',
+    'currentAccount/openAccount': '活期业务开户',
+    'currentAccount/deposit': '活期业务存款',
+    'currentAccount/withdrawal': '活期业务取款',
+    'currentAccount/transferAccounts': '活期业务转账',
+    'currentAccount/settle': '活期业务结清',
+    'currentAccount/Cancell': '活期业务销户',
+    'timeDeposit/openAccount': '整存整取开户',
+    'timeDeposit/deposit': '整存整取存款',
+    'timeDeposit/withdrawal': '整存整取取款',
+    'timeDeposit/deposit': '整存整取存款',
+    'business/openAccount': '公司业务开户',
+    'spacial': '提交'
+}
 const nameMap = {
     sex: {
         1: '男',
@@ -328,6 +339,10 @@ export default {
         depositNumber: {
             type: String,
             default: ''
+        },
+        moduleName: {
+            type: String,
+            default: 'spacial'
         }
     },
     created() {
@@ -367,6 +382,7 @@ export default {
             }
             return str;
         }
+
         if(num%2 === 1) {
             this.leftObj['流水号'] = tmpFunc2()
             this.leftObj['经办机构'] = '国税支行营业部'
@@ -437,6 +453,9 @@ export default {
             return (val, key) => {
                 return key + ': ' + val
             }
+        },
+        successName() {
+            return obj[ this.moduleName ] + '成功'
         }
     }
 }
diff --git a/src/components/dialog2/index.vue b/src/components/dialog2/index.vue
index eb92996..29aad8c 100644
--- a/src/components/dialog2/index.vue
+++ b/src/components/dialog2/index.vue
@@ -9,7 +9,7 @@
         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 class="data-title" v-else>{{ successName }}</div>
         </div>
         <div class="popBody" v-if="flow === 1">
             <h2 class="text-red-500 text-2xl">本业务需要授权</h2>
@@ -51,6 +51,25 @@
 </template>
 
 <script>
+const obj = {
+    // 'consumerClient': '/counter/list/manage/consumerClient',
+    // 'currentAccount/openAccount': '/counter/list/manage/currentAccount',
+    // 'currentAccount/deposit': '/counter/list/manage/currentAccount'
+    'consumerClient': '个人客户信息建立',
+    'corporateClient': '公司客户信息建立',
+    'currentAccount/openAccount': '活期业务开户',
+    'currentAccount/deposit': '活期业务存款',
+    'currentAccount/withdrawal': '活期业务取款',
+    'currentAccount/transferAccounts': '活期业务转账',
+    'currentAccount/settle': '活期业务结清',
+    'currentAccount/Cancell': '活期业务销户',
+    'timeDeposit/openAccount': '整存整取开户',
+    'timeDeposit/deposit': '整存整取存款',
+    'timeDeposit/withdrawal': '整存整取取款',
+    'timeDeposit/deposit': '整存整取存款',
+    'business/openAccount': '公司业务开户',
+    'spacial': '提交'
+}
 const nameMap = {
     sex: {
         1: '男',
@@ -191,6 +210,10 @@ const nameMap = {
 
 export default {
     props: {
+        moduleName: {
+            type: String,
+            default: 'spacial'
+        },
         visible: {
             type: Boolean,
             default: false
@@ -267,6 +290,9 @@ export default {
         
     },
     methods: {
+        successName() {
+            return obj[ this.moduleName ] + '成功'
+        },
         cancel() {
             this.visible = false;
         },
diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index 0d00aa2..d81e494 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -158,9 +158,9 @@
                         <p>{{item.name}}</p>
                     </div>
                 </div>
-                <div class="box right flex flex-col justify-items-center items-center" ref="popUpSeal">
+                <div class="bg-gray-400 box right min-h-full" ref="popUpSeal">
                     <!-- receptionList -->
-                    <div class="img-wrap2 max-h-96" :class="{ checked: commonChecked.includes(item.id) }" v-for="(item, index) in goodState" @click='dislodgeItem(index)' :key="item.id" >
+                    <div class="img-wrap2" :class="{ checked: commonChecked.includes(item.id) }" v-for="(item, index) in goodState" @click='dislodgeItem(index)' :key="item.id" >
                         <img v-if="item.name.includes('复印件')" :src="item.src" class="fileSeal"  :alt="item.name" :title="item.name" />
                         <el-image
                             width="100%"
@@ -287,7 +287,7 @@
             
 
             <div class="dia-footer">
-                <button v-throttle @click="popSure" class="w-1/5" type="button">确定</button>
+                <button v-throttle @click="popSure" class="w-20" type="button">确定</button>
                 <!-- <el-button type="primary" v-throttle @click="popSure">确定</el-button> -->
             </div>
         </div>
@@ -1208,6 +1208,7 @@ export default {
         // console.log(this.getSelectList.accountQualitySelectList)
     },
     mounted(){
+
         let that = this
         // 拖拽-物品栏
         new Sortable(this.$refs.goods, {
@@ -1262,8 +1263,10 @@ export default {
                         
                         // 印章的拖拽
                         else if(that.$refs.popUpSeal) {
-                            that.outThingsGoods([that.goodsShelfTotalData[evt.oldIndex].id])
-                            that.pushThings({ idArr: [ that.goodsShelfTotalData[evt.oldIndex].id ], name: that.myMap})
+
+                            const id = that.goodsShelfTotalData[evt.oldIndex].id
+                            that.outThingsGoods([ id ])
+                            that.pushThings({ idArr: [  id  ], name: that.myMap})
                             
                         }
                         
@@ -3131,6 +3134,7 @@ export default {
         padding: 20px 300px   20px 300px;
         transition: all 0.5s;
         background-color: rgba(255, 255, 255, 0.95);
+        min-height: 140px;
         .file {
             position: relative;
             min-width: 140px;
@@ -3475,15 +3479,16 @@ export default {
         }
         .right{
             margin-left: 5%;
-            
-            
-            
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
         }
         .else{
             width: 100%;
         }
         .img-wrap2{
-            width: 100%;
+            width: 95%;
             height: 100%;
             display: flex;
             flex-direction: column;
@@ -3508,7 +3513,7 @@ export default {
         margin-top: 30px;
         text-align: center;
         button {
-            width: 10vw;
+            width: 7vw;
         }
         // button {
         //     width: 100px;
diff --git a/src/pages/lobbyManager/list/index.vue b/src/pages/lobbyManager/list/index.vue
index a598828..880c6b2 100644
--- a/src/pages/lobbyManager/list/index.vue
+++ b/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%" @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">
@@ -159,7 +159,7 @@
                 <img class="close" src="@/assets/svg/close.svg" alt="" @click="closeCopyDia">
             </div>
             <p class="tips">- 请单击选中复印材料、双击可放大预览 -</p>
-            <ul  class="flex justify-center ">
+            <ul  class="flex justify-center">
                 <div  v-for="item in elImg2"  class="list flex-col spacialStyle"  @click="checkData(item.key, item.copyState)" :key="item.key">
                     <li :class="{checked: checkList.includes(item.key)}">
                         <!-- <img :src="item.img" :title="item.name" :alt="item.name"> -->
@@ -170,7 +170,7 @@
                             ></el-image>
                         <p>{{ item.name }}</p>
                     </li>
-                    <p v-show="item.copyState">已复印</p>
+                    <p>{{ item.copyState?'已复印': '待复印' }}</p>
                 </div>
             </ul>
             <div class="dia-footer">
@@ -186,7 +186,7 @@
             </div>
             <p class="tips">- 请单击选中复印材料、双击可放大预览 -</p>
             <ul class="flex justify-center" >
-                <div  v-for="item in elImg2"  class="list flex-col"  @click="checkData(item.key, item.returnState)" :key="item.key">
+                <div  v-for="item in elImg2"  class="list flex-col spacialStyle"  @click="checkData(item.key, item.returnState)" :key="item.key">
                     <li :class="{checked: checkList.includes(item.key)}">
                         <!-- <img :src="item.img" :title="item.name" :alt="item.name"> -->
                         <el-image
@@ -195,7 +195,7 @@
                             ></el-image>
                         <p>{{ item.name }}</p>
                     </li>
-                    <p v-show="item.returnState">已取回</p>
+                    <p>{{ item.returnState? '已取回': '待取回' }}</p>
                 </div>
             </ul>
             <div class="dia-footer">
@@ -743,7 +743,6 @@ export default {
             }
         }
         .list {
-            max-height: 30vh;
             min-width: 5vw;
             overflow: auto;
             display: flex;
@@ -781,7 +780,7 @@ export default {
                 }
             }
         }
-
+        
         .list2 {
             max-height: 30vh;
             min-width: 5vw;
@@ -820,6 +819,7 @@ export default {
                     line-height: 40px;
                 }
             }
+            
         }
     }
 
@@ -829,6 +829,7 @@ export default {
     }
 
     .spacialStyle {
-        width: 30%!important;
+        margin: 0;
+        width: auto!important;
     }
 </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 161c116..b99e1f8 100644
--- a/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue
+++ b/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue
@@ -127,7 +127,7 @@
             </el-row>
             <el-button @click="submitClick" type="primary" class="submitBtn" v-throttle>提交</el-button>
         </el-form>
-        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
+        <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
     </div>
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
 </template>
@@ -149,6 +149,7 @@ export default {
     },
     data() {
         return {
+            moduleName,
             headerCellStyle: headerCellStyle,
             cellStyle: cellStyle,
             text:'柜员现金轧账',/* 顶部文字 */
diff --git a/src/pages/manage/list/ImportantCash/controlCash/cashPaid.vue b/src/pages/manage/list/ImportantCash/controlCash/cashPaid.vue
index 7ea0fec..44db1a7 100644
--- a/src/pages/manage/list/ImportantCash/controlCash/cashPaid.vue
+++ b/src/pages/manage/list/ImportantCash/controlCash/cashPaid.vue
@@ -60,7 +60,7 @@
             </el-table-column>
         </el-table>
         <el-button @click="submitClick" type="primary" class="submitBtn" v-throttle>提交</el-button>
-        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" :needAuth="false" />
+        <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" :needAuth="false" />
     </div>
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
 </template>
@@ -82,6 +82,7 @@ export default {
     },
     data() {
         return {
+            moduleName,
             headerCellStyle: headerCellStyle,
             text:'柜员现金轧账',/* 顶部文字 */
             visible: false,
diff --git a/src/pages/manage/list/ImportantCash/controlCash/cashRecipients.vue b/src/pages/manage/list/ImportantCash/controlCash/cashRecipients.vue
index 3191546..a64ff27 100644
--- a/src/pages/manage/list/ImportantCash/controlCash/cashRecipients.vue
+++ b/src/pages/manage/list/ImportantCash/controlCash/cashRecipients.vue
@@ -61,7 +61,7 @@
             </el-table-column>
         </el-table>
         <el-button @click="submitClick" type="primary" class="submitBtn" v-throttle>提交</el-button>
-        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
+        <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
     </div>
 
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
@@ -84,6 +84,7 @@ export default {
     },
     data() {
         return {
+            moduleName,
             headerCellStyle: headerCellStyle,
             visible: false,
             unNeed: false,
@@ -219,7 +220,7 @@ export default {
 
     .submitBtn{
         position: relative;
-        width: 300px;
+        width: 200px;
         font-size: 18px;
         height: 45px;
         margin-top: 50px;
diff --git a/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue b/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue
index 5c287bf..7f4acd5 100644
--- a/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue
+++ b/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue
@@ -126,7 +126,7 @@
             
             <el-button @click="submitClick" type="primary" class="submitBtn" v-throttle>提交</el-button>
         </el-form>
-        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" :needAuth='false' />
+        <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" :needAuth='false' />
     </div>
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
 </template>
@@ -148,6 +148,7 @@ export default {
     },
     data() {
         return {
+            moduleName,
             headerCellStyle: headerCellStyle,
             cellStyle: cellStyle,
             text:'柜员现金轧账',/* 顶部文字 */
@@ -326,7 +327,7 @@ export default {
     }
     .submitBtn{
         position: relative;
-        width: 300px;
+        width: 200px;
         font-size: 18px;
         height: 45px;
         margin-top: 50px;
diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue
index d91b79b..0906388 100644
--- a/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue
+++ b/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-dialog2 v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
+        <my-dialog :moduleName="moduleName"2 v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
     </div>
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
 </template>
@@ -68,6 +68,7 @@ export default {
     },
     data() {
         return {
+            moduleName,
             headerCellStyle: headerCellStyle,
             text:'柜员现金轧账',/* 顶部文字 */
             visible: false,
diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashPaid.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashPaid.vue
index f958c52..44e67d1 100644
--- a/src/pages/manage/list/ImportantCash/controlCash2/cashPaid.vue
+++ b/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-dialog2 v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
+        <my-dialog :moduleName="moduleName"2 v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
     </div>
 
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
@@ -98,6 +98,7 @@ export default {
     },
     data() {
         return {
+            moduleName,
             headerCellStyle: headerCellStyle,
             text:'柜员现金轧账',/* 顶部文字 */
             visible: false,
diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashRecipients.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashRecipients.vue
index 3d7e4b5..5c0afa1 100644
--- a/src/pages/manage/list/ImportantCash/controlCash2/cashRecipients.vue
+++ b/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-dialog2 v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
+        <my-dialog :moduleName="moduleName"2 v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
     </div>
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
 </template>
@@ -89,6 +89,7 @@ export default {
     },
     data() {
         return {
+            moduleName,
             headerCellStyle: headerCellStyle,
             text:'柜员现金轧账',/* 顶部文字 */
             visible: false,
diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashTransferInto.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashTransferInto.vue
index 60ed583..2931344 100644
--- a/src/pages/manage/list/ImportantCash/controlCash2/cashTransferInto.vue
+++ b/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-dialog2 v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
+        <my-dialog :moduleName="moduleName"2 v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
     </div>
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
 </template>
@@ -71,6 +71,7 @@ export default {
     },
     data() {
         return {
+            moduleName,
             headerCellStyle: headerCellStyle,
             text:'柜员现金轧账',/* 顶部文字 */
             visible: false,
diff --git a/src/pages/manage/list/ImportantCash/controlCash3/index.vue b/src/pages/manage/list/ImportantCash/controlCash3/index.vue
index c78158a..dbb1b4c 100644
--- a/src/pages/manage/list/ImportantCash/controlCash3/index.vue
+++ b/src/pages/manage/list/ImportantCash/controlCash3/index.vue
@@ -62,7 +62,7 @@
             </el-form>
         </el-row>
         <el-button @click="submitIt()" type="primary" class="submitBtn">提交</el-button>
-        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
+        <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
     </div>
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" class="wrap" /> -->
 </template>
@@ -85,6 +85,7 @@ export default {
     },
     data() {
         return {
+            moduleName,
             visible: false,
             unNeed: false,
             isNeedBefore: '',
@@ -264,7 +265,7 @@ export default {
 <style lang="scss" scoped>
     .submitBtn{
         position: relative;
-        width: 300px;
+        width: 200px;
         font-size: 18px;
         height: 45px;
         margin-top: 50px;
diff --git a/src/pages/manage/list/business/deposit.vue b/src/pages/manage/list/business/deposit.vue
index 74aad6a..050a888 100644
--- a/src/pages/manage/list/business/deposit.vue
+++ b/src/pages/manage/list/business/deposit.vue
@@ -42,7 +42,7 @@
                 </el-form>
             </el-row>
             <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
-            <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" :needAuth='needAuth' />
+            <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" :needAuth='needAuth' />
         </div>
     </div>
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" class="wrap" /> -->
diff --git a/src/pages/manage/list/business/openAccount.vue b/src/pages/manage/list/business/openAccount.vue
index d0ed140..c70d34a 100644
--- a/src/pages/manage/list/business/openAccount.vue
+++ b/src/pages/manage/list/business/openAccount.vue
@@ -82,7 +82,7 @@
                 </el-form>
             </el-row>
             <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
-            <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
+            <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
         </div>
     </div>
 
diff --git a/src/pages/manage/list/business/transfer.vue b/src/pages/manage/list/business/transfer.vue
index cb5f63a..dfb5626 100644
--- a/src/pages/manage/list/business/transfer.vue
+++ b/src/pages/manage/list/business/transfer.vue
@@ -65,7 +65,7 @@
                 </el-form>
             </el-row>
             <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
-            <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" :needAuth="needAuth" />
+            <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" :needAuth="needAuth" />
         </div>
     </div>
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" class="wrap" /> -->
diff --git a/src/pages/manage/list/business/withdrawal.vue b/src/pages/manage/list/business/withdrawal.vue
index facaafb..24ebe28 100644
--- a/src/pages/manage/list/business/withdrawal.vue
+++ b/src/pages/manage/list/business/withdrawal.vue
@@ -64,7 +64,7 @@
                 </el-form>
             </el-row>
             <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
-            <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" :needAuth='needAuth' />
+            <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" :needAuth='needAuth' />
         </div>
     </div>
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" class="wrap" /> -->
diff --git a/src/pages/manage/list/client/consumerClient.vue b/src/pages/manage/list/client/consumerClient.vue
index df2dfca..eab2da4 100644
--- a/src/pages/manage/list/client/consumerClient.vue
+++ b/src/pages/manage/list/client/consumerClient.vue
@@ -74,7 +74,7 @@
             <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
         </div>
         
-        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2()" />
+        <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2()" />
     </div>
     <!-- <need-before class='wrap' v-else :moduleName='needBefore' :unNeed="unNeed">
     </need-before> -->
diff --git a/src/pages/manage/list/client/corporateClient.vue b/src/pages/manage/list/client/corporateClient.vue
index 8a997b4..1c6adda 100644
--- a/src/pages/manage/list/client/corporateClient.vue
+++ b/src/pages/manage/list/client/corporateClient.vue
@@ -50,7 +50,7 @@
             <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
         </div>
         
-        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
+        <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
     </div>
 
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" class="wrap" /> -->
diff --git a/src/pages/manage/list/personal/callDeposits/accountClosed.vue b/src/pages/manage/list/personal/callDeposits/accountClosed.vue
index 2a7cee6..b32ebc5 100644
--- a/src/pages/manage/list/personal/callDeposits/accountClosed.vue
+++ b/src/pages/manage/list/personal/callDeposits/accountClosed.vue
@@ -92,7 +92,7 @@
             </el-form>
         </el-row>
         <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
-        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" depositNumber='0812' />
+        <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" depositNumber='0812' />
     </div>
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
 </template>
diff --git a/src/pages/manage/list/personal/callDeposits/openAccount.vue b/src/pages/manage/list/personal/callDeposits/openAccount.vue
index d63171a..237dbff 100644
--- a/src/pages/manage/list/personal/callDeposits/openAccount.vue
+++ b/src/pages/manage/list/personal/callDeposits/openAccount.vue
@@ -75,7 +75,7 @@
             </el-form>
         </el-row>
         <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
-        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" depositNumber='0812' />
+        <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" depositNumber='0812' />
     </div>
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
 </template>
diff --git a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
index 65480cf..34b7c03 100644
--- a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
+++ b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
@@ -37,7 +37,7 @@
             </el-form>
         </el-row>
         <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
-        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
+        <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
     </div>
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
 </template>
diff --git a/src/pages/manage/list/personal/currentAccount/deposit.vue b/src/pages/manage/list/personal/currentAccount/deposit.vue
index 6e20d7c..343f640 100644
--- a/src/pages/manage/list/personal/currentAccount/deposit.vue
+++ b/src/pages/manage/list/personal/currentAccount/deposit.vue
@@ -45,7 +45,7 @@
                 </el-form>
             </el-row>
             <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
-            <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" :needAuth="false" />
+            <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" :needAuth="false" />
     </div>
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
     
diff --git a/src/pages/manage/list/personal/currentAccount/openAccount.vue b/src/pages/manage/list/personal/currentAccount/openAccount.vue
index 09b8aa2..d920756 100644
--- a/src/pages/manage/list/personal/currentAccount/openAccount.vue
+++ b/src/pages/manage/list/personal/currentAccount/openAccount.vue
@@ -230,7 +230,7 @@
         
       <el-button @click="formSubmit" type="primary" class="submitBtn" v-throttle>提交</el-button>
     </div>
-    <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="popSure" :needAuth="false" />
+    <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="popSure" :needAuth="false" />
   
 </div>
 <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
diff --git a/src/pages/manage/list/personal/currentAccount/settle.vue b/src/pages/manage/list/personal/currentAccount/settle.vue
index 4ea4e0a..628b1a9 100644
--- a/src/pages/manage/list/personal/currentAccount/settle.vue
+++ b/src/pages/manage/list/personal/currentAccount/settle.vue
@@ -59,7 +59,7 @@
             </el-form>
         </el-row>
         <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
-        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" :needAuth="needAuth" @submitIt="submitForm2" />
+        <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" :needAuth="needAuth" @submitIt="submitForm2" />
     </div>
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
 </template>
diff --git a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
index 6da5e4d..209cb50 100644
--- a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
+++ b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
@@ -54,7 +54,7 @@
             </el-form>
         </el-row>
         <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
-        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" :needAuth="needAuth" />
+        <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" :needAuth="needAuth" />
     </div>
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
 </template>
diff --git a/src/pages/manage/list/personal/currentAccount/withdrawal.vue b/src/pages/manage/list/personal/currentAccount/withdrawal.vue
index 29fa9bf..0ea34e5 100644
--- a/src/pages/manage/list/personal/currentAccount/withdrawal.vue
+++ b/src/pages/manage/list/personal/currentAccount/withdrawal.vue
@@ -57,7 +57,7 @@
             </el-form>
         </el-row>
         <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
-        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" :needAuth="needAuth" />
+        <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" :needAuth="needAuth" />
     </div>
 
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
diff --git a/src/pages/manage/list/personal/timeDeposit/deposit.vue b/src/pages/manage/list/personal/timeDeposit/deposit.vue
index 0ed4b27..abe9cd5 100644
--- a/src/pages/manage/list/personal/timeDeposit/deposit.vue
+++ b/src/pages/manage/list/personal/timeDeposit/deposit.vue
@@ -79,7 +79,7 @@
             </el-form>
         </el-row>
         <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
-        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" :needAuth="false" />
+        <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" :needAuth="false" />
     </div>
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
 </template>
diff --git a/src/pages/manage/list/personal/timeDeposit/openAccount.vue b/src/pages/manage/list/personal/timeDeposit/openAccount.vue
index 574def7..c98c351 100644
--- a/src/pages/manage/list/personal/timeDeposit/openAccount.vue
+++ b/src/pages/manage/list/personal/timeDeposit/openAccount.vue
@@ -72,7 +72,7 @@
             </el-form>
         </el-row>
         <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
-        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
+        <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
     </div>
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
 </template>
diff --git a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
index c9184c3..71c5b06 100644
--- a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
+++ b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
@@ -64,7 +64,7 @@
             </el-form>
         </el-row>
         <el-button @click="submitIt" type="primary" class="submitBtn" v-throttle>提交</el-button>
-        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
+        <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
     </div>
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
 </template>
diff --git a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
index 5fe309c..26e082e 100644
--- a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
@@ -95,7 +95,7 @@
             </el-form>
         </el-row>
         <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
-        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" depositNumber='0816' />
+        <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" depositNumber='0816' />
     </div>
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
 </template>
diff --git a/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue b/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue
index 7e398ab..7bd5c90 100644
--- a/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue
@@ -52,7 +52,7 @@
             </el-form>
         </el-row>
         <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
-        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" :needAuth="false" />
+        <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" :needAuth="false" />
     </div>
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
 </template>
diff --git a/src/pages/manage/list/personal/usefulPhrases/openAccount.vue b/src/pages/manage/list/personal/usefulPhrases/openAccount.vue
index 877b953..1fbc92b 100644
--- a/src/pages/manage/list/personal/usefulPhrases/openAccount.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/openAccount.vue
@@ -79,7 +79,7 @@
                         <el-input :value="form.customerManage" @input="val => checkHanzi(val, form, 'customerManage')" ref="customerManage" ></el-input>
                     </el-form-item> -->
                 </el-col>
-                <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2"  depositNumber='0816' />
+                <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2"  depositNumber='0816' />
             </el-form>
         </el-row>
         <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
diff --git a/src/pages/manage/list/servicesAccount/passwordChange.vue b/src/pages/manage/list/servicesAccount/passwordChange.vue
index 6ba0b3c..8368d47 100644
--- a/src/pages/manage/list/servicesAccount/passwordChange.vue
+++ b/src/pages/manage/list/servicesAccount/passwordChange.vue
@@ -57,7 +57,7 @@
                 </el-form>
             </el-row>
             <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
-            <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
+            <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
         </div>
     </div>
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" class="wrap" /> -->
diff --git a/src/pages/manage/list/servicesAccount/passwordLost.vue b/src/pages/manage/list/servicesAccount/passwordLost.vue
index b24e082..d144e11 100644
--- a/src/pages/manage/list/servicesAccount/passwordLost.vue
+++ b/src/pages/manage/list/servicesAccount/passwordLost.vue
@@ -40,7 +40,7 @@
                 </el-form>
             </el-row>
             <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
-            <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
+            <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
         </div>
     </div>
     <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" class="wrap" /> -->
diff --git a/src/pages/manage/list/servicesAccount/relieveLost.vue b/src/pages/manage/list/servicesAccount/relieveLost.vue
index 6457a22..88df197 100644
--- a/src/pages/manage/list/servicesAccount/relieveLost.vue
+++ b/src/pages/manage/list/servicesAccount/relieveLost.vue
@@ -46,7 +46,7 @@
                 </el-form>
             </el-row>
             <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
-            <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
+            <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
         </div>
 
         <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" class="wrap" /> -->

From 2f03b65641ba7ba3f1d5bbb9f1354cf363f8edaa Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Wed, 9 Mar 2022 18:16:54 +0800
Subject: [PATCH 2/4] update

---
 src/App.vue                                   |   7 +-
 src/components/dialog/index.vue               |   5 +
 .../{dialog2 => dialogTwo}/index.vue          |  22 +-
 src/pages/counter/list/index.vue              |   2 +-
 src/pages/lobbyManager/list/index.vue         |  11 +-
 src/pages/manage/index/index.vue              |  20 +-
 .../ImportantCash/controlCash/cashOut.vue     |   4 +-
 .../ImportantCash/controlCash/cashPaid.vue    |   4 +-
 .../controlCash/cashRecipients.vue            |   2 +-
 .../controlCash/cashTransferInto.vue          |   2 +-
 .../ImportantCash/controlCash2/cashOut.vue    |  10 +-
 .../ImportantCash/controlCash2/cashPaid.vue   |   9 +-
 .../controlCash2/cashRecipients.vue           |   8 +-
 .../controlCash2/cashTransferInto.vue         |  10 +-
 .../list/ImportantCash/controlCash3/index.vue |  46 ++--
 .../manage/list/acceptanceDraft/invoice.vue   | 219 +++++++++---------
 src/pages/manage/list/dayEnd/branchDayEnd.vue |  71 +-----
 src/pages/manage/list/dayEnd/tellerCash.vue   |  26 +--
 .../manage/list/dayEnd/tellerCertificate.vue  |  98 +-------
 .../list/servicesAccount/passwordLost.vue     |  11 +-
 src/styles/system.scss                        |   2 +-
 src/utils/utilFunction.js                     |   2 +
 22 files changed, 235 insertions(+), 356 deletions(-)
 rename src/components/{dialog2 => dialogTwo}/index.vue (94%)

diff --git a/src/App.vue b/src/App.vue
index 4c1245f..bb40d0a 100644
--- a/src/App.vue
+++ b/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",()=>{    
+            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)
             })                                                                                      
diff --git a/src/components/dialog/index.vue b/src/components/dialog/index.vue
index 9a85d82..732bb51 100644
--- a/src/components/dialog/index.vue
+++ b/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 = {
diff --git a/src/components/dialog2/index.vue b/src/components/dialogTwo/index.vue
similarity index 94%
rename from src/components/dialog2/index.vue
rename to src/components/dialogTwo/index.vue
index 29aad8c..3e75ddd 100644
--- a/src/components/dialog2/index.vue
+++ b/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>
diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index d81e494..edc2256 100644
--- a/src/pages/counter/list/index.vue
+++ b/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;"
diff --git a/src/pages/lobbyManager/list/index.vue b/src/pages/lobbyManager/list/index.vue
index 880c6b2..1bf12ce 100644
--- a/src/pages/lobbyManager/list/index.vue
+++ b/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 {
diff --git a/src/pages/manage/index/index.vue b/src/pages/manage/index/index.vue
index 29055f5..c96edd7 100644
--- a/src/pages/manage/index/index.vue
+++ b/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) {
diff --git a/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue b/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue
index b99e1f8..8974d96 100644
--- a/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue
+++ b/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;
diff --git a/src/pages/manage/list/ImportantCash/controlCash/cashPaid.vue b/src/pages/manage/list/ImportantCash/controlCash/cashPaid.vue
index 44db1a7..47dc86b 100644
--- a/src/pages/manage/list/ImportantCash/controlCash/cashPaid.vue
+++ b/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;
diff --git a/src/pages/manage/list/ImportantCash/controlCash/cashRecipients.vue b/src/pages/manage/list/ImportantCash/controlCash/cashRecipients.vue
index a64ff27..dc8e0b9 100644
--- a/src/pages/manage/list/ImportantCash/controlCash/cashRecipients.vue
+++ b/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';
 
diff --git a/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue b/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue
index 7f4acd5..02d2f16 100644
--- a/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue
+++ b/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 {
diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue
index 0906388..d3c06e1 100644
--- a/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue
+++ b/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;
diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashPaid.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashPaid.vue
index 44e67d1..b8ac6a6 100644
--- a/src/pages/manage/list/ImportantCash/controlCash2/cashPaid.vue
+++ b/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;
diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashRecipients.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashRecipients.vue
index 5c0afa1..d7ed87a 100644
--- a/src/pages/manage/list/ImportantCash/controlCash2/cashRecipients.vue
+++ b/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;
diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashTransferInto.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashTransferInto.vue
index 2931344..00e8582 100644
--- a/src/pages/manage/list/ImportantCash/controlCash2/cashTransferInto.vue
+++ b/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;
diff --git a/src/pages/manage/list/ImportantCash/controlCash3/index.vue b/src/pages/manage/list/ImportantCash/controlCash3/index.vue
index dbb1b4c..b877886 100644
--- a/src/pages/manage/list/ImportantCash/controlCash3/index.vue
+++ b/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%;
diff --git a/src/pages/manage/list/acceptanceDraft/invoice.vue b/src/pages/manage/list/acceptanceDraft/invoice.vue
index 02a7ac2..0a7f4ae 100644
--- a/src/pages/manage/list/acceptanceDraft/invoice.vue
+++ b/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>
diff --git a/src/pages/manage/list/dayEnd/branchDayEnd.vue b/src/pages/manage/list/dayEnd/branchDayEnd.vue
index aac58d6..ddcfa52 100644
--- a/src/pages/manage/list/dayEnd/branchDayEnd.vue
+++ b/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;
diff --git a/src/pages/manage/list/dayEnd/tellerCash.vue b/src/pages/manage/list/dayEnd/tellerCash.vue
index b811924..8be1b3a 100644
--- a/src/pages/manage/list/dayEnd/tellerCash.vue
+++ b/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;
diff --git a/src/pages/manage/list/dayEnd/tellerCertificate.vue b/src/pages/manage/list/dayEnd/tellerCertificate.vue
index 7c6e1a5..57c80c6 100644
--- a/src/pages/manage/list/dayEnd/tellerCertificate.vue
+++ b/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;
diff --git a/src/pages/manage/list/servicesAccount/passwordLost.vue b/src/pages/manage/list/servicesAccount/passwordLost.vue
index d144e11..9ffc192 100644
--- a/src/pages/manage/list/servicesAccount/passwordLost.vue
+++ b/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));
diff --git a/src/styles/system.scss b/src/styles/system.scss
index 2067f75..5fb9a58 100644
--- a/src/styles/system.scss
+++ b/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;
diff --git a/src/utils/utilFunction.js b/src/utils/utilFunction.js
index 4c595c7..299926c 100644
--- a/src/utils/utilFunction.js
+++ b/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,

From cbd9ccf4bdac5b6960a8f1462b5d11e5ad082ef6 Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Fri, 11 Mar 2022 18:20:19 +0800
Subject: [PATCH 3/4] update

---
 src/assets/css/tablebg.scss                   |  9 ++--
 src/components/dialog/index.vue               |  2 +-
 src/pages/counter/list/index.vue              | 46 +++++++++++--------
 src/pages/lobbyManager/list/index.vue         | 21 ++++++++-
 .../ImportantCash/controlCash/cashOut.vue     | 11 +++--
 .../controlCash/cashTransferInto.vue          | 12 +++--
 .../list/ImportantCash/controlCash3/index.vue | 10 ++--
 .../manage/list/client/consumerClient.vue     |  1 -
 src/pages/manage/list/dayEnd/branchDayEnd.vue | 18 ++++----
 src/pages/manage/list/dayEnd/tellerCash.vue   | 18 +++++---
 .../manage/list/dayEnd/tellerCertificate.vue  | 20 ++++----
 src/store/modules/system.js                   |  5 ++
 src/utils/utilFunction.js                     | 31 +++++++------
 13 files changed, 129 insertions(+), 75 deletions(-)

diff --git a/src/assets/css/tablebg.scss b/src/assets/css/tablebg.scss
index 213ee9d..c2d9513 100644
--- a/src/assets/css/tablebg.scss
+++ b/src/assets/css/tablebg.scss
@@ -17,17 +17,20 @@ $inputHeight: 38px;
     line-height: $mfFontSize;
     padding: 0;
     display: flex;
-    justify-content: center;
+    justify-content: space-around;
     align-items: center;
     align-content: center;
     margin: 0 auto;
     .el-input {
+        margin: 0 5px;
         max-height: $mfFontSize!important;
         line-height: $mfFontSize;
-        max-width: $mfFontSize+20px;
+        // max-width: $mfFontSize+20px;
+        flex-grow: 1;
         input {
             max-height: $inputHeight;
-            max-width: $inputHeight+40px;
+            width: 100%;
+            // max-width: $inputHeight+40px;
         }
     }
     span {
diff --git a/src/components/dialog/index.vue b/src/components/dialog/index.vue
index 732bb51..6f6d0e0 100644
--- a/src/components/dialog/index.vue
+++ b/src/components/dialog/index.vue
@@ -143,8 +143,8 @@ const obj = {
     'servicesAccount/passwordChange': '密码修改',
     'servicesAccount/passwordLost': '密码挂失登记',
     'servicesAccount/relieveLost': '挂失解挂登记',
-    'controlCash/cashRecipients': '现金管理',
     
+    'controlCash/cashTransferInto': '现金上缴',
     'spacial': '提交'
 }
 const nameMap = {
diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index edc2256..fad40f0 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="wrap minWidthJudge">
+    <div class="wrap minWidthJudge overflow-hidden">
         <back-Button />
        <!-- <img class="sth bg" v-lazy="lazyImg[2]" alt="" /> -->
         <!-- <img class="sth guide" src="@/assets/img/guide.png" alt="" /> -->
@@ -10,8 +10,8 @@
 
         <!-- 系统录入 height: 178px;position:relative;top:-450px;right:20px-->
         <el-tooltip placement="top" popper-class="sth-popper">
-            <div slot="content" class="computerContent" style="" @click="showManage">
-                <img style="height: 150px;" v-lazy="lazyImg[3]" alt="" />
+            <div slot="content" class="computerContent " @click="showManage">
+                <img v-lazy="lazyImg[3]" style="height: 100px;" alt="" />
             </div>
             <div class="bg-gray-50 "  @click="showManage">
                 <img class="sth computer cp rotateComputer" v-lazy="lazyImg[4]" alt="" @click="showManage"/>
@@ -20,56 +20,56 @@
 <!--        点击打开传票栏-->
         <el-tooltip placement="top" popper-class="sth-popper" offset="50">
             <div slot="content">
-                <img v-lazy="lazyImg[5]" alt="" />
+                <img v-lazy="lazyImg[5]" class="contentHeight" alt="" />
             </div>
             <img class="sth summons cp" v-lazy="lazyImg[6]" alt="" @click="showData('传票栏',1)" />
         </el-tooltip>
 <!--        点击打开普通凭证箱-->
         <el-tooltip placement="top-start" popper-class="sth-popper" offset="250">
             <div slot="content">
-                <img v-lazy="lazyImg[7]" alt="" />
+                <img v-lazy="lazyImg[7]" class="contentHeight" alt="" />
             </div>
             <img class="sth voucher-box cp" v-lazy="lazyImg[8]" alt="" @click="showData('普通凭证箱',2)" />
         </el-tooltip>
 <!--        点击打开重要凭证箱-->
         <el-tooltip placement="top-start" popper-class="sth-popper" offset="250">
             <div slot="content">
-                <img v-lazy="lazyImg[9]" alt="" />
+                <img v-lazy="lazyImg[9]" class="contentHeight" alt="" />
             </div>
             <img class="sth important cp" v-lazy="lazyImg[10]" alt="" @click="showData('重要空白凭证箱',3)" />
         </el-tooltip>
 <!--        点击打开钱箱-->
         <el-tooltip placement="left-start" popper-class="sth-popper">
             <div slot="content">
-                <img v-lazy="lazyImg[11]" alt="" />
+                <img v-lazy="lazyImg[11]" class="contentHeight" alt="" />
             </div>
             <img class="sth money-box cp" v-lazy="lazyImg[12]" alt="" @click="showData('钱箱',4)" />
         </el-tooltip>
 <!--        点击打开印章盒-->
         <el-tooltip placement="top" popper-class="sth-popper" offset="-100">
             <div slot="content">
-                <img v-lazy="lazyImg[13]" alt="" />
+                <img v-lazy="lazyImg[13]" class="contentHeight" alt="" />
             </div>
             <img class="sth seal-box cp" v-lazy="lazyImg[14]" @click="showData('印章盒',5)" alt="" />
         </el-tooltip>
 <!--        点击打开验钞机-->
         <el-tooltip placement="top" popper-class="sth-popper" offset="-100">
             <div slot="content">
-                <img v-lazy="lazyImg[15]" alt="" />
+                <img v-lazy="lazyImg[15]" class="contentHeight" alt="" />
             </div>
             <img class="sth currency-detector cp" v-lazy="lazyImg[16]" @click="showData('验钞机',6)" alt="" />
         </el-tooltip>
 <!--        点击打开打印机-->
         <el-tooltip placement="top" popper-class="sth-popper" offset="-400">
             <div slot="content">
-                <img v-lazy="lazyImg[17]" alt="" />
+                <img v-lazy="lazyImg[17]" class="contentHeight" alt="" />
             </div>
             <img class="sth printer cp" v-lazy="lazyImg[18]" alt="" @click="showData('打印机',7)" />
         </el-tooltip>
 <!--        点击打开密码器-->
         <el-tooltip placement="top" popper-class="sth-popper" offset="50">
             <div slot="content">
-                <img v-lazy="lazyImg[19]" alt="" />
+                <img v-lazy="lazyImg[19]" class="contentHeight" alt="" />
             </div>
             <img class="sth cipher-machine cp" v-lazy="lazyImg[20]" @click="showData('密码器',8)" alt="" />
         </el-tooltip>
@@ -83,21 +83,21 @@
 
         <el-tooltip placement="top" popper-class="sth-popper" offset="-50">
             <div slot="content">
-                <img v-lazy="lazyImg[22]" alt="" />
+                <img v-lazy="lazyImg[22]" class="contentHeight" alt="" />
             </div>
             <p class="employeeText" @click="showData('资料',9)">资料</p>
         </el-tooltip>
 <!--        点击打开刷卡器-->
         <el-tooltip placement="top" popper-class="sth-popper" offset="00">
             <div slot="content">
-                <img v-lazy="lazyImg[23]" alt="" />
+                <img v-lazy="lazyImg[23]" class="contentHeight" alt="" />
             </div>
             <img class="sth card-machine cp" v-lazy="lazyImg[24]" alt="" @click="showData('刷卡器',10)" />
         </el-tooltip>
 <!--        点击打开身份证-->
         <el-tooltip placement="top" popper-class="sth-popper" offset="-100">
             <div slot="content">
-                <img v-lazy="lazyImg[25]" alt="" />
+                <img v-lazy="lazyImg[25]" class="contentHeight" alt="" />
             </div>
             <img class="sth idCard-scanner cp" v-lazy="lazyImg[26]" @click="showData('身份证扫描仪',11)" alt="" />
         </el-tooltip>
@@ -298,7 +298,7 @@
         <div v-show="showPop" class="masking"></div>
 
         <!-- 商业银行系统的全屏功能实现  v-if="manageVisible" -->
-        <div :class="full ? 'fullScreenSystem' : 'system'" class="systemconfig">
+        <div :class="full ? 'fullScreenSystem' : 'system'" class="systemconfig" v-show="manageVisible">
             <!-- <transition name='systemComputer' enter-active-class="Down" leave-active-class="animate__animated animate__bounceOutDown">
                 <router-view></router-view>
             </transition> -->
@@ -357,9 +357,9 @@
             :visible.sync="peopleJudge"
             custom-class="2xl:w-7/12 xl:w-9/12 lg:w-full h-auto rounded-2xl border-2 border-gray-600"
             center>
-            <h3 class="text-4xl antialiased text-center">客户: 你好!我现在该做什么呢？</h3>
+            <h3 class="text-4xl antialiased text-center">客户: 你好。</h3>
             <span slot="footer" class="dialog-footer">
-                <el-button @click="peopleDoing(1)">找他签字</el-button>
+                <el-button @click="peopleDoing(1)">客户签字</el-button>
                 <el-button type="primary" @click="peopleDoing(2)">返还资料</el-button>
             </span>
         </el-dialog>
@@ -409,6 +409,7 @@ export default {
             }
         };
         return {
+            // 方便操作的数据：调整弹出框高度
             fit: 'scale-down',
             controlGoodsDblClickFn: null,
             // cultureIn: [], // 传票栏
@@ -2146,6 +2147,11 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.contentHeight {
+    max-width: 300px;
+    max-height: 60px;
+}
+
 .businessClass {
     width: 300px;
     height: 100px;
@@ -3613,18 +3619,18 @@ export default {
 
 .systemconfig {
     position: absolute;
+    left: 50%;
+    transform: translate(-50%, 0);
     z-index: 9;
 }    
 .system {
     margin-top: -8vh;
     top: 12%;
-    left: 50%;
-    transform: translate(-50%, 0);
     width: 1280px;
 }
 .fullScreenSystem {
     width: 100vw;
-    height: 95vw;
+    height: 200vh;
     margin-top: 0;
     top: 0%;
     // left: 50%;
diff --git a/src/pages/lobbyManager/list/index.vue b/src/pages/lobbyManager/list/index.vue
index 1bf12ce..7293477 100644
--- a/src/pages/lobbyManager/list/index.vue
+++ b/src/pages/lobbyManager/list/index.vue
@@ -377,7 +377,7 @@ export default {
         // 填单
         fillIt() {
             const formList = [];
-            const checkList = [...this.checkList]
+            let checkList = [...this.checkList]
             if(this.checkList.length <= 0) {
                 this.$message({
                     message: '请选择至少一个填单',
@@ -386,9 +386,16 @@ export default {
                 });
                 return 
             }
+
+            const tmp = sessionStorage.getItem('isFill')
+            if(tmp) {
+                checkList = [...new Set([...JSON.parse(tmp), ...checkList])]
+            }
             for(let i=0; i<checkList.length; i++) {
                 formList.push({"answerId":checkList[i],"emptyOne": "", "emptyTwo": '', "operationIds": '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',286,404,' + checkList[i], "type": ""})
             }
+            
+
             const params= {
                 parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',286, 404',
                 lcJudgmentRuleReq:formList,
@@ -398,6 +405,8 @@ export default {
             addOperation(params).then((data)=>{
                 // ...
                 this.dataVisible = false
+                const isFill = [...this.checkList]
+                sessionStorage.setItem('isFill', JSON.stringify(isFill))
                 this.checkList = []
                 this.takeResultVisible = true
                 setTimeout(() => {
@@ -429,6 +438,11 @@ export default {
             for(let i=0; i<checkList.length; i++) {
                 formList.push({"answerId":checkList[i],"emptyOne": "", "emptyTwo": '', "operationIds": '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',286,416,' + checkList[i], "type": ""})
             }
+            this.elImg2.map(item=> {
+                if(item.copyState) {
+                    formList.push({"answerId":item.key,"emptyOne": "", "emptyTwo": '', "operationIds": '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',286,416,' + item.key, "type": ""})
+                }
+            })
             const params= {
                 parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',286, 416',
                 lcJudgmentRuleReq:formList,
@@ -475,6 +489,11 @@ export default {
             for(let i=0; i<checkList.length; i++) {
                 formList.push({"answerId":checkList[i],"emptyOne": "", "emptyTwo": '', "operationIds": '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',286,553,' + checkList[i], "type": ""})
             }
+            this.elImg2.map(item=> {
+                if(item.returnState) {
+                    formList.push({"answerId":item.key,"emptyOne": "", "emptyTwo": '', "operationIds": '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',286,553,' + item.key, "type": ""})
+                }
+            })
             const params= {
                 parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',286, 553',
                 lcJudgmentRuleReq:formList,
diff --git a/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue b/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue
index 8974d96..15703eb 100644
--- a/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue
+++ b/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue
@@ -32,18 +32,20 @@
                             prop="moneyType"
                             label="券别"
                             align="center"
+                            width="90"
                             >
                         </el-table-column>
                         <el-table-column
                             prop="moneyMedium"
                             label="介质"
                             align="center"
+                            width="90"
                             >
                         </el-table-column>
                         <el-table-column
                             label="数量"
                             align="center"
-                            width="140"
+                            
                             >
                             <template slot-scope="scope">
                                 <div class="myFlex">
@@ -55,7 +57,6 @@
                         <el-table-column
                             label="金额"
                             align="center"
-                            width="140"
                             >
                             <template slot-scope="scope">
                                 <div class="myFlex">
@@ -78,18 +79,20 @@
                             prop="moneyType"
                             label="券别"
                             align="center"
+                            width="90"
                             >
                         </el-table-column>
                         <el-table-column
                             prop="moneyMedium"
                             label="介质"
                             align="center"
+                            width="90"
                             >
                         </el-table-column>
                         <el-table-column
                             label="数量"
                             align="center"
-                            width="140"
+                            
                             >
                             <template slot-scope="scope">
                                 <div class="myFlex">
@@ -101,7 +104,7 @@
                         <el-table-column
                             label="金额"
                             align="center"
-                            width="140"
+                            
                             >
                             <template slot-scope="scope">
                                 <div class="myFlex">
diff --git a/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue b/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue
index 02d2f16..fa4fdd1 100644
--- a/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue
+++ b/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue
@@ -41,18 +41,20 @@
                             prop="moneyType"
                             label="券别"
                             align="center"
+                            width="90"
                             >
                         </el-table-column>
                         <el-table-column
                             prop="moneyMedium"
                             label="介质"
                             align="center"
+                            width="90"
                             >
                         </el-table-column>
                         <el-table-column
                             label="数量"
                             align="center"
-                            width="140"
+                            
                             >
                             <template slot-scope="scope">
                                 <div class="myFlex">
@@ -64,7 +66,7 @@
                         <el-table-column
                             label="金额"
                             align="center"
-                            width="140"
+                            
                             >
                             <template slot-scope="scope">
                                 <div class="myFlex">
@@ -88,18 +90,20 @@
                             prop="moneyType"
                             label="券别"
                             align="center"
+                            width="90"
                             >
                         </el-table-column>
                         <el-table-column
                             prop="moneyMedium"
                             label="介质"
                             align="center"
+                            width="90"
                             >
                         </el-table-column>
                         <el-table-column
                             label="数量"
                             align="center"
-                            width="140"
+                            
                             >
                             <template slot-scope="scope">
                                 <div class="myFlex">
@@ -111,7 +115,7 @@
                         <el-table-column
                             label="金额"
                             align="center"
-                            width="140"
+                            
                             >
                             <template slot-scope="scope">
                                 <div class="myFlex">
diff --git a/src/pages/manage/list/ImportantCash/controlCash3/index.vue b/src/pages/manage/list/ImportantCash/controlCash3/index.vue
index b877886..45199fc 100644
--- a/src/pages/manage/list/ImportantCash/controlCash3/index.vue
+++ b/src/pages/manage/list/ImportantCash/controlCash3/index.vue
@@ -1,13 +1,14 @@
 <!-- 现金管理 -->
 <template>
     <div class="wrap">
-        <div class="title">
+        <!-- <div class="title">
             <p>重空现金</p>
             <i class="el-icon-arrow-right"></i>
             <p>支票管理</p>
             <i class="el-icon-arrow-right"></i>
             <p>支票出售</p>
-        </div>
+        </div> -->
+        <my-title :titleArr="['重空现金', '支票管理', '支票出售']"/>
 
         <el-row :gutter="20" style="margin: 0">
             <el-form ref="form" :model="form" label-width="120px" :rules="rules">
@@ -74,14 +75,15 @@ import MyTitle from '@/components/myTitle'
 
 import { mapMutations, mapGetters } from 'vuex'
 import NeedBefore from '@/components/needBefore'
-import MyDialog from '@/components/dialog'
+import MyDialog from '@/components/dialogTwo'
 const moduleName = 'controlCash3/index'
 
 export default {
     name: 'index',
     components:{
         NeedBefore,
-        MyDialog
+        MyDialog,
+        MyTitle
     },
     data() {
         return {
diff --git a/src/pages/manage/list/client/consumerClient.vue b/src/pages/manage/list/client/consumerClient.vue
index eab2da4..a14d7ab 100644
--- a/src/pages/manage/list/client/consumerClient.vue
+++ b/src/pages/manage/list/client/consumerClient.vue
@@ -398,7 +398,6 @@ export default {
         throttle(fn,wait=1000){// 节流函数
             var timer = null;
             return function(){
-                console.log('进入timer0')
                 var context = this;
                 var args = fn;
                 if(!timer){
diff --git a/src/pages/manage/list/dayEnd/branchDayEnd.vue b/src/pages/manage/list/dayEnd/branchDayEnd.vue
index ddcfa52..a35b5b2 100644
--- a/src/pages/manage/list/dayEnd/branchDayEnd.vue
+++ b/src/pages/manage/list/dayEnd/branchDayEnd.vue
@@ -1,10 +1,6 @@
 <template>
-    <div class="wrap2">
-        <div class="title">
-            <p>日终管理</p>
-            <i class="el-icon-arrow-right"></i>
-            <p>{{text}}</p>
-        </div>
+    <div class="wrap wrap2 myPadding">
+        <my-title :titleArr="['日终管理', '网点日终轧帐']"/>
         
         <!-- 存款 -->
         <div class="body">
@@ -27,12 +23,14 @@
 <script>
 import { myValidate, checkHanzi } from '@/utils/utilFunction.js'
 import { mapState, mapMutations, mapGetters } from 'vuex'
+import MyTitle from '@/components/myTitle'
 export default {
     name: 'index',
-    components:{},
+    components:{
+        MyTitle
+    },
     data() {
         return {
-            text:'网点日终轧帐',/* 顶部文字 */
             form:{
                 username: '',
                 password: ''
@@ -77,6 +75,10 @@ export default {
 
 <style lang="scss" scoped>
     
+    .myPadding {
+        padding: 24px 0 24px 24px;
+        background-color: red;
+    }
 
     /deep/.el-input input {
         width: 420px;
diff --git a/src/pages/manage/list/dayEnd/tellerCash.vue b/src/pages/manage/list/dayEnd/tellerCash.vue
index 8be1b3a..e3831df 100644
--- a/src/pages/manage/list/dayEnd/tellerCash.vue
+++ b/src/pages/manage/list/dayEnd/tellerCash.vue
@@ -1,10 +1,7 @@
 <template>
-    <div class="wrap2">
-        <div class="title">
-            <p>日终管理</p>
-            <i class="el-icon-arrow-right"></i>
-            <p>{{text}}</p>
-        </div>
+    <div class="wrap2 myPadding">
+        <my-title :titleArr="['日终管理', '柜员现金轧账']" />
+
         <!-- 存款 -->
         <div class="body">
             <el-row :gutter="20" style="margin: 0">
@@ -65,9 +62,12 @@
 import { tableRowClassName, headerCellStyle } from '@/assets/js/myConfig'
 import { myValidate, checkHanzi } from '@/utils/utilFunction.js'
 import { mapState, mapMutations, mapGetters } from 'vuex'
+import MyTitle from '@/components/myTitle'
 export default {
     name: 'index',
-    components:{},
+    components:{
+        MyTitle
+    },
     data() {
         return {
             headerCellStyle: headerCellStyle,
@@ -151,6 +151,10 @@ export default {
         background-color: gray;
     }
 
+    .myPadding {
+        padding: 24px 0 24px 24px;
+    }
+
     /deep/.el-input input {
         text-align: center;
     }
diff --git a/src/pages/manage/list/dayEnd/tellerCertificate.vue b/src/pages/manage/list/dayEnd/tellerCertificate.vue
index 57c80c6..547151d 100644
--- a/src/pages/manage/list/dayEnd/tellerCertificate.vue
+++ b/src/pages/manage/list/dayEnd/tellerCertificate.vue
@@ -1,10 +1,8 @@
 <template>
-    <div class="wrap2">
-        <div class="title">
-            <p>日终管理</p>
-            <i class="el-icon-arrow-right"></i>
-            <p>{{text}}</p>
-        </div>
+    <div class="wrap2 myPadding">
+
+        <my-title :titleArr="['日终管理', '柜员凭证轧账']"/>
+
         <!-- 存款 -->
         <div class="body">
             <el-row :gutter="20" style="margin: 0">
@@ -75,13 +73,15 @@
 import { tableRowClassName, headerCellStyle } from '@/assets/js/myConfig'
 import { myValidate, checkHanzi } from '@/utils/utilFunction.js'
 import { mapState, mapMutations, mapGetters } from 'vuex'
+import MyTitle from '@/components/myTitle'
 export default {
     name: 'index',
-    components:{},
+    components:{
+        MyTitle
+    },
     data() {
         return {
             headerCellStyle: headerCellStyle,
-            text:'柜员凭证轧账',/* 顶部文字 */
             form:{
                 date: '',
                 counterNumber: ''
@@ -138,6 +138,10 @@ export default {
 <style lang="scss" scoped>
     @import '@/assets/css/tablebg.scss';
     
+    .myPadding {
+        padding: 24px 0 24px 24px;
+    }
+
     /deep/.numrule input {
         appearance: textField!important;
         -webkit-appearance: textField!important;
diff --git a/src/store/modules/system.js b/src/store/modules/system.js
index 36d2748..096de45 100644
--- a/src/store/modules/system.js
+++ b/src/store/modules/system.js
@@ -94,6 +94,11 @@ const peopleNumber = '111222'
 const voucherNumber = '159753'
 const sex = 1 // 1为男,2为女。
 
+/*
+    vuex数据结构：系统中需要实现一个不同业务中同个页面物品栏和箱子中的物品不同、判分不同。所以在vuex中写了一个对象来管理这些状态。对象中通过数组存id的方式存放这些东西。
+    通过不同的键值对表示不同的业务。其实更优秀的做法是将业务抽离成一个对象class，业务选择对象也抽离成一个class当成全局游戏对象。因为一开始没这样写后面改着麻烦所以就没改了。
+*/
+
 const myInitState =  {
     '': {
         data: [],
diff --git a/src/utils/utilFunction.js b/src/utils/utilFunction.js
index 299926c..ac7285a 100644
--- a/src/utils/utilFunction.js
+++ b/src/utils/utilFunction.js
@@ -1,5 +1,6 @@
 import { MessageBox, Message } from 'element-ui';
 import { addOperation, getOperation } from '@/api/http';
+import store from '@/store'
 
 
 
@@ -268,25 +269,27 @@ const getNowDate = () => {
 }
 
 const messageIdCard = (message='请刷身份证') => {
-    console.log('=*************************')
-    Message.warning({
-        center: true,
-        message,
-    })
+    store.commit('system/setTipsOperate', message)
+    // Message.warning({
+    //     center: true,
+    //     message,
+    // })
 }
 
-const messageCard = (message='请填写卡号') => {
-    Message.warning({
-        center: true,
-        message
-    })
+const messageCard = (message='请刷银行卡') => {
+    store.commit('system/setTipsOperate', message)
+    // Message.warning({
+    //     center: true,
+    //     message
+    // })
 }
 
 const messagePassword = (message='请填写支取密码') => {
-    Message.warning({
-        center: true,
-        message,
-    })
+    store.commit('system/setTipsOperate', message)
+    // Message.warning({
+    //     center: true,
+    //     message,
+    // })
 }
 
 const randomPeopleNumber = () => {

From e66251240bff6e2765dc3606883c9bb622ed6cb1 Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Tue, 22 Mar 2022 17:55:10 +0800
Subject: [PATCH 4/4] update

---
 src/components/case/index.vue                 | 46 ++++++++---
 src/components/dialog/index.vue               |  6 +-
 src/mixins/tipsBefore/index.js                | 42 ++++++----
 src/pages/counter/list/index.vue              | 72 +++++++++++++----
 src/pages/lobbyManager/list/index.vue         |  6 +-
 .../manage/list/client/consumerClient.vue     |  4 +-
 .../manage/list/client/corporateClient.vue    |  4 +
 src/pages/manage/list/dayEnd/branchDayEnd.vue |  1 -
 .../personal/callDeposits/accountClosed.vue   | 17 +++-
 .../personal/callDeposits/openAccount.vue     | 16 +++-
 .../currentAccount/accountCancellation.vue    | 14 +++-
 .../list/personal/currentAccount/deposit.vue  |  7 +-
 .../personal/currentAccount/openAccount.vue   | 78 +++++++++++++------
 .../list/personal/currentAccount/settle.vue   | 13 ++--
 .../currentAccount/transferAccounts.vue       | 14 +++-
 .../personal/currentAccount/withdrawal.vue    | 11 ++-
 .../list/personal/timeDeposit/deposit.vue     | 12 ++-
 .../list/personal/timeDeposit/openAccount.vue | 17 +++-
 .../list/personal/timeDeposit/withdrawal.vue  | 39 +++++++---
 .../personal/usefulPhrases/accountClosed.vue  | 15 +++-
 .../usefulPhrases/continueDeposit.vue         | 11 ++-
 .../personal/usefulPhrases/openAccount.vue    | 16 +++-
 .../list/servicesAccount/passwordChange.vue   | 22 ++++--
 .../list/servicesAccount/passwordLost.vue     |  8 ++
 .../list/servicesAccount/relieveLost.vue      | 15 +++-
 25 files changed, 375 insertions(+), 131 deletions(-)

diff --git a/src/components/case/index.vue b/src/components/case/index.vue
index 26b2e82..cfc8584 100644
--- a/src/components/case/index.vue
+++ b/src/components/case/index.vue
@@ -132,7 +132,18 @@
     <!-- 遮罩层 -->
     <div class="absolute z-50 w-screen h-screen bg-transparent inset-0" v-show="showIt"></div> 
 
-     
+    <el-dialog
+      title="提示"
+      :visible.sync="closePaneJudge"
+      width="30%"
+      center>
+      <h4 class="antialiased text-center text-2xl">请选择你将进行的操作</h4>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="closePane()">再试一次</el-button>
+        <el-button type="primary" @click="closePane()">其他业务</el-button>
+      </span>
+    </el-dialog>
+    
   </div>
   
 </template>
@@ -168,6 +179,8 @@ export default {
   },
   data() {
     return {
+      closePaneJudge: false,
+      lockIt: false,
       intervalJudge: {},
       systemId: Setting.systemId,
       workbench: [],
@@ -341,6 +354,10 @@ export default {
     ...mapMutations({
       initState: 'system/initState'
     }),
+    closePane(){
+      this.closePaneJudge = false
+      this.reload()
+    },
     getQueryVariable(name) {
         var reg = new RegExp('(^|&)'+name+'=([^&]*)(&|$)')
         if(window.location.href.split('?')[1]){
@@ -529,6 +546,7 @@ export default {
             cancelButtonText: '取消',
             type: 'warning'
         }).then(() => {
+
             this.sureSubmit(true)
         }).catch(() => {
               this.$message({
@@ -537,7 +555,7 @@ export default {
               });
         });
     },
-      sureSubmit(judge){
+    sureSubmit(judge){
         // 初始化vuex中的state
         // this.initState();
         this.actEndTime = new Date().getTime();
@@ -585,6 +603,7 @@ export default {
                 sessionStorage.setItem('cid', cid)
                 sessionStorage.setItem('systemId', systemId)
                 sessionStorage.setItem('projectId', projectId)
+                this.lockIt = true
                 if(firstLoad) {
                   sessionStorage.setItem('firstLoad', firstLoad)
                 }
@@ -642,13 +661,13 @@ export default {
       }
     },
       //倒计时
-      countDown(timestamp){
-          this.timestamp = timestamp
-          this.sss = 1;
-          this.globalTimer = null;
-          clearInterval(this.globalTimer);
-          this.startCountFn()
-      },
+    countDown(timestamp){
+        this.timestamp = timestamp
+        this.sss = 1;
+        this.globalTimer = null;
+        clearInterval(this.globalTimer);
+        this.startCountFn()
+    },
     counterFn(counterTime) {
         if (this.timestamp){
             let countDown = (new Date(counterTime).getTime() - new Date().getTime()) / 1000
@@ -721,6 +740,8 @@ export default {
         sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
         sessionStorage.setItem('accountVoucher', JSON.stringify(formList))
         sessionStorage.setItem('accountPasswordAll', '')
+        // 初始化vuex中的state
+        this.initState();
         let params = {
             "projectId":projectId,
         }
@@ -802,7 +823,12 @@ export default {
       return param < 10 ? "0" + param : param;
     },
     toggleCase() {
-      this.$emit('update:showIt', !this.showIt)
+      if(!this.lockIt) {
+        this.$emit('update:showIt', !this.showIt)
+      }else {
+        this.closePaneJudge = true
+      }
+      
       // this.caseVisible = !this.caseVisible
     },
     collapse(){
diff --git a/src/components/dialog/index.vue b/src/components/dialog/index.vue
index 6f6d0e0..623efdc 100644
--- a/src/components/dialog/index.vue
+++ b/src/components/dialog/index.vue
@@ -26,7 +26,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="150px" >
+                <el-form ref="form2" :model="disForm" label-width="200px" >
                         <el-form-item label="授权柜员">
                         <el-input disabled v-model="disForm.name"></el-input>
                     </el-form-item>
@@ -37,7 +37,7 @@
             </div>
             <div class="popBody w-full" v-else>
                 <el-row :gutter="20">
-                    <el-form label-width="100px">
+                    <el-form label-width="200px">
                         <el-col :span="12">
                             <el-form-item v-for="(val, key) in leftObj" :key="key" :label="key + ':'">
                                 <div>{{ val }}</div>
@@ -481,6 +481,8 @@ export default {
             font-weight: 400;
         }
         .el-form-item__content{
+            padding-left: 30px;
+            text-align: left;
             font-family: PingFangSC-Semibold;
             font-size: 20px;
             color: #000000;
diff --git a/src/mixins/tipsBefore/index.js b/src/mixins/tipsBefore/index.js
index 69c7ef5..4d8021a 100644
--- a/src/mixins/tipsBefore/index.js
+++ b/src/mixins/tipsBefore/index.js
@@ -30,7 +30,12 @@ export default {
         
     },
     created() {
-
+        if(sessionStorage.getItem(this.moduleName)) {
+            const getBeforeData = JSON.parse(sessionStorage.getItem(this.moduleName))
+            for(const key in getBeforeData) {
+                this.form[key] = Number(getBeforeData[key])? Number(getBeforeData[key]): getBeforeData[key]
+            }
+        }
         if(this.inMyWork(this.moduleName)) {
             if(this.needsModule(this.moduleName)) {
                 this.isNeedBefore = true
@@ -47,12 +52,12 @@ export default {
             }
             
             // 这个业务是我们需要的，所以我们拿存的数据
-            if(sessionStorage.getItem(this.moduleName)) {
-                const getBeforeData = JSON.parse(sessionStorage.getItem(this.moduleName))
-                for(const key in getBeforeData) {
-                    this.form[key] = Number(getBeforeData[key])? Number(getBeforeData[key]): getBeforeData[key]
-                }
-            }
+            // if(sessionStorage.getItem(this.moduleName)) {
+            //     const getBeforeData = JSON.parse(sessionStorage.getItem(this.moduleName))
+            //     for(const key in getBeforeData) {
+            //         this.form[key] = Number(getBeforeData[key])? Number(getBeforeData[key]): getBeforeData[key]
+            //     }
+            // }
             
             
 
@@ -74,14 +79,23 @@ export default {
         // this.myTipBefore = null
 
         // 这个业务是我们需要的，所以我们存数据
-        if(!this.unNeed) {
-            let tmpForm = {}
-            for(const key in this.form) {
-                if(this.form[key] !== '') {
-                    tmpForm[key] = this.form[key]
-                }
+
+        let tmpForm = {}
+        for(const key in this.form) {
+            if(this.form[key] !== '') {
+                tmpForm[key] = this.form[key]
             }
-            sessionStorage.setItem(this.moduleName, JSON.stringify(tmpForm))
+        }
+        sessionStorage.setItem(this.moduleName, JSON.stringify(tmpForm))
+
+        if(!this.unNeed) {
+            // let tmpForm = {}
+            // for(const key in this.form) {
+            //     if(this.form[key] !== '') {
+            //         tmpForm[key] = this.form[key]
+            //     }
+            // }
+            // sessionStorage.setItem(this.moduleName, JSON.stringify(tmpForm))
         }
         
         if(this.tipsNefore) {
diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index fad40f0..d0622ac 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -62,7 +62,7 @@
 <!--        点击打开打印机-->
         <el-tooltip placement="top" popper-class="sth-popper" offset="-400">
             <div slot="content">
-                <img v-lazy="lazyImg[17]" class="contentHeight" alt="" />
+                <img v-lazy="lazyImg[17]" style="height: 50px;" alt="" />
             </div>
             <img class="sth printer cp" v-lazy="lazyImg[18]" alt="" @click="showData('打印机',7)" />
         </el-tooltip>
@@ -136,7 +136,7 @@
 
             <!-- 动画开始 -->
             <div v-if="popText==='密码器'"   style="width:800px;padding-right:150px;padding-top:80px">
-                <el-form :model="passwordForm" :rules="passwordRules" ref="form" label-width="180px">
+                <el-form :model="passwordForm" :rules="passwordRules" ref="form" label-width="180px" key="passwordFormpasswordAgain">
                     <el-form-item label="密码" prop="passwordAgain">
                         <el-input v-focus show-password v-model="passwordForm.passwordAgain" maxlength="6" onkeyup="{this.value=this.value.replace(/\D/g,'')}" autocomplete="off"></el-input>
                     </el-form-item>
@@ -144,7 +144,7 @@
                         <el-input show-password v-model="passwordForm.password"  maxlength="6" onkeyup="this.value=this.value.replace(/\D/g,'')" autocomplete="off"></el-input>
                     </el-form-item> -->
                     <!-- <el-form-item label="确认密码" prop="password2" v-if="systemId == '62,1' || systemId == '62,2' || systemId == '62,3'"> -->
-                    <el-form-item label="确认密码" prop="password2">
+                    <el-form-item label="确认密码" prop="password2" key="passwordFormpassword2" v-if="id == '62,1' || id == '62,2' || id == '62,3'">
                         <el-input show-password v-model="passwordForm.password2"  maxlength="6" onkeyup="this.value=this.value.replace(/\D/g,'')" autocomplete="off"></el-input>
                     </el-form-item>
                 </el-form>
@@ -308,10 +308,10 @@
 
         <!-- 图片查看器 -->
         <el-dialog
-            custom-class="data-dia imgIndex"
-            class=""
+            custom-class="data-dia "
+            class="imgIndex"
             :visible.sync="showImg"
-            width="634px"
+            width="850px"
             >
             <img :src="imgSrc" class="imgPop imgIndex min-w-full " alt="">
 <!--            <div :style="{'background':'url('+imgSrc+')','height':'500px','background-repeat': 'no-repeat',-->
@@ -357,12 +357,26 @@
             :visible.sync="peopleJudge"
             custom-class="2xl:w-7/12 xl:w-9/12 lg:w-full h-auto rounded-2xl border-2 border-gray-600"
             center>
-            <h3 class="text-4xl antialiased text-center">客户: 你好。</h3>
+            <h3 class="text-2xl antialiased text-center">请选择客户签字或返还资料</h3>
             <span slot="footer" class="dialog-footer">
-                <el-button @click="peopleDoing(1)">客户签字</el-button>
-                <el-button type="primary" @click="peopleDoing(2)">返还资料</el-button>
+                <el-button @click="peopleDoing(1)" class="w-52 h-14">客户签字</el-button>
+                <el-button type="primary" @click="peopleDoing(2)" class="w-52 h-14">返还资料</el-button>
             </span>
         </el-dialog>
+        
+        <el-dialog
+            title="提示"
+            :visible.sync="voucherCardGet"
+            width="30%"
+            center>
+            <h3 class="text-2xl antialiased text-center">请问需要取出几张银行卡</h3>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="voucherCardGetIt(1)">取出一张</el-button>
+                <el-button type="primary" @click="voucherCardGetIt(2)">取出两张</el-button>
+            </span>
+        </el-dialog>
+
+
     </div>
 </template>
 
@@ -409,6 +423,9 @@ export default {
             }
         };
         return {
+            voucherCardGet: false,
+            voucherCardNumber: 0,
+            
             // 方便操作的数据：调整弹出框高度
             fit: 'scale-down',
             controlGoodsDblClickFn: null,
@@ -434,7 +451,7 @@ export default {
                   dateBirthYear:'1994',
                   dateBirthMonth:'4',
                   dateBirthDay:'1',
-                  address:'奥斯卡巅峰计划拉水电费啥地方',
+                  address:'在山的那边海的那边',
                   idCardNo:'465852346854168479'},
               {name:'开户申请书', src:require('@/assets/img/goods/khsqs.png'), id:14},
               {name:'现金', src:require('@/assets/img/goods/cash-sm.png'), id:15},
@@ -1344,6 +1361,12 @@ export default {
             outThingsGoods: 'system/outThingsGoods',
             setTipsOperate: 'system/setTipsOperate'
         }),
+        voucherCardGetIt(number) {
+            if(number === 2) {
+                
+            }
+            this.voucherCardGet = false
+        },
         changePeopleJudge() {
             this.peopleJudge = true;
         },
@@ -1573,15 +1596,15 @@ export default {
             }else if(this.popText.includes('密码器')) {
                 // if(this.systemId == '62,1' || this.systemId == '62,2' || this.systemId == '62,3') {
                 //     if(this.passwordForm.password2 !== this.passwordForm.passwordAgain) {
-                //         this.setTipsOperate('您输入的密码和确认密码不一致!')
+                //         this.setTipsOperate('两次输入密码不一致')
                 //         return
                 //     }
                 // }
                 if(this.passwordForm.passwordAgain.length !== 6) {
                     this.setTipsOperate('您输入的密码不足6位!')
                     return
-                }else if(this.passwordForm.password2 !== this.passwordForm.passwordAgain) {
-                    this.setTipsOperate('您输入的密码和确认密码不一致!')
+                }else if((this.id == '62,1' || this.id == '62,2' || this.id == '62,3') && this.passwordForm.password2 !== this.passwordForm.passwordAgain) {
+                    this.setTipsOperate('两次输入密码不一致')
                     return
                 }
             }else if(this.popText.includes('身份证扫描')) {
@@ -2030,7 +2053,7 @@ export default {
                     // that.outThingsGoods([that.goodsShelfTotalData[evt.oldIndex].id])
                 }else if (this.nbm == 7){ //打印机
                     if(this.goodState.length === 0) {
-                        this.setTipsOperate('请放入证件!')
+                        this.setTipsOperate('请放入打印资料')
                         return
                     }
                     let projectId = sessionStorage.getItem('projectId')
@@ -2061,7 +2084,7 @@ export default {
                             }
                         }
                     }else{
-                        this.setTipsOperate('您输入的密码和确认密码不一致!')
+                        this.setTipsOperate('两次输入密码不一致!')
                     }
                 }else if (this.nbm == 9){//资料
                     if(this.goodState.length === 0) {
@@ -2141,7 +2164,24 @@ export default {
             const targetDom = this.$refs.goods.getBoundingClientRect()
             return evt.originalEvent.pageX<targetDom.right&&evt.originalEvent.pageX>targetDom.left && evt.originalEvent.pageY<targetDom.bottom&&evt.originalEvent.pageY>targetDom.top
         },
-
+        // inputListenCard(val, prop) {
+        //     const tmpCheck = val.substr(val.length-1, 1);
+        //     if(tmpCheck === ' ') {
+        //         return;
+        //     }
+        //     if(val === '') {
+        //         this[prop] = val;
+        //         return;
+        //     }
+        //     const tmpGet = Number(val.replace(/\D+/, ''))
+        //     if(tmpGet <= 2 && tmpGet>0) {
+        //         this[prop] = tmpGet
+        //     }else {
+        //         this.setTipsOperate('最多只能取出两张')
+        //         this[prop] = 2
+        //     }
+            
+        // }
     }
 };
 </script>
diff --git a/src/pages/lobbyManager/list/index.vue b/src/pages/lobbyManager/list/index.vue
index 7293477..5011892 100644
--- a/src/pages/lobbyManager/list/index.vue
+++ b/src/pages/lobbyManager/list/index.vue
@@ -366,7 +366,7 @@ export default {
             }).catch((error)=>{
                 this.$message({
                     showClose: true,
-                    message: '网络可能有问题哦,取号失败',
+                    message: '网络可能有问题,取号失败',
                     type: 'warning',
                     center: true
                 });
@@ -417,7 +417,7 @@ export default {
             }).catch((error)=>{
                 this.$message({
                     showClose: true,
-                    message: '网络可能有问题哦,填单失败',
+                    message: '网络可能有问题,填单失败',
                     type: 'warning',
                     center: true
                 });
@@ -518,7 +518,7 @@ export default {
             }).catch((error)=>{
                 this.$message({
                     showClose: true,
-                    message: '网络可能有问题哦,填单失败',
+                    message: '网络可能有问题,填单失败',
                     type: 'warning',
                     center: true
                 });
diff --git a/src/pages/manage/list/client/consumerClient.vue b/src/pages/manage/list/client/consumerClient.vue
index a14d7ab..33133fd 100644
--- a/src/pages/manage/list/client/consumerClient.vue
+++ b/src/pages/manage/list/client/consumerClient.vue
@@ -239,8 +239,8 @@ export default {
             // }
             this.form.sex = sex
             this.form.birthday = birthday
-            this.form.nationality = nationality
-            this.form.mailbox = mailbox
+            // this.form.nationality = nationality
+            // this.form.mailbox = mailbox
         }
         this.getFormData()
     },
diff --git a/src/pages/manage/list/client/corporateClient.vue b/src/pages/manage/list/client/corporateClient.vue
index 1c6adda..2b697a7 100644
--- a/src/pages/manage/list/client/corporateClient.vue
+++ b/src/pages/manage/list/client/corporateClient.vue
@@ -148,6 +148,10 @@ export default {
     created() {
         // firmClientIdentity
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('firmClientIdentity')) {
+                this.idNumberJudge = true
+                this.form.idNumber = this.dataFlow.idNumber || '441515199812064569'
+            }
             return
         }
         if(sessionStorage.getItem('firmClientIdentity')) {
diff --git a/src/pages/manage/list/dayEnd/branchDayEnd.vue b/src/pages/manage/list/dayEnd/branchDayEnd.vue
index a35b5b2..1c95801 100644
--- a/src/pages/manage/list/dayEnd/branchDayEnd.vue
+++ b/src/pages/manage/list/dayEnd/branchDayEnd.vue
@@ -77,7 +77,6 @@ export default {
     
     .myPadding {
         padding: 24px 0 24px 24px;
-        background-color: red;
     }
 
     /deep/.el-input input {
diff --git a/src/pages/manage/list/personal/callDeposits/accountClosed.vue b/src/pages/manage/list/personal/callDeposits/accountClosed.vue
index b32ebc5..dac760a 100644
--- a/src/pages/manage/list/personal/callDeposits/accountClosed.vue
+++ b/src/pages/manage/list/personal/callDeposits/accountClosed.vue
@@ -280,10 +280,21 @@ export default{
         }
     },
     created() {
+        if(sessionStorage.getItem('nomCallDepositClosedPassword')) {
+            this.form.drawPassword = sessionStorage.getItem('nomCallDepositClosedPassword')
+        }
+
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('nomCallDepositClosedCard')) {
+                this.cardNumberJudge = true
+                this.form.voucherNumber = this.dataFlow.voucherNumber || '159753'
+            }
+            if(sessionStorage.getItem('nomCallDepositClosedCard2')) {
+                this.idNumberJudge = true
+                this.form.idNumber = this.dataFlow.idNumber || '441515199812064569'
+            }
             return
         }
-        console.log('???')
         if(sessionStorage.getItem('nomCallDepositClosedCard')) {
             this.cardNumberJudge = true
             const { noticeType, depositNumber, capital, interest, totalMoney, idNumber, 
@@ -315,9 +326,7 @@ export default{
             this.form.idNumber = idNumber
         }
 
-        if(sessionStorage.getItem('nomCallDepositClosedPassword')) {
-            this.form.drawPassword = sessionStorage.getItem('nomCallDepositClosedPassword')
-        }
+        
 
         const parentId =  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,26,38,289'
         const cards = {
diff --git a/src/pages/manage/list/personal/callDeposits/openAccount.vue b/src/pages/manage/list/personal/callDeposits/openAccount.vue
index 237dbff..8749b27 100644
--- a/src/pages/manage/list/personal/callDeposits/openAccount.vue
+++ b/src/pages/manage/list/personal/callDeposits/openAccount.vue
@@ -268,7 +268,19 @@ export default{
         }
     },
     created() {
+        if(sessionStorage.getItem('nomCallDepositOpenPassword')) {
+            this.form.drawPassword = sessionStorage.getItem('nomCallDepositOpenPassword')
+        }
+
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('nomCallDepositOpen2')) {
+                this.idNumberJudge = true
+                this.form.idNumber = this.dataFlow.idNumber || '441515199812064569'
+            }
+            if(sessionStorage.getItem('nomCallDepositOpen3')) {
+                this.cardNumberJudge = true
+                this.form.voucherNumber = this.dataFlow.voucherNumber || '159753'
+            }
             return
         }
         if(sessionStorage.getItem('nomCallDepositOpen2')) {
@@ -286,9 +298,7 @@ export default{
             this.cardNumberJudge = true
             this.form.voucherNumber = voucherNumber
         }
-        if(sessionStorage.getItem('nomCallDepositOpenPassword')) {
-            this.form.drawPassword = sessionStorage.getItem('nomCallDepositOpenPassword')
-        }
+        
         this.getFormData()
     },
     methods: {
diff --git a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
index 34b7c03..668de1c 100644
--- a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
+++ b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
@@ -116,7 +116,17 @@ export default{
     created() {
         // 混入函数判定，如果不需要则不执行初始化代码
 
+        if(sessionStorage.getItem('nomCurrentCancellPassword')) {
+            this.form.drawPassword = sessionStorage.getItem('nomCurrentCancellPassword')
+        }
+
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('nomCurrentCancellCard2')) {
+                this.idNumberJudge = true
+                const tmpId = this.dataFlow.idNumber || '441421198656412356'
+                this.form.idNumber = tmpId
+            }
+            
             return
         }
 
@@ -129,9 +139,7 @@ export default{
             this.form.idNumber = idNumber
         }
 
-        if(sessionStorage.getItem('nomCurrentCancellPassword')) {
-            this.form.drawPassword = sessionStorage.getItem('nomCurrentCancellPassword')
-        }
+        
 
 
         const parentId =  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,26,57,67'
diff --git a/src/pages/manage/list/personal/currentAccount/deposit.vue b/src/pages/manage/list/personal/currentAccount/deposit.vue
index 343f640..316c692 100644
--- a/src/pages/manage/list/personal/currentAccount/deposit.vue
+++ b/src/pages/manage/list/personal/currentAccount/deposit.vue
@@ -4,7 +4,7 @@
             <el-row :gutter="20" style="margin: 0">
                 <el-form ref="form" :model="form" label-width="120px" :rules="rules">
                     <el-col :span="10" :offset="1">
-                        <el-form-item label="卡号">
+                        <el-form-item label="卡号" required>
 
                             <div v-if='!cardNumberJudge' class="idCard" @click="popUp('刷卡器')">
                                 <p>请刷卡</p>
@@ -123,6 +123,11 @@ export default{
   created() {
 
     if(this.isNeedBefore) {
+        if(sessionStorage.getItem('nomBusinessDepositCard')) {
+            this.cardNumberJudge = true
+            const tmpVoucher = this.dataFlow.voucherNumber || '159753'
+            this.form.voucherNumber = tmpVoucher
+        }
         return
     }
 
diff --git a/src/pages/manage/list/personal/currentAccount/openAccount.vue b/src/pages/manage/list/personal/currentAccount/openAccount.vue
index d920756..caf4ef3 100644
--- a/src/pages/manage/list/personal/currentAccount/openAccount.vue
+++ b/src/pages/manage/list/personal/currentAccount/openAccount.vue
@@ -10,7 +10,7 @@
                         <el-input :value="form.userNumber" disabled @input="(val) => checkHanzi(val, form, 'userNumber')" ref="userNumber"></el-input>
                     </el-form-item>
                     <el-form-item label="币种" prop="currency">
-                        <el-select v-model="form.currency" placeholder="请选择" ref="currency" disabled>
+                        <el-select v-model="form.currency" placeholder="请选择" ref="currency">
                             <el-option label='CNY人民币' :value="12" :key="12">CNY人民币</el-option>
                         </el-select>
                     </el-form-item>
@@ -64,8 +64,8 @@
                               100: '资本临时户' -->
                                 <el-option label="一类户" :value="16"> </el-option>
                                 <el-option label="二类户" :value="17"> </el-option>
-                                <el-option label="结算户" :value="97"> </el-option>
-                                <el-option label="委托保障金户" :value="100"> </el-option>
+                                <!-- <el-option label="结算户" :value="97"> </el-option>
+                                <el-option label="委托保障金户" :value="100"> </el-option> -->
                             </el-select>
                         </el-form-item>
                         <el-form-item label="支取方式" prop="drawWay">
@@ -124,8 +124,8 @@
                 <el-select v-model="form.accountTypesTwo" placeholder="请选择">
                   <el-option label="一类户" :value="16"> </el-option>
                   <el-option label="二类户" :value="17"> </el-option>
-                  <el-option label="结算户" :value="97"> </el-option>
-                  <el-option label="委托保障金户" :value="100"> </el-option>
+                  <!-- <el-option label="结算户" :value="97"> </el-option>
+                  <el-option label="委托保障金户" :value="100"> </el-option> -->
                 </el-select>
               </el-form-item>
               <el-form-item label="支取方式" required>
@@ -184,8 +184,8 @@
                 <el-select v-model="form.accountTypesThree"  placeholder="请选择">
                   <el-option label="一类户" :value="16"> </el-option>
                   <el-option label="二类户" :value="17"> </el-option>
-                  <el-option label="结算户" :value="97"> </el-option>
-                  <el-option label="委托保障金户" :value="100"> </el-option>
+                  <!-- <el-option label="结算户" :value="97"> </el-option>
+                  <el-option label="委托保障金户" :value="100"> </el-option> -->
                 </el-select>
               </el-form-item>
               <el-form-item label="支取方式" required>
@@ -267,7 +267,7 @@ export default {
               drawPassword2: '', // 支取密码2
               drawPassword3: '', // 支取密码3
               userNumber: '', // 客户号
-              currency: 12, // 币种
+              currency: '', // 币种
               userName: '', // 客户姓名
               goldLogo: '', // 钞汇标识
               accountQuality: '', // 账户性质
@@ -401,9 +401,6 @@ export default {
         return
       }
 
-      console.log('s..asdasd')
-      
-
       const { peopleNumber, userName } = this.dataFlow
       this.form.userNumber = peopleNumber
       this.form.userName = userName
@@ -507,16 +504,16 @@ export default {
                             else if (list[i].answerId == '77') {
                               this.form.drawPassword = list[i].emptyTwo
                             }
-                            else if (list[i].answerId == '270') {
-                              this.form.accountQualitysTwo = +list[i].emptyTwo
-                            }
-                            else if (list[i].answerId == '271') {this.form.voucherTypesTwo = +list[i].emptyTwo}
-                            else if (list[i].answerId == '272') {this.form.accountTypesTwo = +list[i].emptyTwo}
-                            else if (list[i].answerId == '274') {this.form.drawWaysTwo = +list[i].emptyTwo}
-                            else if (list[i].answerId == '276') {this.form.accountQualitysThree = +list[i].emptyTwo}
-                            else if (list[i].answerId == '277') {this.form.voucherTypesThree = +list[i].emptyTwo}
-                            else if (list[i].answerId == '278') {this.form.accountTypesThree = +list[i].emptyTwo}
-                            else if (list[i].answerId == '280') {this.form.drawWaysThree = +list[i].emptyTwo}
+                            // else if (list[i].answerId == '270') {
+                            //   this.form.accountQualitysTwo = +list[i].emptyTwo
+                            // }
+                            // else if (list[i].answerId == '271') {this.form.voucherTypesTwo = +list[i].emptyTwo}
+                            // else if (list[i].answerId == '272') {this.form.accountTypesTwo = +list[i].emptyTwo}
+                            // else if (list[i].answerId == '274') {this.form.drawWaysTwo = +list[i].emptyTwo}
+                            // else if (list[i].answerId == '276') {this.form.accountQualitysThree = +list[i].emptyTwo}
+                            // else if (list[i].answerId == '277') {this.form.voucherTypesThree = +list[i].emptyTwo}
+                            // else if (list[i].answerId == '278') {this.form.accountTypesThree = +list[i].emptyTwo}
+                            // else if (list[i].answerId == '280') {this.form.drawWaysThree = +list[i].emptyTwo}
                         }
                         if(sessionStorage.getItem('accountPassword')) {
                             this.form.drawPassword = sessionStorage.getItem('accountPassword')
@@ -669,6 +666,7 @@ export default {
           //   });
           //   return;
           // }
+          console.log(this.form)
           this.$refs.form.validate(myValidate(() => {
                 
 
@@ -815,8 +813,16 @@ export default {
               this.count = this.count-1;
               sessionStorage.setItem('openAccountCount', this.count)
               if (this.count < 1){this.count = 0}
-              if (this.count == 0){this.formTwo = false}
-              if (this.count == 1){this.formThree = false}
+              if (this.count == 0){
+                sessionStorage.removeItem('accountPasswordTwo')
+                sessionStorage.removeItem('accountVoucherTwo')
+                this.formTwo = false
+              }
+              if (this.count == 1){
+                sessionStorage.removeItem('accountVoucherThree')
+                sessionStorage.removeItem('accountPasswordThree')
+                this.formThree = false
+              }
                 // this.second.splice(index,1)
                 this.setTipsOperate('删除成功!')
             }).catch(() => {
@@ -891,9 +897,31 @@ export default {
         })
     },
     watch: {
-      count(newVal) {
-        console.log(newVal)
+      formTwo: {
+        handler(newVal) {
+          if(!newVal) {
+            this.form.drawWaysTwo = ''
+            this.form.accountQualitysTwo = ''
+            this.form.voucherTypesTwo = ''
+            this.form.accountTypesTwo = ''
+            this.form.drawPassword2 = ''
+          }
+        },
+        immediate: true
+      },
+      formThree: {
+        handler(newVal) {
+          if(!newVal) {
+            this.form.drawWaysThree = ''
+            this.form.accountQualitysThree = ''
+            this.form.voucherTypesThree = ''
+            this.form.accountTypesThree = ''
+            this.form.drawPassword3 = ''
+          }
+        },
+        immediate: true
       }
+      
     },
 
 };
diff --git a/src/pages/manage/list/personal/currentAccount/settle.vue b/src/pages/manage/list/personal/currentAccount/settle.vue
index 628b1a9..3a36dc1 100644
--- a/src/pages/manage/list/personal/currentAccount/settle.vue
+++ b/src/pages/manage/list/personal/currentAccount/settle.vue
@@ -177,7 +177,15 @@ export default{
         }
     },
     created() {
+        if(sessionStorage.getItem('nomCurrentSettlePassword')) {
+            this.form.drawPassword = sessionStorage.getItem('nomCurrentSettlePassword')
+        }
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('nomCurrentSettleCard')) {
+                this.cardNumberJudge = true
+                const tmpCardNumber = this.dataFlow.voucherNumber || '159753'
+                this.form.cardNumber = tmpCardNumber
+            }
             return
         }
         if(sessionStorage.getItem('nomCurrentSettleCard')) {
@@ -193,11 +201,6 @@ export default{
             this.form.totalMoney = totalMoney
         }
 
-        if(sessionStorage.getItem('nomCurrentSettlePassword')) {
-            this.form.drawPassword = sessionStorage.getItem('nomCurrentSettlePassword')
-        }
-        
-
         const parentId =  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,26,57,66'
         const cardArr = {
             // 103: 'nomCurrentSettleCard',
diff --git a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
index 209cb50..a8111e1 100644
--- a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
+++ b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
@@ -189,11 +189,19 @@ export default{
         }
     },
    created() {
+    if(sessionStorage.getItem('nomCurrentTransferPassword')) {
+        this.form.drawPassword = sessionStorage.getItem('nomCurrentTransferPassword')
+    }
     if(this.isNeedBefore) {
+        if(sessionStorage.getItem('nomCurrentTransferCard')) {
+            this.cardNumberJudge = true
+            this.form.cardNumber = this.dataFlow.voucherNumber || '159753'
+
+        }
         return
     }
     if(sessionStorage.getItem('nomCurrentTransferCard')) {
-        this.cardNumberJudge = true
+        
         const { currency, userName, goldLogo, voucherNumber } = this.dataFlow
         this.form.cardNumber = voucherNumber
         this.form.currency = currency
@@ -201,9 +209,7 @@ export default{
         this.form.goldLogo = goldLogo
     }
 
-    if(sessionStorage.getItem('nomCurrentTransferPassword')) {
-        this.form.drawPassword = sessionStorage.getItem('nomCurrentTransferPassword')
-    }
+    
 
     const parentId =  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,26,57,65'
     const cardArr = {
diff --git a/src/pages/manage/list/personal/currentAccount/withdrawal.vue b/src/pages/manage/list/personal/currentAccount/withdrawal.vue
index 0ea34e5..5603f38 100644
--- a/src/pages/manage/list/personal/currentAccount/withdrawal.vue
+++ b/src/pages/manage/list/personal/currentAccount/withdrawal.vue
@@ -84,7 +84,14 @@ export default{
         NeedBefore
     },
     created() {
+        if(sessionStorage.getItem('nomCurrentWithdrawalPassword')) {
+            this.form.drawPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword')
+        }
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('nomCurrentWithdrawalCard')) {
+                this.cardNumberJudge = true
+                this.form.cardNumber = this.dataFlow.voucherNumber || '159753'
+            }
             return
         }
         if(sessionStorage.getItem('nomCurrentWithdrawalCard')) {
@@ -98,9 +105,7 @@ export default{
             this.form.cardNumber = voucherNumber
         }
 
-        if(sessionStorage.getItem('nomCurrentWithdrawalPassword')) {
-            this.form.drawPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword')
-        }
+        
         this.getFormData()
         
     },
diff --git a/src/pages/manage/list/personal/timeDeposit/deposit.vue b/src/pages/manage/list/personal/timeDeposit/deposit.vue
index abe9cd5..b55e4c2 100644
--- a/src/pages/manage/list/personal/timeDeposit/deposit.vue
+++ b/src/pages/manage/list/personal/timeDeposit/deposit.vue
@@ -270,7 +270,15 @@ export default{
         }
     },
     created() {
+        if(sessionStorage.getItem('nomtimeDepositlPassword')) {
+            this.form.drawPassword = sessionStorage.getItem('nomtimeDepositlPassword')
+        }
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('nomtimeDeposit1')) {
+                this.cardNumberJudge = true
+                this.form.voucherNumber = this.dataFlow.voucherNumber || '159753'
+            }
+            
             return
         }
         if(sessionStorage.getItem('nomtimeDeposit1')) {
@@ -282,9 +290,7 @@ export default{
             this.form.voucherNumber = voucherNumber
         }
         
-        if(sessionStorage.getItem('nomtimeDepositlPassword')) {
-            this.form.drawPassword = sessionStorage.getItem('nomtimeDepositlPassword')
-        }
+        
 
 
         this.getFormData()
diff --git a/src/pages/manage/list/personal/timeDeposit/openAccount.vue b/src/pages/manage/list/personal/timeDeposit/openAccount.vue
index c98c351..726e2cc 100644
--- a/src/pages/manage/list/personal/timeDeposit/openAccount.vue
+++ b/src/pages/manage/list/personal/timeDeposit/openAccount.vue
@@ -221,7 +221,20 @@ export default{
         }
     },
     created() {
+        if(sessionStorage.getItem('nomtimeOpenAccountPassword')) {
+            this.form.drawPassword = sessionStorage.getItem('nomtimeOpenAccountPassword')
+        }
+
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('nomtimeOpenAccount1')) {
+                this.idNumberJudge = true
+                this.form.idNumber = this.dataFlow.idNumber || '441515199812064569'
+            }
+            if(sessionStorage.getItem('nomtimeOpenAccount2')) {
+                this.cardNumberJudge = true
+                this.form.voucherNumber = this.dataFlow.voucherNumber || '159753'
+            }
+
             return
         }
         this.form.clientNumber = this.dataFlow.peopleNumber
@@ -243,9 +256,7 @@ export default{
             this.form.voucherNumber = voucherNumber
         }
 
-        if(sessionStorage.getItem('nomtimeOpenAccountPassword')) {
-            this.form.drawPassword = sessionStorage.getItem('nomtimeOpenAccountPassword')
-        }
+        
         this.getFormData()
   },
     mounted() {
diff --git a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
index 71c5b06..61cd200 100644
--- a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
+++ b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
@@ -86,7 +86,16 @@ export default{
         MyDialog
     },
     created() {
+        if(sessionStorage.getItem('nomtimeDepositWithdrawalPassword2')) {
+            this.form.drawPassword = sessionStorage.getItem('nomtimeDepositWithdrawalPassword2')
+        }
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('nomtimeDepositWithdrawal1')) {
+                this.cardNumberJudge = true
+                this.form.voucherNumber = this.dataFlow.voucherNumber || '159753'
+            }
+            
+
             return
         }
         const { withdrawWay } = this.dataFlow
@@ -108,9 +117,7 @@ export default{
                 // this.form.withdrawWay = withdrawWay
             }
 
-            if(sessionStorage.getItem('nomtimeDepositWithdrawalPassword2')) {
-                this.form.drawPassword = sessionStorage.getItem('nomtimeDepositWithdrawalPassword2')
-            }
+            
         }else {
             this.form.interest = 0.00
 
@@ -353,12 +360,17 @@ export default{
         },
         popUp(text) {
             // this.$store.commit('system/changePop',{show:true,text, id: '144,1'})
-            const { withdrawWay } = this.dataFlow
-            if(withdrawWay === 126) {
-                this.setPopId('144,2')
-            }else {
+            if(this.isNeedBefore) {
                 this.setPopId('144,1')
+            }else {
+                const { withdrawWay } = this.dataFlow
+                if(withdrawWay === 126) {
+                    this.setPopId('144,2')
+                }else {
+                    this.setPopId('144,1')
+                }
             }
+            
             this.setTipsOperate('请刷银行卡');
             
             
@@ -367,12 +379,17 @@ export default{
         },
         popUp2(text) {
             // this.$store.commit('system/changePop',{show:true,text, id: '154'})
-            const { withdrawWay } = this.dataFlow
-            if(withdrawWay === 126) {
-                this.setPopId('154,2')
-            }else {
+            if(this.isNeedBefore) {
                 this.setPopId('154')
+            }else {
+                const { withdrawWay } = this.dataFlow
+                if(withdrawWay === 126) {
+                    this.setPopId('154,2')
+                }else {
+                    this.setPopId('154')
+                }
             }
+            
             this.setTipsOperate('请在密码器输入密码');
             
             sessionStorage.setItem('computerPath', this.$route.fullPath)
diff --git a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
index 26e082e..b8291c9 100644
--- a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
@@ -117,7 +117,18 @@ export default{
     },
     mixins: [ TipsBefore ],
     created() {
+        if(sessionStorage.getItem('nomUsefulPhrasesClosedPassword')) {
+            this.form.drawPassword = sessionStorage.getItem('nomUsefulPhrasesClosedPassword')
+        }
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('nomUsefulPhrasesClosed')) {
+                this.idNumberJudge = true
+                this.form.idNumber = this.dataFlow.idNumber || '441515199812064569'
+            }
+            if(sessionStorage.getItem('nomUsefulPhrasesClosed2')) {
+                this.cardNumberJudge = true
+                this.form.voucherNumber = this.dataFlow.voucherNumber || '159753'
+            }
             return
         }
         if(sessionStorage.getItem('nomUsefulPhrasesClosed')) {
@@ -141,9 +152,7 @@ export default{
             this.form.depositTerm = depositTerm
             console.log(depositTerm)
         }
-        if(sessionStorage.getItem('nomUsefulPhrasesClosedPassword')) {
-            this.form.drawPassword = sessionStorage.getItem('nomUsefulPhrasesClosedPassword')
-        }
+        
 
         this.getFormData()
     },
diff --git a/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue b/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue
index 7bd5c90..5ef6869 100644
--- a/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue
@@ -74,7 +74,14 @@ export default{
         MyDialog
     },
     created() {
+        if(sessionStorage.getItem('nomUsefulPhrasesContinuePassword')) {
+            this.form.drawPassword = sessionStorage.getItem('nomUsefulPhrasesContinuePassword')
+        }
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('nomUsefulPhrasesContinueCard')) {
+                this.cardNumberJudge = true
+                this.form.voucherNumber = this.dataFlow.voucherNumber
+            }
             return
         }
         if(sessionStorage.getItem('nomUsefulPhrasesContinueCard')) {
@@ -88,9 +95,7 @@ export default{
             this.form.goldLogo = goldLogo
             this.form.monthDeposit = monthDeposit
         }
-        if(sessionStorage.getItem('nomUsefulPhrasesContinuePassword')) {
-            this.form.drawPassword = sessionStorage.getItem('nomUsefulPhrasesContinuePassword')
-        }
+        
         this.getFormData()
     },
     data(){
diff --git a/src/pages/manage/list/personal/usefulPhrases/openAccount.vue b/src/pages/manage/list/personal/usefulPhrases/openAccount.vue
index 1fbc92b..828d697 100644
--- a/src/pages/manage/list/personal/usefulPhrases/openAccount.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/openAccount.vue
@@ -104,7 +104,19 @@ export default{
     },
     mixins: [ TipsBefore ],
     created() {
+        if(sessionStorage.getItem('nomUsefulPhrasesOpenPassword')) {
+            this.form.drawPassword = sessionStorage.getItem('nomUsefulPhrasesOpenPassword')
+        }
+
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('nomUsefulPhrasesOpenCard2')) {
+                this.idNumberJudge = true
+                this.form.idNumber = this.dataFlow.idNumber || '441515199812064569'
+            }
+            if(sessionStorage.getItem('nomUsefulPhrasesOpenCard')) {
+                this.cardNumberJudge = true
+                this.form.voucherNumber = this.dataFlow.voucherNumber || '159753'
+            }
             return
         }
         if(sessionStorage.getItem('nomUsefulPhrasesOpenCard2')) {
@@ -123,9 +135,7 @@ export default{
             const { voucherNumber } = this.dataFlow
             this.form.voucherNumber = voucherNumber
         }
-        if(sessionStorage.getItem('nomUsefulPhrasesOpenPassword')) {
-            this.form.drawPassword = sessionStorage.getItem('nomUsefulPhrasesOpenPassword')
-        }
+        
 
         this.getFormData()
         
diff --git a/src/pages/manage/list/servicesAccount/passwordChange.vue b/src/pages/manage/list/servicesAccount/passwordChange.vue
index 8368d47..0f44776 100644
--- a/src/pages/manage/list/servicesAccount/passwordChange.vue
+++ b/src/pages/manage/list/servicesAccount/passwordChange.vue
@@ -162,7 +162,22 @@ export default{
         }
     },
     created() {
+        if(sessionStorage.getItem('servicesPasswordChange3')) {
+            this.form.payPassword = sessionStorage.getItem('servicesPasswordChange3')
+        }
+        if(sessionStorage.getItem('servicesPasswordChange4')) {
+            this.form.newPayPassword = sessionStorage.getItem('servicesPasswordChange4')
+        }
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('servicesPasswordChange')) {
+                this.idNumberJudge = true
+                this.form.idNumber = this.dataFlow.idNumber || '441515199812064569'
+            }
+            if(sessionStorage.getItem('servicesPasswordChange2')) {
+                this.cardNumberJudge = true
+                this.form.voucherNumber = this.dataFlow.voucherNumber || '159753'
+            }
+
             return
         }
         if(sessionStorage.getItem('servicesPasswordChange')) {
@@ -175,12 +190,7 @@ export default{
             const { voucherNumber } = this.dataFlow
             this.form.voucherNumber = voucherNumber
         }
-        if(sessionStorage.getItem('servicesPasswordChange3')) {
-            this.form.payPassword = sessionStorage.getItem('servicesPasswordChange3')
-        }
-        if(sessionStorage.getItem('servicesPasswordChange4')) {
-            this.form.newPayPassword = sessionStorage.getItem('servicesPasswordChange4')
-        }
+        
         
 
         const parentId =  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,28,316'
diff --git a/src/pages/manage/list/servicesAccount/passwordLost.vue b/src/pages/manage/list/servicesAccount/passwordLost.vue
index 9ffc192..d6a3f1c 100644
--- a/src/pages/manage/list/servicesAccount/passwordLost.vue
+++ b/src/pages/manage/list/servicesAccount/passwordLost.vue
@@ -114,6 +114,14 @@ export default{
     },
     created() {
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('servicesPasswordLost')) {
+                this.cardNumberJudge = true
+                this.form.voucherNumber = this.dataFlow.voucherNumber || '159753'
+            }
+            if(sessionStorage.getItem('servicesPasswordLost2')) {
+                this.idNumberJudge = true
+                this.form.idNumber = this.dataFlow.idNumber || '441515199812064569'
+            }
             return
         }
         if(sessionStorage.getItem('servicesPasswordLost')) {
diff --git a/src/pages/manage/list/servicesAccount/relieveLost.vue b/src/pages/manage/list/servicesAccount/relieveLost.vue
index 88df197..8d85ac1 100644
--- a/src/pages/manage/list/servicesAccount/relieveLost.vue
+++ b/src/pages/manage/list/servicesAccount/relieveLost.vue
@@ -206,7 +206,18 @@ export default{
         // 341: 'servicesPasswordRelieveLost',
             // 337: 'servicesPasswordRelieveLost2',
             // 343: 'servicesPasswordRelievePassword',
+        if(sessionStorage.getItem('servicesPasswordRelievePassword')) {
+            this.form.payPassword = sessionStorage.getItem('servicesPasswordRelievePassword')
+        }
         if(this.isNeedBefore) {
+            if(sessionStorage.getItem('servicesPasswordRelieveLost')) {
+                this.idNumberJudge = true
+                this.form.idNumber = this.dataFlow.idNumber || '441515199812064569'
+            }
+            if(sessionStorage.getItem('servicesPasswordRelieveLost2')) {
+                this.cardNumberJudge = true
+                this.form.voucherNumber = this.dataFlow.voucherNumber || '159753'
+            }
             return
         }
         if(sessionStorage.getItem('servicesPasswordRelieveLost')) {
@@ -221,9 +232,7 @@ export default{
             this.form.voucherNumber = voucherNumber
             
         }
-        if(sessionStorage.getItem('servicesPasswordRelievePassword')) {
-            this.form.payPassword = sessionStorage.getItem('servicesPasswordRelievePassword')
-        }
+        
         
 
         const parentId =  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,28,336'