huoran
/
FE_bankTeaching
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

update

Browse Source
20240205
luoJunYong.123 3 years ago
parent c4252c66c7
commit 34e7045cce
3 changed files with 174 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 239
      src/pages/counter/list/index.vue
  2. 5
      src/pages/manage/list/personal/timeDeposit/withdrawal.vue
  3. 6
      src/store/modules/system.js

239
src/pages/counter/list/index.vue
Unescape View File

@ -900,19 +900,114 @@ export default {
// 缓存物品栏和货架上的东西 // 缓存物品栏和货架上的东西
// if(!sessionStorage.getItem('systemData'))
// 传票栏 // 传票栏
// let params= { getOperation({
// parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,4', parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,4'
// } }).then((data)=>{
// getOperation(params).then((data)=>{ if(data.status == 200 && data.data.judgmentRuleReqs) {
// if(data.status == 200) { const list = data.data.judgmentRuleReqs.map(item => item.answerId)
// var list = data.data.judgmentRuleReqs.map(item => item.answerId) if(list.length) {
// console.log(list) this.outThingsGoods([...list])
// this.outThingsGoods([...list]) this.pushThings({ idArr: [...list], name: 'cultureIn'})
// 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<list.length; i++) {
this.outThingsGoods([...stampJudge[list[i]].delete])
this.pushThingsGoods([...stampJudge[list[i]].add])
}
}
}
})
// 钱箱
getOperation({
parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,1'
}).then((data)=>{
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(){ mounted(){
@ -1090,66 +1185,66 @@ export default {
this.nbm = nbm this.nbm = nbm
// 业务的东西 // 业务的东西
// this.goodsShelfTotalData = [...this.goods2] // this.goodsShelfTotalData = [...this.goods2]
if(type == '普通凭证箱' || type == '系统'){ // if(type == '普通凭证箱' || type == '系统'){
// this.goodsShelfTotalData = this.systemInputGoodsShelf // // this.goodsShelfTotalData = this.systemInputGoodsShelf
let parentId = '' // let parentId = ''
if(type == '普通凭证箱'){ // if(type == '普通凭证箱'){
parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,3' // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,3'
} // }
if(type == '系统'){ // if(type == '系统'){
parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5' // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5'
} // }
}else if(type == '身份证扫描仪' || type == '验钞机' || type == '资料' || type == '重要空白凭证箱' || type == '身份证扫描器'){ // }else if(type == '身份证扫描仪' || type == '验钞机' || type == '资料' || type == '重要空白凭证箱' || type == '身份证扫描器'){
// this.goodsShelfTotalData = this.auditGoodsShelf // // this.goodsShelfTotalData = this.auditGoodsShelf
let parentId = '' // let parentId = ''
if(type == '重要空白凭证箱'){ // if(type == '重要空白凭证箱'){
parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,2' // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,2'
} // }
if(type == '资料'){ // if(type == '资料'){
parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,11' // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,11'
} // }
if(type == '验钞机'){ // if(type == '验钞机'){
parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,9' // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,9'
} // }
if(type == '身份证扫描仪'){ // if(type == '身份证扫描仪'){
parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,7' // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,7'
} // }
let param= { // let param= {
parentId: parentId // parentId: parentId
} // }
}else if(type == '打印机' || type == '客户签字' || type == '印章盒'){ // }else if(type == '打印机' || type == '客户签字' || type == '印章盒'){
// this.goodsShelfTotalData = this.printoutGoodsShelf // // this.goodsShelfTotalData = this.printoutGoodsShelf
let parentId = '' // let parentId = ''
if(type == '打印机'){ // if(type == '打印机'){
parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,10' // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,10'
}else if(type == '客户签字'){ // }else if(type == '客户签字'){
parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,12' // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,12'
}else if(type == '返还资料'){ // }else if(type == '返还资料'){
parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,12' // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,12'
}else if(type == '印章盒'){ // }else if(type == '印章盒'){
parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,8' // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,8'
} // }
}else if(type == '钱箱'){ // }else if(type == '钱箱'){
// this.goodsShelfTotalData = this.cashboxGoodsShelf; // // this.goodsShelfTotalData = this.cashboxGoodsShelf;
let param= { // let param= {
parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,1' // parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,1'
} // }
getOperation(param).then((data)=> { // getOperation(param).then((data)=> {
if (data.data.status == 200) { // if (data.data.status == 200) {
var list = data.data.judgmentRuleReqs // var list = data.data.judgmentRuleReqs
for(var j=0;j<list.length;j++){ // for(var j=0;j<list.length;j++){
for(var i=0;i<this.goodsShelfTotalData.length;i++){ // for(var i=0;i<this.goodsShelfTotalData.length;i++){
if(list[j].answerId == this.goodsShelfTotalData[i].id){ // if(list[j].answerId == this.goodsShelfTotalData[i].id){
this.receptionList.push(this.goodsShelfTotalData[i]) // this.receptionList.push(this.goodsShelfTotalData[i])
} // }
} // }
} // }
}else{ // }else{
this.receptionList = [] // this.receptionList = []
} // }
}).catch((error)=>{ // }).catch((error)=>{
}) // })
} // }
this.changeShowGoods(true) this.changeShowGoods(true)
if(type !== '系统') { if(type !== '系统') {
this.$store.commit('system/changePop',{show:true,text:type, id: this.id}) this.$store.commit('system/changePop',{show:true,text:type, id: this.id})

5
src/pages/manage/list/personal/timeDeposit/withdrawal.vue
Unescape View File

@ -313,6 +313,7 @@ export default{
this.form.depositNumber = depositNumber this.form.depositNumber = depositNumber
this.form.capital = capital this.form.capital = capital
this.form.withdrawType = withdrawType this.form.withdrawType = withdrawType
this.form.withdrawAmount = Number(this.form.interest) + Number(this.form.capital)
}, },
getFormData(){ getFormData(){
const parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,26,58,120' 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纯粹用来判断，因为业务四和五就这个不一样 // 这里的数据流withdrawWay纯粹用来判断，因为业务四和五就这个不一样
// const { withdrawWay } = this.dataFlow // const { withdrawWay } = this.dataFlow
if(newVal === 126) { if(newVal === 126) {
this.form.withdrawAmount = Number(this.form.interest) + Number(this.form.capital)
this.capitalDisabled = true this.capitalDisabled = true
this.form.interest = '15.00' this.form.interest = '15.00'
this.rules.newVoucherNumber = [] this.rules.newVoucherNumber = []
sessionStorage.setItem('newVoucherNumber', this.form.newVoucherNumber) sessionStorage.setItem('newVoucherNumber', this.form.newVoucherNumber)
this.form.newVoucherNumber = '' this.form.newVoucherNumber = ''
//this.rules.withdrawAmount[0].required = false //this.rules.withdrawAmount[0].required = false
// 计算金额 最后处理
this.form.withdrawAmount = Number(this.form.interest) + Number(this.form.capital)
}else { }else {
if(sessionStorage.getItem('newVoucherNumber')) { if(sessionStorage.getItem('newVoucherNumber')) {
this.form.newVoucherNumber = sessionStorage.getItem('newVoucherNumber') this.form.newVoucherNumber = sessionStorage.getItem('newVoucherNumber')

6
src/store/modules/system.js
Unescape View File

@ -2500,7 +2500,9 @@ export default {
}, },
outThings2(state, { name, index}) { outThings2(state, { name, index}) {
// 神奇地解决了bug // 神奇地解决了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) { outThingsGoods(state, idArr) {
for(let i=0; i<idArr.length; i++) { for(let i=0; i<idArr.length; i++) {
@ -2658,8 +2660,6 @@ export default {
} }
} }
if(stampSuccess) { if(stampSuccess) {
console.log('---stampSuccess')
console.log(stampSuccess)
let projectId = sessionStorage.getItem('projectId') let projectId = sessionStorage.getItem('projectId')
let startTime = sessionStorage.getItem('startTime') let startTime = sessionStorage.getItem('startTime')
if(!sessionStorage.getItem('stampList')) { if(!sessionStorage.getItem('stampList')) {

Write Preview
Loading…
Cancel
Save