diff --git a/src/components/page/afterLoan/afterInsurance.vue b/src/components/page/afterLoan/afterInsurance.vue index e62058e..e0cb652 100644 --- a/src/components/page/afterLoan/afterInsurance.vue +++ b/src/components/page/afterLoan/afterInsurance.vue @@ -743,22 +743,25 @@ export default { }; }, computed:{ - computedCompensatoryBalance:function(){// 代偿余额计算 + computedCompensatoryBalance(){// 代偿余额计算 /* TODO 未完成状态判断 */ // if(this.status){} // 如果是处于录入状态才减去count - console.log(this.repaymentForm,'this.repaymentForm') - if(!this.repaymentForm.currentRepayment)this.repaymentForm.currentRepayment = 0 - if(!this.repaymentForm.otherExpenses)this.repaymentForm.otherExpenses = 0 - if(!this.repaymentForm.interest)this.repaymentForm.interest = 0 - let a = this.repaymentForm.currentRepayment , b = this.repaymentForm.otherExpenses , c = this.repaymentForm.interest + // console.log(this.repaymentForm,'this.repaymentForm') + // if(!this.repaymentForm.currentRepayment)this.repaymentForm.currentRepayment = 0 + // if(!this.repaymentForm.otherExpenses)this.repaymentForm.otherExpenses = 0 + // if(!this.repaymentForm.interest)this.repaymentForm.interest = 0 + // console.log(this.repaymentForm,'this.repaymentForm') + // let a = this.repaymentForm.currentRepayment , b = this.repaymentForm.otherExpenses , c = this.repaymentForm.interest - let count = math.format(math.chain(math.bignumber(a)).add(math.bignumber(b)).add(math.bignumber(c)).done()) - console.log(count,'当前的计算') + // let count = math.format(math.chain(math.bignumber(a)).add(math.bignumber(b)).add(math.bignumber(c)).done()) + // 减去当前的已还款金额之类的 + // let count = a+b+c + // console.log(count,'当前的计算') // 余额 = 代偿总额 - 代偿日后还款总额 - this.comp.compensatoryBalance = (this.comp.compensationAmount - this.cash - count)||0 + this.comp.compensatoryBalance = (this.comp.compensationAmount - this.cash )||0 // 当前代偿余额 = 额外减去 本次还款,利息,其他费用 - return (this.comp.compensationAmount?this.comp.compensationAmount - this.cash - count:0)||0 + return (this.comp.compensationAmount?this.comp.compensationAmount - this.cash:0)||0 }, source(){// 在点击录入时,判断系统流转的是否进行过编辑 return this.$store.state.loan.source @@ -846,9 +849,10 @@ export default { } if(val == 2){ console.log(this.souce,'判断是否系统流转--0') - if(this.source === 0&&this.status==="oldLoans"){// 判断系统流转是否进行过编辑 + /* TODO 未完成 */ + // if(this.source === 0&&this.status==="oldLoans"){// 判断系统流转是否进行过编辑 - } + // } console.log(this.RepaymentId,this.id,'RepaymentId,进入2页面') this.id = this.$store.state.loan.id || this.$store.state.loan.RepaymentId this.RepaymentId = this.$store.state.loan.RepaymentId diff --git a/src/components/page/afterLoan/complete.vue b/src/components/page/afterLoan/complete.vue index 9debfe6..a516431 100644 --- a/src/components/page/afterLoan/complete.vue +++ b/src/components/page/afterLoan/complete.vue @@ -731,7 +731,11 @@ export default { }, personnelSelection(val){// 人员选择 return personnelSelection({year:val}).then(res=>{ - this.treeIds = res.data.list + console.log(res.data.list,'list') + this.treeIds = res.data.list.map(e=>{ + return e.split(",").pop() + }) + console.log(this.treeIds,'treeids') this.ids = res.data.list })