diff --git a/src/components/case/index.vue b/src/components/case/index.vue index 34d7434..44f9b0a 100644 --- a/src/components/case/index.vue +++ b/src/components/case/index.vue @@ -417,6 +417,7 @@ export default { }, methods: { ...mapMutations({ + setPopId: 'system/setPopId', setBusinessKey: 'system/setBusinessKey', initState: 'system/initState', setShowBusiness: 'system/setShowBusiness', @@ -654,8 +655,9 @@ export default { sessionStorage.setItem('accountVoucher', JSON.stringify(formList)) sessionStorage.setItem('accountPasswordAll', '') sessionStorage.setItem('projectId', this.projectId) - sessionStorage.setItem('submited', 0) - sessionStorage.setItem('firstLoad2', true) + sessionStorage.removeItem('submited', 0) + sessionStorage.removeItem('firstLoad2') + this.setBusinessKey('') getProjectDetail(params).then((data) => { if (data.status == 200) { const { systemId, projectId } = data.data.projectManage @@ -906,6 +908,7 @@ export default { sessionStorage.setItem('ruleReqs', JSON.stringify(formList)) sessionStorage.setItem('accountVoucher', JSON.stringify(formList)) sessionStorage.setItem('accountPasswordAll', '') + this.setPopId('') this.setBusinessKey('') let params = { "projectId": projectId, diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index 43c63ca..7d03b76 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -1894,6 +1894,7 @@ export default { } if (this.popText === '身份证扫描仪' || this.popText === '刷卡器' || this.popText === '密码器') { + debugger if (this.$store.state.system.id == '33' && this.popText === '身份证扫描仪') { this.nbm = 33 diff --git a/src/pages/manage/list/dayEnd/branchDayEnd.vue b/src/pages/manage/list/dayEnd/branchDayEnd.vue index dcd5c26..a5e49ae 100644 --- a/src/pages/manage/list/dayEnd/branchDayEnd.vue +++ b/src/pages/manage/list/dayEnd/branchDayEnd.vue @@ -1,24 +1,49 @@ diff --git a/src/store/modules/system.js b/src/store/modules/system.js index 8f3705b..4616633 100644 --- a/src/store/modules/system.js +++ b/src/store/modules/system.js @@ -778,7 +778,7 @@ const myInitState = { '业务十四': { // 公司现金支票转账 id: 503, name: '公司支票转账', - data: [ 442, 412 ], + data: [ 442, 412,431 ], needs: [ 426 ], isStamp: { '私章转讫章': [ 412 ], @@ -1935,7 +1935,7 @@ export default { '业务十三': { // 公司现金支票取款 id: 502, name: '公司现金支票取款', - data: [ 442, 411 ], + data: [ 442, 411, 411 ], needs: [ 425, 15 ], isStamp: { '付讫章': [ 425 ], @@ -1975,7 +1975,7 @@ export default { '业务十四': { // 公司现金支票转账 id: 503, name: '公司支票转账', - data: [ 442, 412 ], + data: [ 442, 412,431 ], needs: [ 426 ], isStamp: { '私章转讫章': [ 412 ], @@ -2780,7 +2780,7 @@ export default { cb([422, 424]) } else if(id === 411) { - state.businessSelect[state.businessKey].data.push(472, 473) + state.businessSelect[state.businessKey].data.push(473, 472) judgeDelete = false stampSuccess = '456' cb([472, 473]) diff --git a/src/styles/layout/index.scss b/src/styles/layout/index.scss index 89ce2d3..0e737f4 100644 --- a/src/styles/layout/index.scss +++ b/src/styles/layout/index.scss @@ -1,5 +1,5 @@ -@import "lib/var"; -@import "var"; +@import 'lib/var'; +@import 'var'; html, body, #app, @@ -9,22 +9,24 @@ body, } body { - font-family: 'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif; + font-family: 'PingFang SC', 'Helvetica Neue', Helvetica, 'microsoft yahei', arial, STHeiTi, sans-serif; font-size: 14px; background: rgba(0, 0, 0, 0.02); + overflow: auto !important; } -#app .body{ - - .el-input .el-input__inner{ - border: 2px solid #EDEDED; +#app .body { + .el-input .el-input__inner { + border: 2px solid #ededed; //height: 68px!important; font-size: 18px; } - .el-date-editor.el-input, .el-date-editor.el-input__inner,.el-select{ + .el-date-editor.el-input, + .el-date-editor.el-input__inner, + .el-select { width: 100%; } - .el-form-item__label{ + .el-form-item__label { //line-height: 68px; font-size: 18px; } -} \ No newline at end of file +}