update

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 {

src/components/dialog/index.vue

@@ -143,8 +143,8 @@ const obj = {
     'servicesAccount/passwordChange': '密码修改',
     'servicesAccount/passwordLost': '密码挂失登记',
     'servicesAccount/relieveLost': '挂失解挂登记',
-    'controlCash/cashRecipients': '现金管理',
     
+    'controlCash/cashTransferInto': '现金上缴',
     'spacial': '提交'
 }
 const nameMap = {

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%;

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,

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">

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">

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 {

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){

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;

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;
     }

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;

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: [],

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 = () => {