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

本业务需要授权

- + @@ -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 ] + '成功' + }, } } 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 @@
-
+
- +
银行单据
@@ -142,9 +142,7 @@
  • -
  • -
  • -
  • + @@ -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 @@