From 1027879269d60dd84bfec19e5ff2c2cedc087ff3 Mon Sep 17 00:00:00 2001 From: "luoJunYong.123" Date: Tue, 15 Feb 2022 17:10:35 +0800 Subject: [PATCH] update_2.15 --- src/components/dialog/index.vue | 3 + src/components/dialog2/index.vue | 3 + src/components/selectBusiness/index.vue | 12 +- src/mixins/saveSystemModule/index.js | 15 + src/pages/counter/list/index.vue | 4 +- src/pages/index/list/index.vue | 22 +- src/pages/lobbyManager/list/index.vue | 380 ++++++++++++++---- .../list/ImportantCash/controlCash3/index.vue | 76 +++- .../list/servicesAccount/relieveLost.vue | 6 +- src/store/modules/system.js | 78 +++- 10 files changed, 479 insertions(+), 120 deletions(-) create mode 100644 src/mixins/saveSystemModule/index.js diff --git a/src/components/dialog/index.vue b/src/components/dialog/index.vue index be3ff3a..b465772 100644 --- a/src/components/dialog/index.vue +++ b/src/components/dialog/index.vue @@ -143,6 +143,9 @@ const nameMap = { chargeWay: { 13: '密码', }, + chargeWay2: { + 135: '现金', + }, certificateDeposit: { 92: '现金' }, diff --git a/src/components/dialog2/index.vue b/src/components/dialog2/index.vue index 8712e61..09e83cd 100644 --- a/src/components/dialog2/index.vue +++ b/src/components/dialog2/index.vue @@ -137,6 +137,9 @@ const nameMap = { chargeWay: { 13: '密码', }, + chargeWay2: { + 135: '现金', + }, certificateDeposit: { 92: '现金' }, diff --git a/src/components/selectBusiness/index.vue b/src/components/selectBusiness/index.vue index 01c89d0..cc48d03 100644 --- a/src/components/selectBusiness/index.vue +++ b/src/components/selectBusiness/index.vue @@ -10,6 +10,7 @@

{{ item.myKey + item.text}}

+
  • @@ -147,10 +148,14 @@ export default { }, { myKey: '项目二十六', - text: ': 柜员日中轧账' + text: ': 支票出售' }, { myKey: '项目二十七', + text: ': 柜员日中轧账' + }, + { + myKey: '项目二十八', text: ': 网点日中轧账' } ], @@ -485,4 +490,9 @@ export default { } } } + +.sitting { + opacity: 0; + cursor: default!important; +} \ No newline at end of file diff --git a/src/mixins/saveSystemModule/index.js b/src/mixins/saveSystemModule/index.js new file mode 100644 index 0000000..dca838a --- /dev/null +++ b/src/mixins/saveSystemModule/index.js @@ -0,0 +1,15 @@ +export default { + created() { + if(sessionStorage.getItem('businessSelect')) { + // 调试时注释掉 + this.$store.commit('system/setBusinessSelect', JSON.parse(sessionStorage.getItem('businessSelect'))) + } + if(sessionStorage.getItem('businessKey')) { + this.$store.commit('system/setBusinessKey', sessionStorage.getItem('businessKey')) + } + window.addEventListener("beforeunload",()=>{ + sessionStorage.setItem('businessKey', this.$store.state.system.businessKey) + sessionStorage.setItem('businessSelect', JSON.stringify(this.$store.state.system.businessSelect)) + }) + } +} \ No newline at end of file diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index de40aa6..b6dec6b 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -1057,11 +1057,11 @@ export default { } if(sessionStorage.getItem('businessSelect')) { // 调试时注释掉 - // this.$store.commit('system/setBusinessSelect', JSON.parse(sessionStorage.getItem('businessSelect'))) + this.$store.commit('system/setBusinessSelect', JSON.parse(sessionStorage.getItem('businessSelect'))) } window.addEventListener("beforeunload",()=>{ sessionStorage.setItem('businessKey', this.$store.state.system.businessKey) - // sessionStorage.setItem('businessSelect', JSON.stringify(this.$store.state.system.businessSelect)) + sessionStorage.setItem('businessSelect', JSON.stringify(this.$store.state.system.businessSelect)) }) this.startPlay() console.log('startPlay') diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue index e9dbe41..e990c75 100644 --- a/src/pages/index/list/index.vue +++ b/src/pages/index/list/index.vue @@ -155,6 +155,10 @@ export default { top: 0; left: 72%; width: 28%; + transition: all .5s; + &:hover{ + top: -20px; + } } .manager{ top: 47%; @@ -162,23 +166,36 @@ export default { width: 39%; transition: all .5s; &:hover{ - top: calc(48% - 10px); + z-index: 9999; + top: calc(48% - 20px); } } .credit-dep{ top: 35%; left: 0; width: 20%; + transition: all .5s; + &:hover{ + top: 33%; + } } .company-finance{ top: 55%; left: 9%; width: 28%; + transition: all .5s; + &:hover{ + top: 53%; + } } .personal-finance{ top: 72%; left: 25%; width: 30%; + transition: all .5s; + &:hover{ + top: 70%; + } } .case{ position: absolute; @@ -192,6 +209,9 @@ export default { font-size: 24px; background: url(../../../assets/img/case.png) 0 0 /cover no-repeat; cursor: pointer; + // &:hover{ + // top: 76px; + // } } @media(max-width: 1440px){ .credit-dep{ diff --git a/src/pages/lobbyManager/list/index.vue b/src/pages/lobbyManager/list/index.vue index 2ca8d68..7c8b08f 100644 --- a/src/pages/lobbyManager/list/index.vue +++ b/src/pages/lobbyManager/list/index.vue @@ -20,39 +20,44 @@

    - 请选择办理的业务 -

    - - + +
    -
    取号机
    +
    {{ workingName + '机'}}
    -
    取号成功
    -

    您选择了现金业务

    +
    {{ workingName + '成功'}}
    +

    您选择了{{ handleBusiness[takeCheck]? handleBusiness[takeCheck].name: ''}}

    @@ -63,74 +68,88 @@

    - 请单击选中所需材料、双击可放大预览 -

    @@ -141,23 +160,13 @@

    - 请单击选中复印材料、双击可放大预览 -

    @@ -183,20 +192,37 @@ + + + +