diff --git a/anrui-riskcenter-ui/src/views/settle/settleAdd.vue b/anrui-riskcenter-ui/src/views/settle/settleAdd.vue
index 8b076b520e..c3473e6e5a 100644
--- a/anrui-riskcenter-ui/src/views/settle/settleAdd.vue
+++ b/anrui-riskcenter-ui/src/views/settle/settleAdd.vue
@@ -106,8 +106,8 @@
贷款保证金:
是否抵顶:
- 是
- 否
+ 是
+ 否
@@ -344,7 +344,7 @@ export default {
calculateBankSettlePrice() {
let bankSettlePrice = '0'
// 是否抵顶为是,资方结清金额 = 资方逾期月还 + 资方当期未到期月还 + 资方未到期金额 + 资方逾期利息 + 资方名义价 + 资方合同违约金 + 资方其他应收 - 贷款保证金
- if (this.formobj.loanSettleBankCostVo.topping !== '' && this.formobj.loanSettleBankCostVo.topping === '1') {
+ if (this.formobj.loanSettleBankCostVo.topping) {
bankSettlePrice = Math.round((parseFloat(this.formobj.loanSettleBankCostVo.price === '' ? 0 : this.formobj.loanSettleBankCostVo.price) + parseFloat(this.formobj.loanSettleBankCostVo.currentNotDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.currentNotDuePrice) + parseFloat(this.formobj.loanSettleBankCostVo.notDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.notDuePrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankInterest === '' ? 0 : this.formobj.loanSettleBankCostVo.bankInterest) + parseFloat(this.formobj.loanSettleBankCostVo.bankNominalPrice === '' ? 0 : this.formobj.loanSettleBankCostVo.bankNominalPrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.loanSettleBankCostVo.bankContractLiquidated) + parseFloat(this.formobj.loanSettleBankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.loanSettleBankCostVo.bankOtherReceivable) - parseFloat(this.formobj.loanSettleBankCostVo.loanDeposit !== '' ? this.formobj.loanSettleBankCostVo.loanDeposit : '0')) * 100) / 100
} else {
// 是否抵顶为否,资方结清金额 = 资方逾期月还 + 资方当期未到期月还 + 资方未到期金额 + 资方逾期利息 + 资方名义价 + 资方合同违约金 + 资方其他应收
@@ -518,11 +518,6 @@ export default {
req.settleRepoInit({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), sid: sid, userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
if (res.success) {
this.formobj = res.data
- if (this.formobj.loanSettleBankCostVo.topping) {
- this.formobj.loanSettleCompanyCostVo.topping = '1'
- } else if (!this.formobj.loanSettleBankCostVo.topping) {
- this.formobj.loanSettleBankCostVo.topping = '0'
- }
fetchListByBankSid({ bankSid: this.formobj.bankSid }).then((res) => {
if (res.success) {
this.bank_list = res.data
@@ -594,11 +589,6 @@ export default {
this.formobj.loanSettleCompanyCostVo.settleAll = this.calculateSettleAll
this.formobj.loanSettleCompanyReductionVo.amountTo = this.calculateAmountTo
this.formobj.loanSettleCompanyReductionVo.profit = this.calculateProfit
- if (this.formobj.loanSettleBankCostVo.topping === '1') {
- this.formobj.loanSettleCompanyCostVo.topping = true
- } else if (this.formobj.loanSettleBankCostVo.topping === '0') {
- this.formobj.loanSettleBankCostVo.topping = false
- }
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
@@ -620,11 +610,6 @@ export default {
this.formobj.loanSettleCompanyCostVo.settleAll = this.calculateSettleAll
this.formobj.loanSettleCompanyReductionVo.amountTo = this.calculateAmountTo
this.formobj.loanSettleCompanyReductionVo.profit = this.calculateProfit
- if (this.formobj.loanSettleBankCostVo.topping === '1') {
- this.formobj.loanSettleCompanyCostVo.topping = true
- } else if (this.formobj.loanSettleBankCostVo.topping === '0') {
- this.formobj.loanSettleBankCostVo.topping = false
- }
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
diff --git a/anrui-riskcenter-ui/src/views/settle/settleInfo.vue b/anrui-riskcenter-ui/src/views/settle/settleInfo.vue
index b117b1d0eb..3a502d6884 100644
--- a/anrui-riskcenter-ui/src/views/settle/settleInfo.vue
+++ b/anrui-riskcenter-ui/src/views/settle/settleInfo.vue
@@ -101,7 +101,7 @@
资方结清费用
贷款保证金: {{ formobj.loanSettleBankCostVo.loanDeposit }}
- 是否抵顶: {{ formobj.loanSettleBankCostVo.topping == '1' ? '是' : formobj.loanSettleBankCostVo.topping == '0' ? '否' : '' }}
+ 是否抵顶: {{ formobj.loanSettleBankCostVo.topping ? '是' : !formobj.loanSettleBankCostVo.topping ? '否' : '' }}
diff --git a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleDaiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleDaiBan.vue
index c45cc0f333..54665e50d1 100644
--- a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleDaiBan.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleDaiBan.vue
@@ -103,7 +103,7 @@
资方结清费用
贷款保证金: {{ formobj.loanSettleBankCostVo.loanDeposit }}
- 是否抵顶: {{ formobj.loanSettleBankCostVo.topping == '1' ? '是' : formobj.loanSettleBankCostVo.topping == '0' ? '否' : '' }}
+ 是否抵顶: {{ formobj.loanSettleBankCostVo.topping ? '是' : !formobj.loanSettleBankCostVo.topping ? '否' : '' }}
diff --git a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue
index f4194c4d9b..dc3d81fb6b 100644
--- a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue
@@ -105,8 +105,8 @@
贷款保证金:
是否抵顶:
- 是
- 否
+ 是
+ 否
@@ -343,7 +343,7 @@ export default {
calculateBankSettlePrice() {
let bankSettlePrice = '0'
// 是否抵顶为是,资方结清金额 = 资方逾期月还 + 资方当期未到期月还 + 资方未到期金额 + 资方逾期利息 + 资方名义价 + 资方合同违约金 + 资方其他应收 - 贷款保证金
- if (this.formobj.loanSettleBankCostVo.topping !== '' && this.formobj.loanSettleBankCostVo.topping === '1') {
+ if (this.formobj.loanSettleBankCostVo.topping) {
bankSettlePrice = Math.round((parseFloat(this.formobj.loanSettleBankCostVo.price === '' ? 0 : this.formobj.loanSettleBankCostVo.price) + parseFloat(this.formobj.loanSettleBankCostVo.currentNotDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.currentNotDuePrice) + parseFloat(this.formobj.loanSettleBankCostVo.notDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.notDuePrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankInterest === '' ? 0 : this.formobj.loanSettleBankCostVo.bankInterest) + parseFloat(this.formobj.loanSettleBankCostVo.bankNominalPrice === '' ? 0 : this.formobj.loanSettleBankCostVo.bankNominalPrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.loanSettleBankCostVo.bankContractLiquidated) + parseFloat(this.formobj.loanSettleBankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.loanSettleBankCostVo.bankOtherReceivable) - parseFloat(this.formobj.loanSettleBankCostVo.loanDeposit !== '' ? this.formobj.loanSettleBankCostVo.loanDeposit : '0')) * 100) / 100
} else {
// 是否抵顶为否,资方结清金额 = 资方逾期月还 + 资方当期未到期月还 + 资方未到期金额 + 资方逾期利息 + 资方名义价 + 资方合同违约金 + 资方其他应收
@@ -494,11 +494,6 @@ export default {
if (res.success) {
this.formobj = res.data
this.formobj.instanceId = res.data.procInstId
- if (this.formobj.loanSettleBankCostVo.topping) {
- this.formobj.loanSettleCompanyCostVo.topping = '1'
- } else if (!this.formobj.loanSettleBankCostVo.topping) {
- this.formobj.loanSettleBankCostVo.topping = '0'
- }
fetchListByBankSid({ bankSid: this.formobj.bankSid }).then((res) => {
if (res.success) {
this.bank_list = res.data
@@ -570,11 +565,6 @@ export default {
this.formobj.loanSettleCompanyCostVo.settleAll = this.calculateSettleAll
this.formobj.loanSettleCompanyReductionVo.amountTo = this.calculateAmountTo
this.formobj.loanSettleCompanyReductionVo.profit = this.calculateProfit
- if (this.formobj.loanSettleBankCostVo.topping === '1') {
- this.formobj.loanSettleCompanyCostVo.topping = true
- } else if (this.formobj.loanSettleBankCostVo.topping === '0') {
- this.formobj.loanSettleBankCostVo.topping = false
- }
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
@@ -603,11 +593,6 @@ export default {
this.formobj.loanSettleCompanyCostVo.settleAll = this.calculateSettleAll
this.formobj.loanSettleCompanyReductionVo.amountTo = this.calculateAmountTo
this.formobj.loanSettleCompanyReductionVo.profit = this.calculateProfit
- if (this.formobj.loanSettleBankCostVo.topping === '1') {
- this.formobj.loanSettleCompanyCostVo.topping = true
- } else if (this.formobj.loanSettleBankCostVo.topping === '0') {
- this.formobj.loanSettleBankCostVo.topping = false
- }
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
diff --git a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleYiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleYiBan.vue
index 7ad99f68af..9fe9bd711e 100644
--- a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleYiBan.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleYiBan.vue
@@ -100,7 +100,7 @@
资方结清费用
贷款保证金: {{ formobj.loanSettleBankCostVo.loanDeposit }}
- 是否抵顶: {{ formobj.loanSettleBankCostVo.topping == '1' ? '是' : formobj.loanSettleBankCostVo.topping == '0' ? '否' : '' }}
+ 是否抵顶: {{ formobj.loanSettleBankCostVo.topping ? '是' : !formobj.loanSettleBankCostVo.topping ? '否' : '' }}