From 00d2be2987c7c8b485e3634fa74e37e83c38eccb Mon Sep 17 00:00:00 2001 From: "luoJunYong.123" Date: Wed, 30 Mar 2022 18:20:44 +0800 Subject: [PATCH] update --- src/components/case/index.vue | 14 +++++++ src/pages/counter/list/index.vue | 39 ++++++++----------- .../list/personal/timeDeposit/withdrawal.vue | 9 +++-- src/store/modules/system.js | 6 +-- 4 files changed, 38 insertions(+), 30 deletions(-) diff --git a/src/components/case/index.vue b/src/components/case/index.vue index 703534c..70e3acf 100644 --- a/src/components/case/index.vue +++ b/src/components/case/index.vue @@ -408,6 +408,20 @@ export default { return null } } + // if(sessionStorage.getItem(name)) { + // return sessionStorage.getItem(name) + // }else { + // var reg = new RegExp('(^|&)'+name+'=([^&]*)(&|$)') + // if(window.location.href.split('?')[1]){ + // var r = window.location.href.split('?')[1].match(reg) + // if (r != null){ + // return (r[2]) + // }else{ + // return null + // } + // } + // } + }, //获取项目列表 getData(){ diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index c2b5c36..a5a321d 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -860,8 +860,6 @@ export default { // } }, created() { - console.log('---') - console.log(process.env.NODE_ENV) if(!sessionStorage.getItem('firstLoad')) { const loading = this.$loading({ lock: true, @@ -900,26 +898,21 @@ export default { // console.log(this.getSelectList.accountQualitySelectList) - let params= { - parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,4', - // lcJudgmentRuleReq:formList, - // projectId:+projectId, - // startTime:startTime, - } - getOperation(params).then((data)=>{ - if(data.status == 200) { - var list = data.data.judgmentRuleReqs - console.log(list) - } - // const tt1 = JSON.parse(sessionStorage.getItem('tt1')) - // console.log('1-tt1') - // console.log(tt1) - // if(tt1) { - // for(const key in tt1) { - // this.form[tt1] = tt1[key] - // } - // } - }) + + // 缓存物品栏和货架上的东西 + + // 传票栏 + // 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'}) + // } + // }) }, mounted(){ @@ -1877,7 +1870,7 @@ export default { }, toPart(){ - this.$router.push('/index') + this.$router.push('/index' + '?' + window.location.href.split('?')[1]) }, judgePosition(evt) { const targetDom = this.$refs.goods.getBoundingClientRect() diff --git a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue index 2e88bba..6bf3d08 100644 --- a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue +++ b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue @@ -98,8 +98,8 @@ export default{ } const { withdrawWay } = this.dataFlow if(withdrawWay === 126) { - this.form.interest = 5.75 - this.rules.withdrawAmount[0].required = false + this.form.interest = '15.00' + // this.rules.withdrawAmount[0].required = false if(sessionStorage.getItem('nomtimeDepositWithdrawal2')) { this.cardNumberJudge = true @@ -484,10 +484,11 @@ export default{ if(newVal === 126) { this.form.withdrawAmount = Number(this.form.interest) + Number(this.form.capital) this.capitalDisabled = true - this.form.interest = 5.75 + this.form.interest = '15.00' this.rules.newVoucherNumber = [] sessionStorage.setItem('newVoucherNumber', this.form.newVoucherNumber) this.form.newVoucherNumber = '' + //this.rules.withdrawAmount[0].required = false }else { if(sessionStorage.getItem('newVoucherNumber')) { this.form.newVoucherNumber = sessionStorage.getItem('newVoucherNumber') @@ -505,7 +506,7 @@ export default{ this.$nextTick(() => { this.$refs.withdrawAmount.focus() }) - + // this.rules.withdrawAmount[0].required = true } }, immediate: true diff --git a/src/store/modules/system.js b/src/store/modules/system.js index 01d2c4d..4a21a06 100644 --- a/src/store/modules/system.js +++ b/src/store/modules/system.js @@ -2472,7 +2472,7 @@ export default { console.log(state.businessSelect[state.businessKey][name]) console.log(name) for(let i=0; i item === idArr[i]) + const index = state.businessSelect[state.businessKey][name].findIndex(item => item == idArr[i]) if(index === -1) { state.businessSelect[state.businessKey][name].push(idArr[i]) } @@ -2481,7 +2481,7 @@ export default { }, pushThingsGoods(state, idArr) { for(let i=0; i item === idArr[i]) + const index = state.businessSelect[state.businessKey].data.findIndex(item => item == idArr[i]) if(index === -1) { state.businessSelect[state.businessKey].data.push(idArr[i]) } @@ -2504,7 +2504,7 @@ export default { }, outThingsGoods(state, idArr) { for(let i=0; i item === idArr[i]) + const index = state.businessSelect[state.businessKey].data.findIndex(item => item == idArr[i]) if(index !== -1) { state.businessSelect[state.businessKey].data.splice(index, 1) }