From 261fa8cfb301fafde3c9011fe9bfb85b6e43ab3b Mon Sep 17 00:00:00 2001 From: wangchenguang <728837162@qq.com> Date: Wed, 26 Apr 2023 17:29:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/counter/list/index.vue | 17 ++++++++++++++--- src/store/modules/system.js | 30 ++++++++++++++++++++++++++++-- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index c2f9c96..cefc3c3 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -682,7 +682,7 @@ export default { currencyDetector: false, printer: false }, - finishSealedArr: [], + finishSealedArr: JSON.parse(sessionStorage.getItem('finishSealedArr')) || [], sealChecked:[],/* 印章盒选中 */ importantChecked:[],// 重要凭证选中 commonChecked:[],// 普通凭证选中 @@ -1290,6 +1290,7 @@ export default { getOperation({ parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,8' }).then((data)=>{ + console.log('data=>',data) const stampJudge = { 18: {add:[24, 21], delete: [14]}, 452:{ add: [432, 433] }, @@ -1482,7 +1483,9 @@ export default { this.changeShowGoods(!this.showGoods) }, showData(type,nbm) {/* 展示弹窗-type为弹窗标题文字 */ - this.nbm = nbm + console.log(1111) + this.nbm = nbm + // 显示物品栏 this.changeShowGoods(true) if(type !== '系统') { this.$store.commit('system/changePop',{show:true,text:type, id: this.id}) @@ -2092,10 +2095,18 @@ export default { } // 进去会排序 多的不用管 const sealArr = [...this.sealChecked] + console.log('sealArr=>' ,sealArr) this.stampJudge({ sealArr, cb: (successId) => { - this.finishSealedArr.push(successId) + if(successId instanceof Array) { + this.finishSealedArr.push(...successId) + sessionStorage.setItem('finishSealedArr',JSON.stringify(this.finishSealedArr)) + }else { + this.finishSealedArr.push(successId) + sessionStorage.setItem('finishSealedArr',JSON.stringify(this.finishSealedArr)) + } + } }) this.sealChecked = [] diff --git a/src/store/modules/system.js b/src/store/modules/system.js index 641b394..81f2e74 100644 --- a/src/store/modules/system.js +++ b/src/store/modules/system.js @@ -85,6 +85,11 @@ const allGoods = { 481: {name:'业务收费凭证回单',src:require('@/assets/img/goods/ywsfpz.png'),id:481}, 482: {name:'业务收费凭证凭证联',src:require('@/assets/img/goods/ywsfpz.png'),id:482}, + 701: {name:'现金支票回单',src:require('@/assets/img/goods/xjzp.png'),id:701}, + 596: {name:'银行承兑协议一联',src:require('@/assets/img/goods/银行承兑协议.png'),id:596}, + 702: {name:'银行承兑协议二联',src:require('@/assets/img/goods/银行承兑协议.png'),id:702}, + 597: {name:'银行承兑协议三联',src:require('@/assets/img/goods/银行承兑协议.png'),id:597} + // // 有图片的 // 407: {name:407,src:require('@/assets/img/goods/businessSpecialApplication.png'),id:407}, // 406: {name:406,src:require('@/assets/img/goods/businessReportMissUser.png'),id:406}, @@ -2707,15 +2712,15 @@ export default { }, // 盖章逻辑（本来想着直接把审核资料、验钞等方法也写在这里的，因为直接物品也在这里。奈何时间不太够。没事） cb是回调函数 stampJudge(state, { sealArr, cb }) { - - // const needStamp = state.businessSelect[state.businessKey].isStamp const id = state.businessSelect[state.businessKey].sealBox[0] + console.log('id=>?',id) let judgeDelete = true // 盖完章是否变化 为false的会删掉。。。 let stampSuccess = '' // 盖章成功 // 以为要特定的章盖特定的物品，盖完后结果还不一样。有些东西盖了会消失，有些不会。 // 有些东西还要盖两个章。当时选择了最直接的if-else判断。其实用map结构也不是不行。 if(sealArr.length === 1) { + console.log('只有一个') const seal = sealArr[0] if(seal === '业务专用章') { if(id === 14) { @@ -2762,17 +2767,20 @@ export default { state.businessSelect[state.businessKey].data.push(420, 421) judgeDelete = false stampSuccess = '444' + cb([420,421]) } else if(id === 427) { state.businessSelect[state.businessKey].data.push(422, 424) judgeDelete = false stampSuccess = '445' + cb([422, 424]) } }else if(seal === '转讫章') { if(id === 426) { state.businessSelect[state.businessKey].data.push(419, 418) judgeDelete = false stampSuccess = '446' + cb([419,418]) } }else if(seal === '附件章') { if(id === 23) { @@ -2820,6 +2828,7 @@ export default { }else { seal = sealArr[1] + sealArr[0] } + console.log('seal =>', seal) if(seal === '私章业务专用章') { if(id === 411) { state.businessSelect[state.businessKey].data.push(473, 472) @@ -2830,6 +2839,13 @@ export default { state.businessSelect[state.businessKey].data.push(582,581,580,583) judgeDelete = false stampSuccess = '584' + cb([582,581,580,583]) + } + if(id === 587) { + state.businessSelect[state.businessKey].data.push(596,702,597) + judgeDelete = false + stampSuccess = '585' + cb([596,702,597]) } // 584 }else if(seal === '私章转讫章') { @@ -2838,6 +2854,13 @@ export default { judgeDelete = false stampSuccess = '457' } + }else if (seal ==='私章付讫章') { + if(id ===411) { + state.businessSelect[state.businessKey].data.push(411,472) + judgeDelete = false + stampSuccess = '456' + cb([411,472]) + } } } // if(stampSuccess) { @@ -2988,9 +3011,12 @@ export default { // 拿到物品栏中的物品 goods2(state) { // 调试容错采用if-else + console.log('state=>>>',state) + console.log('state.businessSelect=>>>',state.businessSelect) const arr = [] if(state.businessKey !== '') { for(const item of state.businessSelect[state.businessKey].data) { + console.log('item=>',item) if (state.businessKey == '业务七') { if(item !==23) { arr.push(allGoods[item])