完善回购管理

anrui-riskcenter-ui/src/views/settle/settleAdd.vue

@@ -300,7 +300,7 @@
             <el-row>
               <el-col :span="24">
                 <div class="span-sty">当前公司结清合计</div>
-                <el-form-item><span class="addinputInfo">{{ formobj.settleAll2 }}</span></el-form-item>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanSettleCompanyCostVo.settleAll2 }}</span></el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -394,7 +394,7 @@ export default {
       if (this.formobj.trueReduction) {
         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
+          AmountTo = Math.round((parseFloat(AmountTo) + parseFloat(this.formobj.loanSettleCompanyCostVo.settleAll2 === '' ? 0 : this.formobj.loanSettleCompanyCostVo.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
@@ -468,7 +468,8 @@ export default {
           otherCostRemarks: '',
           overduePrice: '',
           putBankInterest: '',
-          settleAll: ''
+          settleAll: '',
+          settleAll2: '' // 当前公司结清合计
         },
         loanSettleCompanyReductionVo: {
           amountTo: '',
@@ -488,7 +489,6 @@ export default {
         settingDateBe: '',
         showHg: false, // 是否展示回购字段
         buyBackMoney: '', // 回购后的还款金额
-        settleAll2: '', // 当前公司结清合计
         sid: '',
         trueReduction: false,
         useOrgName: '',
@@ -718,7 +718,8 @@ export default {
           otherCostRemarks: '',
           overduePrice: '',
           putBankInterest: '',
-          settleAll: ''
+          settleAll: '',
+          settleAll2: '' // 当前公司结清合计
         },
         loanSettleCompanyReductionVo: {
           amountTo: '',
@@ -736,7 +737,6 @@ export default {
         saleOrderSid: '',
         showHg: false, // 是否展示回购字段
         buyBackMoney: '', // 回购后的还款金额
-        settleAll2: '', // 当前公司结清合计
         settingDate: '',
         settingDateBe: '',
         sid: '',

anrui-riskcenter-ui/src/views/settle/settleInfo.vue

@@ -246,7 +246,7 @@
             <el-row>
               <el-col :span="24">
                 <div class="span-sty">当前公司结清合计</div>
-                <el-form-item><span class="addinputInfo">{{ formobj.settleAll2 }}</span></el-form-item>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanSettleCompanyCostVo.settleAll2 }}</span></el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -361,7 +361,8 @@ export default {
           otherCostRemarks: '',
           overduePrice: '',
           putBankInterest: '',
-          settleAll: ''
+          settleAll: '',
+          settleAll2: '' // 当前公司结清合计
         },
         loanSettleCompanyReductionVo: {
           amountTo: '',
@@ -379,7 +380,6 @@ export default {
         saleOrderSid: '',
         showHg: false, // 是否展示回购字段
         buyBackMoney: '', // 回购后的还款金额
-        settleAll2: '', // 当前公司结清合计
         settingDate: '',
         settingDateBe: '',
         sid: '',
@@ -509,7 +509,8 @@ export default {
           otherCostRemarks: '',
           overduePrice: '',
           putBankInterest: '',
-          settleAll: ''
+          settleAll: '',
+          settleAll2: '' // 当前公司结清合计
         },
         loanSettleCompanyReductionVo: {
           amountTo: '',
@@ -527,7 +528,6 @@ export default {
         saleOrderSid: '',
         showHg: false, // 是否展示回购字段
         buyBackMoney: '', // 回购后的还款金额
-        settleAll2: '', // 当前公司结清合计
         settingDate: '',
         settingDateBe: '',
         sid: '',

anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleDaiBan.vue

@@ -248,7 +248,7 @@
             <el-row>
               <el-col :span="24">
                 <div class="span-sty">当前公司结清合计</div>
-                <el-form-item><span class="addinputInfo">{{ formobj.settleAll2 }}</span></el-form-item>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanSettleCompanyCostVo.settleAll2 }}</span></el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -402,7 +402,8 @@ export default {
           otherCostRemarks: '',
           overduePrice: '',
           putBankInterest: '',
-          settleAll: ''
+          settleAll: '',
+          settleAll2: '' // 当前公司结清合计
         },
         loanSettleCompanyReductionVo: {
           amountTo: '',
@@ -420,7 +421,6 @@ export default {
         saleOrderSid: '',
         showHg: false, // 是否展示回购字段
         buyBackMoney: '', // 回购后的还款金额
-        settleAll2: '', // 当前公司结清合计
         settingDate: '',
         settingDateBe: '',
         sid: '',

anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue

@@ -299,7 +299,7 @@
             <el-row>
               <el-col :span="24">
                 <div class="span-sty">当前公司结清合计</div>
-                <el-form-item><span class="addinputInfo">{{ formobj.settleAll2 }}</span></el-form-item>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanSettleCompanyCostVo.settleAll2 }}</span></el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -393,7 +393,7 @@ export default {
       if (this.formobj.trueReduction) {
         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
+          AmountTo = Math.round((parseFloat(AmountTo) + parseFloat(this.formobj.loanSettleCompanyCostVo.settleAll2 === '' ? 0 : this.formobj.loanSettleCompanyCostVo.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
@@ -467,7 +467,8 @@ export default {
           otherCostRemarks: '',
           overduePrice: '',
           putBankInterest: '',
-          settleAll: ''
+          settleAll: '',
+          settleAll2: '' // 当前公司结清合计
         },
         loanSettleCompanyReductionVo: {
           amountTo: '',
@@ -485,7 +486,6 @@ export default {
         saleOrderSid: '',
         showHg: false, // 是否展示回购字段
         buyBackMoney: '', // 回购后的还款金额
-        settleAll2: '', // 当前公司结清合计
         settingDate: '',
         settingDateBe: '',
         sid: '',

anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleYiBan.vue

@@ -245,7 +245,7 @@
             <el-row>
               <el-col :span="24">
                 <div class="span-sty">当前公司结清合计</div>
-                <el-form-item><span class="addinputInfo">{{ formobj.settleAll2 }}</span></el-form-item>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanSettleCompanyCostVo.settleAll2 }}</span></el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -360,7 +360,8 @@ export default {
           otherCostRemarks: '',
           overduePrice: '',
           putBankInterest: '',
-          settleAll: ''
+          settleAll: '',
+          settleAll2: '' // 当前公司结清合计
         },
         loanSettleCompanyReductionVo: {
           amountTo: '',
@@ -378,7 +379,6 @@ export default {
         saleOrderSid: '',
         showHg: false, // 是否展示回购字段
         buyBackMoney: '', // 回购后的还款金额
-        settleAll2: '', // 当前公司结清合计
         settingDate: '',
         settingDateBe: '',
         sid: '',