diff --git a/src/components/case/index.vue b/src/components/case/index.vue index e0f9434..84c0c76 100644 --- a/src/components/case/index.vue +++ b/src/components/case/index.vue @@ -71,7 +71,9 @@ - + + + - + diff --git a/src/components/dialogTwo/index.vue b/src/components/dialogTwo/index.vue index e84872f..425ede9 100644 --- a/src/components/dialogTwo/index.vue +++ b/src/components/dialogTwo/index.vue @@ -308,9 +308,16 @@ export default { // } num++; } - this.leftObj['上缴柜员号'] = '002119' - this.leftObj['接收柜员号'] = '002110' - this.rightObj['机构号'] = '1234100' + // 网点日终轧账业务显示为002119 + if (this.moduleName === 'branchDayEnd') { + this.leftObj['授权柜员号'] = '002119' + this.disForm.name = '002119' + this.leftObj['机构号'] = '1234100' + } else { + this.leftObj['上缴柜员号'] = '002119' + this.leftObj['接收柜员号'] = '002110' + this.rightObj['机构号'] = '1234100' + } const tmpFunc = () => { const date = new Date() var y = date.getFullYear(); diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index 709975c..67a3ae8 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -1527,7 +1527,7 @@ export default { clearTimeout(this.controlGoodsDblClickFn) this.controlGoodsDblClickFn = null } - + if (this.finishSealedArr.includes(item.id)) return false // 盖章过的不能双击放大 const judge = item.name.includes('本联') || item.name.includes('凭证联') || (item.name.includes('回单') && !item.name.includes('密码挂失申请书回单')) || (item.name.includes('复印件') && !item.name.includes('身份证复印件') ) || item.name.includes('(二)') || item.name.includes('(三)') if(!(judge)) { diff --git a/src/store/modules/system.js b/src/store/modules/system.js index b16081b..3e59369 100644 --- a/src/store/modules/system.js +++ b/src/store/modules/system.js @@ -123,7 +123,7 @@ const eMailAddress = '666@qq.com' const drawerUsername = '12802851701099' // 出票人账号 const nowDepositNumber = '568812090' -const voucherNumber = '6227007200582226' +const voucherNumber = '6227007200580926' // 业务一的卡二号码 const voucherNumber2 = '6227007200582345' const sex = 2 // 1为男,2为女。 @@ -2712,7 +2712,6 @@ export default { const id = state.businessSelect[state.businessKey].sealBox[0] let judgeDelete = true // 盖完章是否变化 为false的会删掉。。。 let stampSuccess = '' // 盖章成功 - // 以为要特定的章盖特定的物品,盖完后结果还不一样。有些东西盖了会消失,有些不会。 // 有些东西还要盖两个章。当时选择了最直接的if-else判断。其实用map结构也不是不行。 if(sealArr.length === 1) { @@ -2754,6 +2753,8 @@ export default { state.businessSelect[state.businessKey].data.push(482, 481) judgeDelete = false stampSuccess = '464' + }else if(id === 411) { + judgeDelete = false } }else if(seal === '付讫章') { if(id === 425) { @@ -2804,6 +2805,8 @@ export default { if(id === 439) { stampSuccess = '454' + }else if(id === 411) { + judgeDelete = false } } }else if(sealArr.length === 2) { @@ -2836,8 +2839,7 @@ export default { } } } - - if(stampSuccess) { + // if(stampSuccess) { let projectId = sessionStorage.getItem('projectId') let startTime = sessionStorage.getItem('startTime') if(!sessionStorage.getItem('stampList')) { @@ -2866,12 +2868,12 @@ export default { this.commit('system/setTipsOperate', '盖章成功!') }).catch((error)=>{ }) - }else { + // }else { - this.commit('system/pushThingsGoods', [...state.businessSelect[state.businessKey].sealBox]) - state.businessSelect[state.businessKey].sealBox.splice(0, 1) - this.commit('system/setTipsOperate', '盖章成功!') - } + // this.commit('system/pushThingsGoods', [...state.businessSelect[state.businessKey].sealBox]) + // state.businessSelect[state.businessKey].sealBox.splice(0, 1) + // this.commit('system/setTipsOperate', '盖章成功!') + // } // Message.success({ // center: true, // message: '盖章成功'