From 34e7045cce2102cfa2a2cb4767b15b470976afb7 Mon Sep 17 00:00:00 2001 From: "luoJunYong.123" Date: Thu, 31 Mar 2022 17:39:01 +0800 Subject: [PATCH] update --- src/pages/counter/list/index.vue | 239 ++++++++++++------ .../list/personal/timeDeposit/withdrawal.vue | 5 +- src/store/modules/system.js | 6 +- 3 files changed, 174 insertions(+), 76 deletions(-) diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index a5a321d..d318ab9 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -900,19 +900,114 @@ export default { // 缓存物品栏和货架上的东西 - + // if(!sessionStorage.getItem('systemData')) // 传票栏 - // let params= { - // parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,4', - // } - // getOperation(params).then((data)=>{ - // if(data.status == 200) { - // var list = data.data.judgmentRuleReqs.map(item => item.answerId) - // console.log(list) - // this.outThingsGoods([...list]) - // this.pushThings({ idArr: [...list], name: 'cultureIn'}) - // } - // }) + getOperation({ + parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,4' + }).then((data)=>{ + if(data.status == 200 && data.data.judgmentRuleReqs) { + const list = data.data.judgmentRuleReqs.map(item => item.answerId) + if(list.length) { + this.outThingsGoods([...list]) + this.pushThings({ idArr: [...list], name: 'cultureIn'}) + } + } + }) + + // 重要空白凭证箱 + getOperation({ + parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,2' + }).then((data)=>{ + if(data.status == 200 && data.data.judgmentRuleReqs) { + const list = data.data.judgmentRuleReqs.map(item => item.answerId) + if(list.length) { + // this.pushThings({ idArr: [...list], name: 'cultureIn'}) + this.pushThingsGoods([...list]) + } + + } + }) + + // 普通凭证箱 + getOperation({ + parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,3' + }).then((data)=>{ + if(data.status == 200 && data.data.judgmentRuleReqs) { + const list = data.data.judgmentRuleReqs.map(item => item.answerId) + if(list.length) { + this.pushThingsGoods([...list]) + } + + } + }) + + // 印章盒 暂时得等Obj对应 + getOperation({ + parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,8' + }).then((data)=>{ + const stampJudge = { + 18: {add:[24, 21], delete: [14]}, + 452:{ add: [432, 433] }, + 458:{ add: [419, 418], delete: [426]}, + 459:{ add: [478, 477], delete: [407]}, + 460:{ add: [466,468,467], delete: [406]}, + 463:{ add: [480, 488], delete: [413]}, + 464:{ add: [482, 481], delete: [479]}, + 444:{ add: [420, 421], delete: [425]}, + 445:{ add: [422, 424], delete: [427]}, + 446:{ add: [419, 418], delete: [426]}, + 447:{ add: [269, 22], delete: [17]}, + 455:{ add: [487, 441], delete: [409]}, + 456:{ add: [473, 472], delete: [411]}, + 457:{ add: [476, 474], delete: [412]} + } + + if(data.status == 200 && data.data.judgmentRuleReqs) { + const list = data.data.judgmentRuleReqs.map(item => item.answerId) + if(list.length) { + for(let i=0; i{ + if(data.status == 200 && data.data.judgmentRuleReqs) { + const list = data.data.judgmentRuleReqs.map(item => item.answerId) + if(list.length) { + if(this.needBackMoney) { + this.pushThingsGoods([...list]) + this.outThings2({ name: 'moneyBox', index: 0 }) + }else { + this.outThingsGoods([...list]) + this.pushThings({ idArr: [...list], name: 'moneyBox'}) + } + } + + } + }) + + // 返还资料 + getOperation({ + parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,556' + }).then((data)=>{ + if(data.status == 200 && data.data.judgmentRuleReqs) { + const list = data.data.judgmentRuleReqs.map(item => item.answerId) + if(list.length) { + this.outThingsGoods([...list]) + this.pushThings({ idArr: [...list], name: 'backPeople'}) + } + + } + }) + + }, mounted(){ @@ -1090,66 +1185,66 @@ export default { this.nbm = nbm // 业务的东西 // this.goodsShelfTotalData = [...this.goods2] - if(type == '普通凭证箱' || type == '系统'){ - // this.goodsShelfTotalData = this.systemInputGoodsShelf - let parentId = '' - if(type == '普通凭证箱'){ - parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,3' - } - if(type == '系统'){ - parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5' - } - }else if(type == '身份证扫描仪' || type == '验钞机' || type == '资料' || type == '重要空白凭证箱' || type == '身份证扫描器'){ - // this.goodsShelfTotalData = this.auditGoodsShelf - let parentId = '' - if(type == '重要空白凭证箱'){ - parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,2' - } - if(type == '资料'){ - parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,11' - } - if(type == '验钞机'){ - parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,9' - } - if(type == '身份证扫描仪'){ - parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,7' - } - let param= { - parentId: parentId - } - }else if(type == '打印机' || type == '客户签字' || type == '印章盒'){ - // this.goodsShelfTotalData = this.printoutGoodsShelf - let parentId = '' - if(type == '打印机'){ - parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,10' - }else if(type == '客户签字'){ - parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,12' - }else if(type == '返还资料'){ - parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,12' - }else if(type == '印章盒'){ - parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,8' - } - }else if(type == '钱箱'){ - // this.goodsShelfTotalData = this.cashboxGoodsShelf; - let param= { - parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,1' - } - getOperation(param).then((data)=> { - if (data.data.status == 200) { - var list = data.data.judgmentRuleReqs - for(var j=0;j{ - }) - } + // if(type == '普通凭证箱' || type == '系统'){ + // // this.goodsShelfTotalData = this.systemInputGoodsShelf + // let parentId = '' + // if(type == '普通凭证箱'){ + // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,3' + // } + // if(type == '系统'){ + // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5' + // } + // }else if(type == '身份证扫描仪' || type == '验钞机' || type == '资料' || type == '重要空白凭证箱' || type == '身份证扫描器'){ + // // this.goodsShelfTotalData = this.auditGoodsShelf + // let parentId = '' + // if(type == '重要空白凭证箱'){ + // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,2' + // } + // if(type == '资料'){ + // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,11' + // } + // if(type == '验钞机'){ + // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,9' + // } + // if(type == '身份证扫描仪'){ + // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,7' + // } + // let param= { + // parentId: parentId + // } + // }else if(type == '打印机' || type == '客户签字' || type == '印章盒'){ + // // this.goodsShelfTotalData = this.printoutGoodsShelf + // let parentId = '' + // if(type == '打印机'){ + // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,10' + // }else if(type == '客户签字'){ + // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,12' + // }else if(type == '返还资料'){ + // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,12' + // }else if(type == '印章盒'){ + // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,8' + // } + // }else if(type == '钱箱'){ + // // this.goodsShelfTotalData = this.cashboxGoodsShelf; + // let param= { + // parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,1' + // } + // getOperation(param).then((data)=> { + // if (data.data.status == 200) { + // var list = data.data.judgmentRuleReqs + // for(var j=0;j{ + // }) + // } this.changeShowGoods(true) if(type !== '系统') { this.$store.commit('system/changePop',{show:true,text:type, id: this.id}) diff --git a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue index 6bf3d08..feee551 100644 --- a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue +++ b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue @@ -313,6 +313,7 @@ export default{ this.form.depositNumber = depositNumber this.form.capital = capital this.form.withdrawType = withdrawType + this.form.withdrawAmount = Number(this.form.interest) + Number(this.form.capital) }, getFormData(){ const parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,26,58,120' @@ -482,13 +483,15 @@ export default{ // 这里的数据流withdrawWay纯粹用来判断，因为业务四和五就这个不一样 // const { withdrawWay } = this.dataFlow if(newVal === 126) { - this.form.withdrawAmount = Number(this.form.interest) + Number(this.form.capital) + this.capitalDisabled = true this.form.interest = '15.00' this.rules.newVoucherNumber = [] sessionStorage.setItem('newVoucherNumber', this.form.newVoucherNumber) this.form.newVoucherNumber = '' //this.rules.withdrawAmount[0].required = false + // 计算金额 最后处理 + this.form.withdrawAmount = Number(this.form.interest) + Number(this.form.capital) }else { if(sessionStorage.getItem('newVoucherNumber')) { this.form.newVoucherNumber = sessionStorage.getItem('newVoucherNumber') diff --git a/src/store/modules/system.js b/src/store/modules/system.js index 4a21a06..4b7a76a 100644 --- a/src/store/modules/system.js +++ b/src/store/modules/system.js @@ -2500,7 +2500,9 @@ export default { }, outThings2(state, { name, index}) { // 神奇地解决了bug - state.businessSelect[state.businessKey][name].splice(index, 1) + if(state.businessSelect[state.businessKey][name].length > index) { + state.businessSelect[state.businessKey][name].splice(index, 1) + } }, outThingsGoods(state, idArr) { for(let i=0; i