From a3c1212620d5e07cc77d8ba3a3bc6aa6f12630e8 Mon Sep 17 00:00:00 2001 From: "luoJunYong.123" Date: Tue, 11 Jan 2022 18:24:57 +0800 Subject: [PATCH] update --- src/pages/counter/list/index.vue | 14 +++++++++++--- src/store/modules/system.js | 18 +++++++----------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index 53dbaa6..85ed244 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -1244,9 +1244,17 @@ export default { this.commonChecked.includes(id) ? this.commonChecked.splice(this.commonChecked.indexOf(id), 1) : this.commonChecked.push(id); }, closePop() {// 关闭弹窗 - if(this.myMap && this.myMap !== 'sealBox') { - this.replaceThings({ name: this.myMap, idArr: [...this.boxStart] }) - this.replaceThingsGoods( [...this.boxStart2] ) + if(this.myMap) { + if(this.myMap === 'sealBox') { + if(this.goodState.length) { + const { id } = this.goodState[0] + this.pushThingsGoods( [ id ] ) + this.outThings({name: this.myMap, idArr: [ id ]}) + } + }else { + this.replaceThings({ name: this.myMap, idArr: [...this.boxStart] }) + this.replaceThingsGoods( [...this.boxStart2] ) + } } this.receptionList = []; diff --git a/src/store/modules/system.js b/src/store/modules/system.js index d82cf7e..75542e5 100644 --- a/src/store/modules/system.js +++ b/src/store/modules/system.js @@ -47,8 +47,8 @@ const allGoods = { '统一社会信用代码证': {name:'统一社会信用代码证',src:require('@/assets/img/goods/ywsfpz.png'),id:'统一社会信用代码证'}, '统一社会信用代码证复印件': {name:'统一社会信用代码证复印件',src:require('@/assets/img/goods/ywsfpz.png'),id:'统一社会信用代码证复印件'}, - '开户许可证': {name:'开户许可证',src:require('@/assets/img/goods/lxqd.png'),id:'开户许可证'}, - '开户许可证复印件': {name:'开户许可证复印件',src:require('@/assets/img/goods/lxqd.png'),id:'开户许可证复印件'}, + '开户许可证': {name:'开户许可证',src:require('@/assets/img/goods/开户许可证.png'),id:'开户许可证'}, + '开户许可证复印件': {name:'开户许可证复印件',src:require('@/assets/img/goods/开户许可证.png'),id:'开户许可证复印件'}, '开立银行结算账户申请书凭证联': {name:'开立银行结算账户申请书凭证联',src:require('@/assets/img/goods/ApplicationBankSettlement.png'),id:'开立银行结算账户申请书凭证联'}, '开立银行结算账户申请书回单': {name:'开立银行结算账户申请书回单',src:require('@/assets/img/goods/ApplicationBankSettlement.png'),id:'开立银行结算账户申请书回单'}, @@ -1503,10 +1503,7 @@ export default { startTime:startTime, } addOperation(params).then((data)=>{ - Message.success({ - center: true, - message: '盖章成功' - }) + if(judgeDelete) { this.commit('system/pushThingsGoods', [...state.businessSelect[state.businessKey].sealBox]) } @@ -1514,12 +1511,11 @@ export default { }).catch((error)=>{ }) }else { - Message.info({ - center: true, - message: '盖章失败,请检查印章或证件是否正确' - }) } - + Message.success({ + center: true, + message: '盖章成功' + }) }, setBusinessKey: (state, val) => { // 这个是容错的 后面可以删掉