diff --git a/anrui-riskcenter-ui/src/views/buyback/buyback.vue b/anrui-riskcenter-ui/src/views/buyback/buyback.vue
index 880d8a817b..e650cc3687 100644
--- a/anrui-riskcenter-ui/src/views/buyback/buyback.vue
+++ b/anrui-riskcenter-ui/src/views/buyback/buyback.vue
@@ -450,11 +450,15 @@ export default {
},
toSettle() {
if (this.sids.length === 1) {
- if (this.multipleSelection[0].nodeState === '已办结') {
- this.viewState = 5
- this.$refs['divSettle'].showInit(this.sids[0])
+ if (this.multipleSelection[0].riskStateValue === '正常') {
+ if (this.multipleSelection[0].nodeState === '已办结') {
+ this.viewState = 5
+ this.$refs['divSettle'].showInit(this.sids[0])
+ } else {
+ this.$message({ showClose: true, type: 'error', message: '请选择流程状态为已办结的记录进行操作' })
+ }
} else {
- this.$message({ showClose: true, type: 'error', message: '请选择状态为已办结的记录进行操作' })
+ this.$message({ showClose: true, type: 'error', message: '当前车辆处于' + this.multipleSelection[0].riskStateValue + '状态,只有正常状态的才能发起结清申请!' })
}
} else {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
diff --git a/anrui-riskcenter-ui/src/views/settle/settleAdd.vue b/anrui-riskcenter-ui/src/views/settle/settleAdd.vue
index be7c7220d9..9555d2c837 100644
--- a/anrui-riskcenter-ui/src/views/settle/settleAdd.vue
+++ b/anrui-riskcenter-ui/src/views/settle/settleAdd.vue
@@ -285,12 +285,25 @@
{{ calculateSettleAll }}
-
-
- 截止当前资金占用费
- {{ formobj.loanSettleCompanyCostVo.fundAll }}
-
-
+
+
当前公司结清
+
+
+ 回购后月还还款金额
+ {{ formobj.buyBackMoney }}
+
+
+ 截止当前资金占用费
+ {{ formobj.loanSettleCompanyCostVo.fundAll }}
+
+
+
+
+ 当前公司结清合计
+ {{ formobj.settleAll2 }}
+
+
+
公司结清费用减免情况
@@ -372,18 +385,20 @@ export default {
let settleAll = '0'
// 公司正常结清合计 = 公司逾期月还 + 资金占用费 + 资方逾期利息 + 公司当期未到期月还 + 公司未到期金额 + 贷款保证金扣罚金额 + 名义价 + 合同违约金 + 其它费用 - 贷款保证金
settleAll = Math.round((parseFloat(settleAll) + parseFloat(this.formobj.loanSettleCompanyCostVo.overduePrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.overduePrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.funfCost === '' ? 0 : this.formobj.loanSettleCompanyCostVo.funfCost) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankOverInterest === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankOverInterest) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.deductionAmount === '' ? 0 : this.formobj.loanSettleCompanyCostVo.deductionAmount) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyNominalPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyNominalPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.contractLiquidated === '' ? 0 : this.formobj.loanSettleCompanyCostVo.contractLiquidated) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyOtherPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyOtherPrice) - parseFloat(this.formobj.loanSettleCompanyCostVo.loanDeposit === '' ? 0 : this.formobj.loanSettleCompanyCostVo.loanDeposit)) * 100) / 100
- // 是否由回购申请管理点击结清进入该页面,为是时需要再减去回购后的还款金额
- if (this.formobj.showHg) {
- settleAll = Math.round((parseFloat(settleAll) - parseFloat(this.formobj.buyBackMoney === '' ? 0 : this.formobj.buyBackMoney)) * 100) / 100
- }
return settleAll
},
// 公司结清费用减免情况模块--公司减免后结清合计计算
calculateAmountTo() {
let AmountTo = '0'
- // 是否勾选公司结清费用减免情况,为是时公司减免后结清合计 = 公司正常结清合计 - 资金占用费减免 - 公司资金占用费减免 - 公司其他费用减免 - 公司未到期利息减免
+ // 是否勾选公司结清费用减免情况,为是时公司减免后结清合计 = 公司正常结清合计或当前公司结清合计 - 资金占用费减免 - 公司资金占用费减免 - 公司其他费用减免 - 公司未到期利息减免
if (this.formobj.trueReduction) {
- AmountTo = Math.round((parseFloat(AmountTo) + parseFloat(this.calculateSettleAll === '' ? 0 : this.calculateSettleAll) - parseFloat(this.formobj.loanSettleCompanyReductionVo.fundPenalty === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.fundPenalty) - parseFloat(this.formobj.loanSettleCompanyReductionVo.depositPenalty === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.depositPenalty) - parseFloat(this.formobj.loanSettleCompanyReductionVo.otherCost === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.otherCost) - parseFloat(this.formobj.loanSettleCompanyReductionVo.notDuePriceRelief === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.notDuePriceRelief)) * 100) / 100
+ if (this.formobj.showHg) {
+ // 是否由回购申请管理点击结清进入该页面,为是时公司减免后结清合计 = 当前公司结清合计 - 资金占用费减免 - 公司资金占用费减免 - 公司其他费用减免 - 公司未到期利息减免
+ AmountTo = Math.round((parseFloat(AmountTo) + parseFloat(this.formobj.settleAll2 === '' ? 0 : this.formobj.settleAll2) - parseFloat(this.formobj.loanSettleCompanyReductionVo.fundPenalty === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.fundPenalty) - parseFloat(this.formobj.loanSettleCompanyReductionVo.depositPenalty === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.depositPenalty) - parseFloat(this.formobj.loanSettleCompanyReductionVo.otherCost === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.otherCost) - parseFloat(this.formobj.loanSettleCompanyReductionVo.notDuePriceRelief === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.notDuePriceRelief)) * 100) / 100
+ } else {
+ // 为否时公司减免后结清合计 = 公司正常结清合计 - 资金占用费减免 - 公司资金占用费减免 - 公司其他费用减免 - 公司未到期利息减免
+ AmountTo = Math.round((parseFloat(AmountTo) + parseFloat(this.calculateSettleAll === '' ? 0 : this.calculateSettleAll) - parseFloat(this.formobj.loanSettleCompanyReductionVo.fundPenalty === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.fundPenalty) - parseFloat(this.formobj.loanSettleCompanyReductionVo.depositPenalty === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.depositPenalty) - parseFloat(this.formobj.loanSettleCompanyReductionVo.otherCost === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.otherCost) - parseFloat(this.formobj.loanSettleCompanyReductionVo.notDuePriceRelief === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.notDuePriceRelief)) * 100) / 100
+ }
}
return AmountTo
},
@@ -473,6 +488,7 @@ export default {
settingDateBe: '',
showHg: false, // 是否展示回购字段
buyBackMoney: '', // 回购后的还款金额
+ settleAll2: '', // 当前公司结清合计
sid: '',
trueReduction: false,
useOrgName: '',
@@ -720,6 +736,7 @@ export default {
saleOrderSid: '',
showHg: false, // 是否展示回购字段
buyBackMoney: '', // 回购后的还款金额
+ settleAll2: '', // 当前公司结清合计
settingDate: '',
settingDateBe: '',
sid: '',
diff --git a/anrui-riskcenter-ui/src/views/settle/settleInfo.vue b/anrui-riskcenter-ui/src/views/settle/settleInfo.vue
index 05c97ee0a2..c0181b19de 100644
--- a/anrui-riskcenter-ui/src/views/settle/settleInfo.vue
+++ b/anrui-riskcenter-ui/src/views/settle/settleInfo.vue
@@ -231,12 +231,25 @@
{{ formobj.loanSettleCompanyCostVo.settleAll }}
-
-
- 截止当前资金占用费
- {{ formobj.loanSettleCompanyCostVo.fundAll }}
-
-
+
+
当前公司结清
+
+
+ 回购后月还还款金额
+ {{ formobj.buyBackMoney }}
+
+
+ 截止当前资金占用费
+ {{ formobj.loanSettleCompanyCostVo.fundAll }}
+
+
+
+
+ 当前公司结清合计
+ {{ formobj.settleAll2 }}
+
+
+
公司结清费用减免情况
@@ -366,6 +379,7 @@ export default {
saleOrderSid: '',
showHg: false, // 是否展示回购字段
buyBackMoney: '', // 回购后的还款金额
+ settleAll2: '', // 当前公司结清合计
settingDate: '',
settingDateBe: '',
sid: '',
@@ -448,7 +462,6 @@ export default {
})
}).catch(() => {
})
-
},
handleReturn() {
this.formobj = {
@@ -514,6 +527,7 @@ export default {
saleOrderSid: '',
showHg: false, // 是否展示回购字段
buyBackMoney: '', // 回购后的还款金额
+ settleAll2: '', // 当前公司结清合计
settingDate: '',
settingDateBe: '',
sid: '',
diff --git a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleDaiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleDaiBan.vue
index 340b046c16..83841c5dca 100644
--- a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleDaiBan.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleDaiBan.vue
@@ -233,12 +233,25 @@
{{ formobj.loanSettleCompanyCostVo.settleAll }}
-
-
- 截止当前资金占用费
- {{ formobj.loanSettleCompanyCostVo.fundAll }}
-
-
+
+
当前公司结清
+
+
+ 回购后月还还款金额
+ {{ formobj.buyBackMoney }}
+
+
+ 截止当前资金占用费
+ {{ formobj.loanSettleCompanyCostVo.fundAll }}
+
+
+
+
+ 当前公司结清合计
+ {{ formobj.settleAll2 }}
+
+
+
公司结清费用减免情况
@@ -407,6 +420,7 @@ export default {
saleOrderSid: '',
showHg: false, // 是否展示回购字段
buyBackMoney: '', // 回购后的还款金额
+ settleAll2: '', // 当前公司结清合计
settingDate: '',
settingDateBe: '',
sid: '',
diff --git a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue
index 8a9ba47e96..00653a7127 100644
--- a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue
@@ -284,12 +284,25 @@
{{ calculateSettleAll }}
-
-
- 截止当前资金占用费
- {{ formobj.loanSettleCompanyCostVo.fundAll }}
-
-
+
+
当前公司结清
+
+
+ 回购后月还还款金额
+ {{ formobj.buyBackMoney }}
+
+
+ 截止当前资金占用费
+ {{ formobj.loanSettleCompanyCostVo.fundAll }}
+
+
+
+
+ 当前公司结清合计
+ {{ formobj.settleAll2 }}
+
+
+
公司结清费用减免情况
@@ -371,18 +384,20 @@ export default {
let settleAll = '0'
// 公司正常结清合计 = 公司逾期月还 + 资金占用费 + 资方逾期利息 + 公司当期未到期月还 + 公司未到期金额 + 贷款保证金扣罚金额 + 名义价 + 合同违约金 + 其它费用 - 贷款保证金
settleAll = Math.round((parseFloat(settleAll) + parseFloat(this.formobj.loanSettleCompanyCostVo.overduePrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.overduePrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.funfCost === '' ? 0 : this.formobj.loanSettleCompanyCostVo.funfCost) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankOverInterest === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankOverInterest) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.deductionAmount === '' ? 0 : this.formobj.loanSettleCompanyCostVo.deductionAmount) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyNominalPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyNominalPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.contractLiquidated === '' ? 0 : this.formobj.loanSettleCompanyCostVo.contractLiquidated) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyOtherPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyOtherPrice) - parseFloat(this.formobj.loanSettleCompanyCostVo.loanDeposit === '' ? 0 : this.formobj.loanSettleCompanyCostVo.loanDeposit)) * 100) / 100
- // 是否由回购申请管理点击结清进入该页面,为是时需要再减去回购后的还款金额
- if (this.formobj.showHg) {
- settleAll = Math.round((parseFloat(settleAll) - parseFloat(this.formobj.buyBackMoney === '' ? 0 : this.formobj.buyBackMoney)) * 100) / 100
- }
return settleAll
},
// 公司结清费用减免情况模块--公司减免后结清合计计算
calculateAmountTo() {
let AmountTo = '0'
- // 是否勾选公司结清费用减免情况,为是时公司减免后结清合计 = 公司正常结清合计 - 资金占用费减免 - 公司资金占用费减免 - 公司其他费用减免 - 公司未到期利息减免
+ // 是否勾选公司结清费用减免情况,为是时公司减免后结清合计 = 公司正常结清合计或当前公司结清合计 - 资金占用费减免 - 公司资金占用费减免 - 公司其他费用减免 - 公司未到期利息减免
if (this.formobj.trueReduction) {
- AmountTo = Math.round((parseFloat(AmountTo) + parseFloat(this.calculateSettleAll === '' ? 0 : this.calculateSettleAll) - parseFloat(this.formobj.loanSettleCompanyReductionVo.fundPenalty === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.fundPenalty) - parseFloat(this.formobj.loanSettleCompanyReductionVo.depositPenalty === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.depositPenalty) - parseFloat(this.formobj.loanSettleCompanyReductionVo.otherCost === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.otherCost) - parseFloat(this.formobj.loanSettleCompanyReductionVo.notDuePriceRelief === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.notDuePriceRelief)) * 100) / 100
+ if (this.formobj.showHg) {
+ // 是否由回购申请管理点击结清进入该页面,为是时公司减免后结清合计 = 当前公司结清合计 - 资金占用费减免 - 公司资金占用费减免 - 公司其他费用减免 - 公司未到期利息减免
+ AmountTo = Math.round((parseFloat(AmountTo) + parseFloat(this.formobj.settleAll2 === '' ? 0 : this.formobj.settleAll2) - parseFloat(this.formobj.loanSettleCompanyReductionVo.fundPenalty === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.fundPenalty) - parseFloat(this.formobj.loanSettleCompanyReductionVo.depositPenalty === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.depositPenalty) - parseFloat(this.formobj.loanSettleCompanyReductionVo.otherCost === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.otherCost) - parseFloat(this.formobj.loanSettleCompanyReductionVo.notDuePriceRelief === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.notDuePriceRelief)) * 100) / 100
+ } else {
+ // 为否时公司减免后结清合计 = 公司正常结清合计 - 资金占用费减免 - 公司资金占用费减免 - 公司其他费用减免 - 公司未到期利息减免
+ AmountTo = Math.round((parseFloat(AmountTo) + parseFloat(this.calculateSettleAll === '' ? 0 : this.calculateSettleAll) - parseFloat(this.formobj.loanSettleCompanyReductionVo.fundPenalty === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.fundPenalty) - parseFloat(this.formobj.loanSettleCompanyReductionVo.depositPenalty === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.depositPenalty) - parseFloat(this.formobj.loanSettleCompanyReductionVo.otherCost === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.otherCost) - parseFloat(this.formobj.loanSettleCompanyReductionVo.notDuePriceRelief === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.notDuePriceRelief)) * 100) / 100
+ }
}
return AmountTo
},
@@ -470,6 +485,7 @@ export default {
saleOrderSid: '',
showHg: false, // 是否展示回购字段
buyBackMoney: '', // 回购后的还款金额
+ settleAll2: '', // 当前公司结清合计
settingDate: '',
settingDateBe: '',
sid: '',
diff --git a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleYiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleYiBan.vue
index 9b3e28f29e..a4e87447df 100644
--- a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleYiBan.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleYiBan.vue
@@ -230,12 +230,25 @@
{{ formobj.loanSettleCompanyCostVo.settleAll }}
-
-
- 截止当前资金占用费
- {{ formobj.loanSettleCompanyCostVo.fundAll }}
-
-
+
+
当前公司结清
+
+
+ 回购后月还还款金额
+ {{ formobj.buyBackMoney }}
+
+
+ 截止当前资金占用费
+ {{ formobj.loanSettleCompanyCostVo.fundAll }}
+
+
+
+
+ 当前公司结清合计
+ {{ formobj.settleAll2 }}
+
+
+
公司结清费用减免情况
@@ -365,6 +378,7 @@ export default {
saleOrderSid: '',
showHg: false, // 是否展示回购字段
buyBackMoney: '', // 回购后的还款金额
+ settleAll2: '', // 当前公司结清合计
settingDate: '',
settingDateBe: '',
sid: '',