From 4c657e23ba006792f83b44c7e999e1a00c0cc8dc Mon Sep 17 00:00:00 2001 From: "luoJunYong.123" Date: Wed, 5 Jan 2022 18:23:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=AE=E4=B8=AA=E4=BC=A0=E7=A5=A8=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/counter/list/index.vue | 47 ++++++++++++++----- .../personal/callDeposits/accountClosed.vue | 4 +- .../personal/callDeposits/openAccount.vue | 4 +- .../personal/currentAccount/openAccount.vue | 8 ++-- src/store/modules/system.js | 42 ++++++++++------- 5 files changed, 69 insertions(+), 36 deletions(-) diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index 1215110..fa2322c 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -5,7 +5,7 @@ - + @@ -173,7 +173,7 @@
-
+

{{item.name}}

@@ -261,6 +261,7 @@ export default { } }; return { + peopleSign: [], moneyBox: [], takeCheck: '', // 选择业务逻辑 myKey用来确定选择哪个项目 businessArr: [ @@ -918,7 +919,10 @@ export default { } } if(this.$store.state.system.popText == '钱箱') { - // this.receptionList.push(...this.moneyBox) + this.receptionList.splice(0, this.receptionList.length, ...this.moneyBox) + } + if(this.$store.state.system.popText == '客户签字') { + this.receptionList.splice(0, this.receptionList.length, ...this.peopleSign) } if(!this.showGoods) this.checkList = [] return this.$store.state.system.showPop; @@ -1061,8 +1065,13 @@ export default { } } } - console.log('whata') - console.log(that.receptionList) + if(that.popText == '钱箱') { + // that.moneyBox.splice(0, that.moneyBox.length, ...that.receptionList) + that.moneyBox = that.receptionList + } + if(that.popText == '客户签字') { + that.peopleSign = that.receptionList + } } // 印章的拖拽 else if(that.$refs.popUpSeal) { @@ -1134,7 +1143,8 @@ export default { addGoods: 'system/addGoods', deleteGoods: 'system/deleteGoods', stampJudge: 'system/stampJudge', - payMoney: 'system/payMoney' + payMoney: 'system/payMoney', + backPeople: 'system/backPeople' }), checkTake(myKey){ if(this.takeCheck === myKey) { @@ -1148,7 +1158,8 @@ export default { this.$confirm('由于您未选择一个业务，系统将返回主界面, 是否继续?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', - type: 'warning' + type: 'warning', + center: true }).then(() => { this.$router.push('/index') }).catch(() => { @@ -1164,9 +1175,18 @@ export default { }, showBusinessSelect (judge) { if(!judge && !this.businessKey) { - this.$message({ - message: '请选择一个业务！', - type: 'warning' + this.$confirm('由于您未选择一个业务，系统将返回主界面, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + center: true + }).then(() => { + this.$router.push('/index') + }).catch(() => { + this.$message({ + type: 'info', + message: '请选择一个业务' + }); }); return } @@ -1369,8 +1389,6 @@ export default { const id = this.receptionList[0].id const sealArr = [...this.sealChecked] this.stampJudge({ sealArr, id}) - console.log(this.receptionList) - console.log(this.sealChecked) }else if(this.popText == '钱箱') { console.log(this.receptionList) for(let i=0; i item.id) + this.backPeople(idArr) + // this.stampJudge() }else{ console.log('-刷卡确认') // this.goodsShelfTotalData = this.auditGoodsShelf @@ -1783,6 +1805,7 @@ export default { position: absolute; } .glass { + cursor: pointer; // 玻璃窗 top: 16vh; left: 50vw; diff --git a/src/pages/manage/list/personal/callDeposits/accountClosed.vue b/src/pages/manage/list/personal/callDeposits/accountClosed.vue index dfd3eec..f4ce5b0 100644 --- a/src/pages/manage/list/personal/callDeposits/accountClosed.vue +++ b/src/pages/manage/list/personal/callDeposits/accountClosed.vue @@ -16,7 +16,9 @@ - + + CYC人民币 + diff --git a/src/pages/manage/list/personal/callDeposits/openAccount.vue b/src/pages/manage/list/personal/callDeposits/openAccount.vue index e821eab..2abbd6b 100644 --- a/src/pages/manage/list/personal/callDeposits/openAccount.vue +++ b/src/pages/manage/list/personal/callDeposits/openAccount.vue @@ -13,7 +13,9 @@ - + + CYC人民币 + diff --git a/src/pages/manage/list/personal/currentAccount/openAccount.vue b/src/pages/manage/list/personal/currentAccount/openAccount.vue index db244ee..7261663 100644 --- a/src/pages/manage/list/personal/currentAccount/openAccount.vue +++ b/src/pages/manage/list/personal/currentAccount/openAccount.vue @@ -10,10 +10,10 @@ - - CYC人民币 - - + + CYC人民币 + + diff --git a/src/store/modules/system.js b/src/store/modules/system.js index 67e775b..c6bcac0 100644 --- a/src/store/modules/system.js +++ b/src/store/modules/system.js @@ -49,7 +49,8 @@ export default { isStamp: { '业务专用章': [14, 17], '附件章': [23] - } + }, + backPeople: [142, 13, 172, 16] }, }, goods:[// 物品栏的物品 @@ -92,6 +93,17 @@ export default { ], }, mutations: { + backPeople(state, idArr) { + for(let i=0; i item === idArr[i]) + if(index !== -1) { + const index2 = state.businessSelect[state.businessKey].data.findIndex(item => item === idArr[i]) + console.log(index2) + state.businessSelect[state.businessKey].backPeople.splice(index, 1) + state.businessSelect[state.businessKey].data.splice(index2, 1) + } + } + }, payMoney(state) { const index = state.businessSelect[state.businessKey].data.findIndex(item => item === 15) if(index !== -1) { @@ -103,28 +115,22 @@ export default { for(let seal in needStamp) { for(let i=0; i item === id) + if(seal === '业务专用章') { + if(id === 14) { + state.businessSelect[state.businessKey].data.splice(index, 1, 141) + state.businessSelect[state.businessKey].data.push(142) + } + if(id === 17) { + state.businessSelect[state.businessKey].data.splice(index, 1, 171) + state.businessSelect[state.businessKey].data.push(172) + } + } } } } console.log('gai') }, - // 在盖章 - stampSure(state, { seal, id }) { - // 先检查是否是需要的再传进来 - const index = state.businessSelect[state.businessKey].data.findIndex(item => item === id) - console.log(index) - if(seal === '业务专用章') { - if(id === 14) { - state.businessSelect[state.businessKey].data.splice(index, 1, 141) - state.businessSelect[state.businessKey].data.push(142) - } - if(id === 17) { - state.businessSelect[state.businessKey].data.splice(index, 1, 171) - state.businessSelect[state.businessKey].data.push(172) - } - } - }, setBusinessKey: (state, val) => { // 这个是容错的 后面可以删掉 if(!state.businessSelect[val]) {