diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java
index 41c1f8119a..fe69ba2f92 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java
@@ -102,6 +102,14 @@ public interface LoanRepaymentScheduleFeign {
     @ResponseBody
     ResultBean<String> returnBankOrOtherBankByPlanSid(@RequestParam("planSid") String planSid);
 
+    @ApiOperation("重推转累欠接口")
+    @PostMapping("/rePushOweState")
+    void rePushOweState();
+
+    @ApiOperation("重推计提资金占用费接口")
+    @PostMapping("/rePushFund")
+    void rePushFund();
+
     //-------------------------app接口--------------------
 
     /**
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java
index e881cfde4a..7fdf2afa71 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java
@@ -93,6 +93,16 @@ public class LoanRepaymentScheduleFeignFallback implements LoanRepaymentSchedule
         return null;
     }
 
+    @Override
+    public void rePushOweState() {
+
+    }
+
+    @Override
+    public void rePushFund() {
+
+    }
+
     @Override
     public ResultBean<PagerVo<AppRepaymentPlanVo>> getRepaymentPlanList(PagerQuery<AppRepaymentPlanQuery> pq) {
         return null;
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
index ea48d0152a..4f895ed1e5 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
@@ -245,7 +245,7 @@
 
     <select id="selDifference" resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.DifferenceVo">
         SELECT
-            IFNULL(	SUM(IFNULL( h.actualMoney, 0 )) ,0)
+            IFNULL(	SUM(IFNULL( h.actualMoney, 0 )) ,0) difference
         FROM
             loan_repayment_history AS h
         WHERE
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java
index 336a17e41b..bdfbe0f4bf 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java
@@ -93,11 +93,13 @@ public class ScheduledRepaymentPlanDetailsService {
                                     generalVoucher.setUseOrgCode(organizationVo.getOrgCode());
                                 }
                             }
+                            String cwDeptNo = "";
                             if (StringUtils.isNotBlank(planDetails.getScheduleSid())) {
                                 LoanRepaymentSchedule repaymentSchedule = loanRepaymentScheduleService.fetchBySid(planDetails.getScheduleSid());
                                 if (null != repaymentSchedule) {
                                     if (StringUtils.isNotBlank(repaymentSchedule.getCwDeptNo())) {
                                         voucherDetail.setDeptCode(repaymentSchedule.getCwDeptNo());
+                                        cwDeptNo = repaymentSchedule.getCwDeptNo();
                                     }
                                 }
                             }
@@ -107,40 +109,56 @@ public class ScheduledRepaymentPlanDetailsService {
                                 if (null != busSalesOrderVehicle) {
                                     String customerNumber = "";
                                     //判断财务系统是否有客户
-                                    Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
-                                    String linkNo = "";
-                                    BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
-                                    if (!aBoolean) {
-                                        //  List<BdCustomer> bdCustomers = new ArrayList<>();
-                                        BdCustomer bdCustomer = new BdCustomer();
-                                        bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
-                                        bdCustomer.setFShortName(salesOrder.getContractNo());
-                                        BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
-                                        bdCustomer.setTOrgIds(data.getOrgCode());
-                                        if (org.apache.commons.lang3.StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
-                                            String vinNo = busSalesOrderVehicle.getLinkNo();
-                                            if (vinNo.length() > 8) {
-                                                linkNo = vinNo.substring(vinNo.length() - 8);
+                                    try {
+                                        Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
+                                        String linkNo = "";
+                                        BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
+                                        if (!aBoolean) {
+                                            //  List<BdCustomer> bdCustomers = new ArrayList<>();
+                                            BdCustomer bdCustomer = new BdCustomer();
+                                            bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
+                                            bdCustomer.setFShortName(salesOrder.getContractNo());
+                                            if (StringUtils.isNotBlank(salesOrder.getPurchaseSystemSid())) {
+                                                BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
+                                                if (null != data) {
+                                                    if (StringUtils.isNotBlank(data.getOrgCode())) {
+                                                        bdCustomer.setTOrgIds(data.getOrgCode());
+                                                    } else {
+                                                        bdCustomer.setTOrgIds(cwDeptNo);
+                                                    }
+                                                } else {
+                                                    bdCustomer.setTOrgIds(cwDeptNo);
+                                                }
                                             } else {
-                                                linkNo = busSalesOrderVehicle.getLinkNo();
+                                                bdCustomer.setTOrgIds(cwDeptNo);
                                             }
-                                            if (null != borrowerDetailsVo) {
-                                                bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + linkNo);
+                                            if (org.apache.commons.lang3.StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
+                                                String vinNo = busSalesOrderVehicle.getLinkNo();
+                                                if (vinNo.length() > 8) {
+                                                    linkNo = vinNo.substring(vinNo.length() - 8);
+                                                } else {
+                                                    linkNo = busSalesOrderVehicle.getLinkNo();
+                                                }
+                                                if (null != borrowerDetailsVo) {
+                                                    bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + linkNo);
+                                                }
+                                            } else {
+                                                if (null != borrowerDetailsVo) {
+                                                    bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo());
+                                                }
                                             }
-                                        } else {
-                                            if (null != borrowerDetailsVo) {
-                                                bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo());
+                                            //  bdCustomers.add(bdCustomer);
+                                            ResultBean<String> resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer);
+                                            if (resultBean.getSuccess()) {
+                                                customerNumber = bdCustomer.getFNumber();
                                             }
+                                        } else {
+                                            customerNumber = busSalesOrderVehicle.getTemporaryNo();
                                         }
-                                        //  bdCustomers.add(bdCustomer);
-                                        ResultBean<String> resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer);
-                                        if (resultBean.getSuccess()) {
-                                            customerNumber = bdCustomer.getFNumber();
-                                        }
-                                    } else {
-                                        customerNumber = busSalesOrderVehicle.getTemporaryNo();
+                                        voucherDetail.setCustomerCode(customerNumber);
+                                    } catch (Exception e) {
+                                        e.printStackTrace();
                                     }
-                                    voucherDetail.setCustomerCode(customerNumber);
                                 }
                             }
                             if (StringUtils.isNotBlank(planDetails.getOutstandingMoney())) {
@@ -188,12 +206,6 @@ public class ScheduledRepaymentPlanDetailsService {
                     }
                     GeneralVoucher.GeneralVoucherDetail voucherDetail1 = new GeneralVoucher.GeneralVoucherDetail();
                     voucherDetail1.setSceneCode("贷方");
-//                    Calendar calendar=Calendar.getInstance();
-//                    calendar.setTime(new Date());
-//                    //往前一天
-//                    calendar.add(Calendar.DAY_OF_MONTH,-1);
-//                    Date time = calendar.getTime();
-//                    voucherDetail1.setDataTime(time);
                     voucherDetail1.setDataTime(new Date());
                     voucherDetail1.setAmount(result);
                     voucherDetail1.setTimeFlag("0");
@@ -222,41 +234,57 @@ public class ScheduledRepaymentPlanDetailsService {
                             if (null != salesOrder) {
                                 if (null != busSalesOrderVehicle) {
                                     String customerNumber = "";
-                                    //判断财务系统是否有客户
-                                    Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
-                                    String linkNo = "";
-                                    BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
-                                    if (!aBoolean) {
-                                        //  List<BdCustomer> bdCustomers = new ArrayList<>();
-                                        BdCustomer bdCustomer = new BdCustomer();
-                                        bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
-                                        bdCustomer.setFShortName(salesOrder.getContractNo());
-                                        BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
-                                        bdCustomer.setTOrgIds(data.getOrgCode());
-                                        if (org.apache.commons.lang3.StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
-                                            String vinNo = busSalesOrderVehicle.getLinkNo();
-                                            if (vinNo.length() > 8) {
-                                                linkNo = vinNo.substring(vinNo.length() - 8);
+                                    try {
+                                        //判断财务系统是否有客户
+                                        Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
+                                        String linkNo = "";
+                                        BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
+                                        if (!aBoolean) {
+                                            //  List<BdCustomer> bdCustomers = new ArrayList<>();
+                                            BdCustomer bdCustomer = new BdCustomer();
+                                            bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
+                                            bdCustomer.setFShortName(salesOrder.getContractNo());
+                                            if (StringUtils.isNotBlank(salesOrder.getPurchaseSystemSid())) {
+                                                BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
+                                                if (null != data) {
+                                                    if (StringUtils.isNotBlank(data.getOrgCode())) {
+                                                        bdCustomer.setTOrgIds(data.getOrgCode());
+                                                    } else {
+                                                        bdCustomer.setTOrgIds(cwDeptCode);
+                                                    }
+                                                } else {
+                                                    bdCustomer.setTOrgIds(cwDeptCode);
+                                                }
                                             } else {
-                                                linkNo = busSalesOrderVehicle.getLinkNo();
+                                                bdCustomer.setTOrgIds(cwDeptCode);
                                             }
-                                            if (null != borrowerDetailsVo) {
-                                                bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + linkNo);
+                                            if (org.apache.commons.lang3.StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
+                                                String vinNo = busSalesOrderVehicle.getLinkNo();
+                                                if (vinNo.length() > 8) {
+                                                    linkNo = vinNo.substring(vinNo.length() - 8);
+                                                } else {
+                                                    linkNo = busSalesOrderVehicle.getLinkNo();
+                                                }
+                                                if (null != borrowerDetailsVo) {
+                                                    bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + linkNo);
+                                                }
+                                            } else {
+                                                if (null != borrowerDetailsVo) {
+                                                    bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo());
+                                                }
                                             }
-                                        } else {
-                                            if (null != borrowerDetailsVo) {
-                                                bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo());
+                                            //  bdCustomers.add(bdCustomer);
+                                            ResultBean<String> resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer);
+                                            if (resultBean.getSuccess()) {
+                                                customerNumber = bdCustomer.getFNumber();
                                             }
+                                        } else {
+                                            customerNumber = busSalesOrderVehicle.getTemporaryNo();
                                         }
-                                        //  bdCustomers.add(bdCustomer);
-                                        ResultBean<String> resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer);
-                                        if (resultBean.getSuccess()) {
-                                            customerNumber = bdCustomer.getFNumber();
-                                        }
-                                    } else {
-                                        customerNumber = busSalesOrderVehicle.getTemporaryNo();
+                                        voucherDetail.setCustomerCode(customerNumber);
+                                    } catch (Exception e) {
+                                        e.printStackTrace();
                                     }
-                                    voucherDetail.setCustomerCode(customerNumber);
                                 }
                             }
                             voucherDetail.setAmount(v.getDuePushMoney());
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java
index 81bc0c42ff..20446207ca 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java
@@ -5,6 +5,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusLoancontractForR
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.LoanRepaymentPlanDetailsExportVo;
 import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
 import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.*;
+import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.ScheduledRepaymentPlanDetailsService;
 import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -34,7 +35,8 @@ public class LoanRepaymentScheduleRest implements LoanRepaymentScheduleFeign {
 
     @Autowired
     private LoanRepaymentScheduleService loanRepaymentScheduleService;
-
+    @Autowired
+    private ScheduledRepaymentPlanDetailsService scheduledRepaymentPlanDetailsService;
 
     @Override
     public ResultBean<LoanCreateSchedulePdfVo> loanCreateSchedule(String salesOrderSid) {
@@ -109,6 +111,16 @@ public class LoanRepaymentScheduleRest implements LoanRepaymentScheduleFeign {
         return loanRepaymentScheduleService.returnBankOrOtherBankByPlanSid(planSid);
     }
 
+    @Override
+    public void rePushOweState() {
+        scheduledRepaymentPlanDetailsService.pushLateVoucher();
+    }
+
+    @Override
+    public void rePushFund() {
+        scheduledRepaymentPlanDetailsService.pushFundVoucher();
+    }
+
     @Override
     public ResultBean<PagerVo<AppRepaymentPlanVo>> getRepaymentPlanList(PagerQuery<AppRepaymentPlanQuery> pq) {
         ResultBean<PagerVo<AppRepaymentPlanVo>> rb = ResultBean.fireFail();
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
index e88c7ea3bc..389ee8a67c 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
@@ -888,21 +888,23 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 updateList.add(jr1);
             }
         } else {
-            if (loanSettleCompanyCost.getBankOverInterest().compareTo(BigDecimal.ZERO) > 0) {
-                //资方逾期利息应收
-                FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
-                jr.setBusSid(planDetails.getSid());
-                jr.setReveivableMoney(loanSettleCompanyCost.getBankOverInterest());
-                jr.setPayCostTitleKey("012");
-                jr.setPayCostTitleValue("结清时资方逾期利息");
-                jr.setOrgSidPath(planDetails.getOrgSidPath());
-                jr.setUseOrgName(planDetails.getUseOrgName());
-                jr.setUseOrgSid(planDetails.getUseOrgSid());
-                jr.setStaffDeptName(planDetails.getDept());
-                jr.setStaffName(planDetails.getStaffName());
-                jr.setStaffDeptSid(planDetails.getDeptSid());
-                jr.setStaffUserSid(planDetails.getSalesUserSid());
-                list.add(jr);
+            if (loanSettleCompanyCost.getBankOverInterest() != null) {
+                if (loanSettleCompanyCost.getBankOverInterest().compareTo(BigDecimal.ZERO) > 0) {
+                    //资方逾期利息应收
+                    FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
+                    jr.setBusSid(planDetails.getSid());
+                    jr.setReveivableMoney(loanSettleCompanyCost.getBankOverInterest());
+                    jr.setPayCostTitleKey("012");
+                    jr.setPayCostTitleValue("结清时资方逾期利息");
+                    jr.setOrgSidPath(planDetails.getOrgSidPath());
+                    jr.setUseOrgName(planDetails.getUseOrgName());
+                    jr.setUseOrgSid(planDetails.getUseOrgSid());
+                    jr.setStaffDeptName(planDetails.getDept());
+                    jr.setStaffName(planDetails.getStaffName());
+                    jr.setStaffDeptSid(planDetails.getDeptSid());
+                    jr.setStaffUserSid(planDetails.getSalesUserSid());
+                    list.add(jr);
+                }
             }
         }
         FinUncollectedReceivablesDetailedJR jr2 = finUncollectedReceivablesDetailedJRFeign.getUnJrByPayCostTitleKeyAndBusSid("009", planDetailsSid).getData();
@@ -912,21 +914,23 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 updateList.add(jr1);
             }
         } else {
-            if (loanSettleCompanyCost.getCompanyNominalPrice().compareTo(BigDecimal.ZERO) > 0) {
-                //名义价应收
-                FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
-                jr.setBusSid(planDetails.getSid());
-                jr.setReveivableMoney(loanSettleCompanyCost.getCompanyNominalPrice());
-                jr.setPayCostTitleKey("009");
-                jr.setPayCostTitleValue("名义价");
-                jr.setOrgSidPath(planDetails.getOrgSidPath());
-                jr.setUseOrgName(planDetails.getUseOrgName());
-                jr.setUseOrgSid(planDetails.getUseOrgSid());
-                jr.setStaffDeptName(planDetails.getDept());
-                jr.setStaffName(planDetails.getStaffName());
-                jr.setStaffDeptSid(planDetails.getDeptSid());
-                jr.setStaffUserSid(planDetails.getSalesUserSid());
-                list.add(jr);
+            if (null != loanSettleCompanyCost.getCompanyNominalPrice()) {
+                if (loanSettleCompanyCost.getCompanyNominalPrice().compareTo(BigDecimal.ZERO) > 0) {
+                    //名义价应收
+                    FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
+                    jr.setBusSid(planDetails.getSid());
+                    jr.setReveivableMoney(loanSettleCompanyCost.getCompanyNominalPrice());
+                    jr.setPayCostTitleKey("009");
+                    jr.setPayCostTitleValue("名义价");
+                    jr.setOrgSidPath(planDetails.getOrgSidPath());
+                    jr.setUseOrgName(planDetails.getUseOrgName());
+                    jr.setUseOrgSid(planDetails.getUseOrgSid());
+                    jr.setStaffDeptName(planDetails.getDept());
+                    jr.setStaffName(planDetails.getStaffName());
+                    jr.setStaffDeptSid(planDetails.getDeptSid());
+                    jr.setStaffUserSid(planDetails.getSalesUserSid());
+                    list.add(jr);
+                }
             }
         }
         FinUncollectedReceivablesDetailedJR jr3 = finUncollectedReceivablesDetailedJRFeign.getUnJrByPayCostTitleKeyAndBusSid("010", planDetailsSid).getData();
@@ -936,21 +940,23 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 updateList.add(jr3);
             }
         } else {
-            if (loanSettleCompanyCost.getContractLiquidated().compareTo(BigDecimal.ZERO) > 0) {
-                //合同违约金应收
-                FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
-                jr.setBusSid(planDetails.getSid());
-                jr.setReveivableMoney(loanSettleCompanyCost.getContractLiquidated());
-                jr.setPayCostTitleKey("010");
-                jr.setPayCostTitleValue("合同违约金");
-                jr.setOrgSidPath(planDetails.getOrgSidPath());
-                jr.setUseOrgName(planDetails.getUseOrgName());
-                jr.setUseOrgSid(planDetails.getUseOrgSid());
-                jr.setStaffDeptName(planDetails.getDept());
-                jr.setStaffName(planDetails.getStaffName());
-                jr.setStaffDeptSid(planDetails.getDeptSid());
-                jr.setStaffUserSid(planDetails.getSalesUserSid());
-                list.add(jr);
+            if (null != loanSettleCompanyCost.getContractLiquidated()) {
+                if (loanSettleCompanyCost.getContractLiquidated().compareTo(BigDecimal.ZERO) > 0) {
+                    //合同违约金应收
+                    FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
+                    jr.setBusSid(planDetails.getSid());
+                    jr.setReveivableMoney(loanSettleCompanyCost.getContractLiquidated());
+                    jr.setPayCostTitleKey("010");
+                    jr.setPayCostTitleValue("合同违约金");
+                    jr.setOrgSidPath(planDetails.getOrgSidPath());
+                    jr.setUseOrgName(planDetails.getUseOrgName());
+                    jr.setUseOrgSid(planDetails.getUseOrgSid());
+                    jr.setStaffDeptName(planDetails.getDept());
+                    jr.setStaffName(planDetails.getStaffName());
+                    jr.setStaffDeptSid(planDetails.getDeptSid());
+                    jr.setStaffUserSid(planDetails.getSalesUserSid());
+                    list.add(jr);
+                }
             }
         }
         BigDecimal otherAmount = BigDecimal.ZERO;
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotAdd.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotAdd.vue
index 7340a9596c..5ace445e4b 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotAdd.vue
@@ -48,7 +48,7 @@
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <el-input v-model="formobj.shareProportion" clearable @keyup.native="UpNumber" placeholder="" class="addinputw"/>
+                <el-input v-model="formobj.shareProportion" @input="shareProportionInput" @keyup.native="formobj.shareProportion = getNumber(formobj.shareProportion, 2)" clearable placeholder="" class="addinputw"/>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
@@ -56,7 +56,7 @@
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <span>{{ shareRebateTotalSummation() }}</span>
+                <span>{{ formobj.shareRebateTotal }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
@@ -64,7 +64,7 @@
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <span>{{ thisRebateBalanceSummation() }}</span>
+                <span>{{ formobj.thisRebateBalance }}</span>
               </el-form-item>
             </el-col>
           </el-row>
@@ -149,15 +149,23 @@ export default {
     }
   },
   methods: {
-    UpNumber(e) {
-      e.target.value = e.target.value.replace(/[^\d.]/g, '') // 清除“数字”和“.”"-"以外的字符
-      e.target.value = e.target.value.replace(/^00/, '0.') // 开头不能有两个0
-      e.target.value = e.target.value.replace(/\.{2,}/g, '.') // 只保留第一个. 清除多余的
-      e.target.value = e.target.value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3') // 只能输入两个小数
-      if (e.target.value.indexOf('.') < 0 && e.target.value !== '' && e.target.value !== '-') {
-        // 以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额
-        e.target.value = parseFloat(e.target.value)
+    getNumber(val, limit) {
+      val = val.replace(/[^0-9.]/g, '') // 保留数字
+      val = val.replace(/^00/, '0.') // 开头不能有两个0
+      val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
+      val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
+      val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); // 只保留一个小数点
+      /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0
+      const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
+      const reg = new RegExp(str)
+      if (limit === 0) {
+        // 不需要小数点
+        val = val.replace(reg, '$1')
+      } else {
+        // 通过正则保留小数点后指定的位数
+        val = val.replace(reg, '$1.$2')
       }
+      return val
     },
     showEdit(val) {
       this.$nextTick(() => {
@@ -175,24 +183,20 @@ export default {
       this.formobj.withholdingApply = val.withholdingApply
       this.formobj.distributionState = '已分配'
       this.formobj.scmCollectionRebateDistributionVehs = val.scmCollectionRebateDistributionVehs
-      this.formobj.shareGinExaProportion = parseFloat(this.formobj.estimateRebate) / parseFloat(this.formobj.collectionMoney)
+      // 计算分摊参考比例 = 预提返利 / 回款金额
+      this.formobj.shareGinExaProportion = Math.round((parseFloat(this.formobj.estimateRebate !== '' ? this.formobj.estimateRebate : 0) / parseFloat(this.formobj.collectionMoney !== '' ? this.formobj.collectionMoney : 0)) * 100) / 100
       this.viewTitle = '回款返利分配'
     },
-    shareRebateTotalSummation() {
-      if (this.formobj.shareProportion !== '') {
-        this.formobj.shareRebateTotal = parseFloat(this.formobj.collectionMoney) * parseFloat(this.formobj.shareProportion)
-        return this.formobj.shareRebateTotal
-      }
-    },
-    thisRebateBalanceSummation() {
-      if (this.formobj.shareRebateTotal !== '') {
-        this.formobj.thisRebateBalance = parseFloat(this.formobj.estimateRebate) - parseFloat(this.formobj.shareRebateTotal)
-        return this.formobj.thisRebateBalance
-      }
+    shareProportionInput() {
+      // 计算分摊返利总额 = 回款金额 * 分摊比例
+      this.formobj.shareRebateTotal = Math.round((parseFloat(this.formobj.collectionMoney !== '' ? this.formobj.collectionMoney : 0) * parseFloat(this.formobj.shareProportion !== '' ? this.formobj.shareProportion : 0)) * 100) / 100
+      // 计算本次返利金额 = 预提返利 - 分摊返利总额
+      this.formobj.thisRebateBalance = parseFloat(this.formobj.estimateRebate !== '' ? this.formobj.estimateRebate : 0) - parseFloat(this.formobj.shareRebateTotal !== '' ? this.formobj.shareRebateTotal : 0)
     },
     handleAllocation() {
       for (var i = 0; i < this.formobj.scmCollectionRebateDistributionVehs.length; i++) {
-        this.formobj.scmCollectionRebateDistributionVehs[i].distributionCollectionRebate = parseFloat(this.formobj.scmCollectionRebateDistributionVehs[i].costPrice) * parseFloat(this.formobj.shareProportion)
+        // 计算每台车的回款返利 = 厂家结算价 * 分摊比例
+        this.formobj.scmCollectionRebateDistributionVehs[i].distributionCollectionRebate = Math.round((parseFloat(this.formobj.scmCollectionRebateDistributionVehs[i].costPrice !== '' ? this.formobj.scmCollectionRebateDistributionVehs[i].costPrice : 0) * (parseFloat(this.formobj.shareProportion !== '' ? this.formobj.shareProportion : 0) / 100)) * 100) / 100
       }
     },
     handleSave() {
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagementAdd.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagementAdd.vue
index 4944c69b90..edbc15f93b 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagementAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagementAdd.vue
@@ -57,7 +57,7 @@
             </el-col>
             <el-col :span="4">
               <el-form-item>
-                <el-radio-group v-model="formobj.isReduceFreight" @change="handleRadio">
+                <el-radio-group v-model="formobj.isReduceFreight">
                   <el-radio label="1">是</el-radio>
                   <el-radio label="0">否</el-radio>
                 </el-radio-group>
@@ -67,13 +67,13 @@
               <span>运费</span>
             </el-col>
             <el-col :span="4">
-              <el-form-item><el-input v-model="formobj.freight" :disabled="formobj.isReduceFreight === '0'" class="addinputw" @keyup.native="UpNumber" placeholder="" clearable></el-input></el-form-item>
+              <el-form-item><el-input v-model="formobj.freight" :disabled="formobj.isReduceFreight == '0'" class="addinputw" @keyup.native="formobj.freight = getNumber(formobj.freight, 2)" placeholder="" clearable></el-input></el-form-item>
             </el-col>
             <el-col :span="2" class="tleftb">
               <span>计算标准(%)</span>
             </el-col>
             <el-col :span="4">
-              <el-form-item><el-input v-model="formobj.calculationStandard" @keyup.native="UpInput" clearable placeholder="" class="addinputw"></el-input></el-form-item>
+              <el-form-item><el-input v-model="formobj.calculationStandard" @keyup.native="formobj.calculationStandard = getNumber(formobj.calculationStandard, 2)" clearable placeholder="" class="addinputw"></el-input></el-form-item>
             </el-col>
             <el-col :span="2" class="tleftb">
               <span>预计返利</span>
@@ -142,6 +142,7 @@ export default {
         freight: '',
         manufaSaleChannel: '',
         manufaSaleChannelValue: '',
+        isReduceFreight: '',
         remarks: '',
         state: '',
         uploadDate: '',
@@ -158,6 +159,20 @@ export default {
       submitdisabled: false
     }
   },
+  computed: {
+    // 计算预计返利
+    estimateRebateSum() {
+      let estimateRebate = '0'
+      // 是否减运费为是时 预计返利 = （回款金额 - 运费） * 计算标准
+      if (this.formobj.isReduceFreight === '1') {
+        estimateRebate = Math.round((parseFloat(estimateRebate) + (parseFloat(this.formobj.collectionMoney !== '' ? this.formobj.collectionMoney : 0) - parseFloat(this.formobj.freight !== '' ? this.formobj.freight : 0)) * (parseFloat(this.formobj.calculationStandard !== '' ? this.formobj.calculationStandard : 0) / 100)) * 100) / 100
+      } else {
+        // 为否时 预计返利 = 回款金额 * 计算标准
+        estimateRebate = Math.round((parseFloat(estimateRebate) + parseFloat(this.formobj.collectionMoney !== '' ? this.formobj.collectionMoney : 0) * (parseFloat(this.formobj.calculationStandard !== '' ? this.formobj.calculationStandard : 0) / 100)) * 100) / 100
+      }
+      return estimateRebate
+    }
+  },
   methods: {
     init() {
       fetchBySid(this.formobj.createOrgSid).then((res) => {
@@ -167,44 +182,23 @@ export default {
         }
       })
     },
-    UpNumber(e) {
-      if (this.formobj.isReduceFreight === '') {
-        this.formobj.calculationStandard = ''
-        this.$message({ showClose: true, type: 'error', message: '是否减运费请选择是或否' })
-        return
+    getNumber(val, limit) {
+      val = val.replace(/[^0-9.]/g, '') // 保留数字
+      val = val.replace(/^00/, '0.') // 开头不能有两个0
+      val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
+      val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
+      val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); // 只保留一个小数点
+      /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0
+      const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
+      const reg = new RegExp(str)
+      if (limit === 0) {
+        // 不需要小数点
+        val = val.replace(reg, '$1')
       } else {
-          e.target.value = e.target.value.replace(/[^\d]/g, '') // 清除“数字”和“.”"-"以外的字符
-          e.target.value = e.target.value.replace(/^00/, '0') // 开头不能有两个0
-          // e.target.value = e.target.value.replace(/\.{2,}/g, '.') // 只保留第一个. 清除多余的
-          // e.target.value = e.target.value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3') // 只能输入两个小数
-          if (e.target.value.indexOf('.') < 0 && e.target.value !== '' && e.target.value !== '-') {
-            // 以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额
-            e.target.value = parseFloat(e.target.value)
-          }
-      }
-    },
-    UpInput(e) {
-      e.target.value = e.target.value.replace(/[^\d.]/g, '') // 清除“数字”和“.”"-"以外的字符
-      e.target.value = e.target.value.replace(/^00/, '0.') // 开头不能有两个0
-      e.target.value = e.target.value.replace(/\.{2,}/g, '.') // 只保留第一个. 清除多余的
-      e.target.value = e.target.value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3') // 只能输入两个小数
-      if (e.target.value.indexOf('.') < 0 && e.target.value !== '' && e.target.value !== '-') {
-        // 以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额
-        e.target.value = parseFloat(e.target.value)
-      }
-    },
-    handleRadio(value) {
-      if (value === '1') {
-        this.formobj.freight = ''
-      } else {
-        this.formobj.freight = '0'
-      }
-    },
-    estimateRebateSum() {
-      if (this.formobj.freight !== '' && this.formobj.calculationStandard !== '') {
-        this.formobj.estimateRebate = (parseInt(this.formobj.collectionMoney) - parseInt(this.formobj.freight)) * (parseFloat(this.formobj.calculationStandard) / 100)
-        return this.formobj.estimateRebate
+        // 通过正则保留小数点后指定的位数
+        val = val.replace(reg, '$1.$2')
       }
+      return val
     },
     showEdit(row, createOrgSid) {
       this.$nextTick(() => {
@@ -218,7 +212,8 @@ export default {
           this.formobj = resp.data
           if (this.formobj.scmCollectionRebateVehs.length !== 0) {
             for (var i = 0; i < this.formobj.scmCollectionRebateVehs.length; i++) {
-              this.aggregate = parseInt(0) + parseInt(this.formobj.scmCollectionRebateVehs[i].costPrice)
+              // 计算车辆回款返利列表--厂家结算价总和
+              this.aggregate = parseFloat(this.aggregate !== '' ? this.aggregate : 0) + parseFloat(this.formobj.scmCollectionRebateVehs[i].costPrice)
             }
           }
         }
@@ -231,21 +226,19 @@ export default {
         return
       } else {
         for (var i = 0; i < this.formobj.scmCollectionRebateVehs.length; i++) {
-          this.formobj.scmCollectionRebateVehs[i].estimateRebate = parseFloat(this.formobj.estimateRebate) * (parseFloat(this.formobj.scmCollectionRebateVehs[i].costPrice / parseFloat(this.aggregate)))
+          // 计算每台车的预计返利 = 总预计返利 * （单台结算价 / 总结算价）
+          this.formobj.scmCollectionRebateVehs[i].estimateRebate = Math.round((parseFloat(this.estimateRebateSum) * (parseFloat(this.formobj.scmCollectionRebateVehs[i].costPrice !== '' ? this.formobj.scmCollectionRebateVehs[i].costPrice : 0) / parseFloat(this.aggregate !== '' ? this.aggregate : 0))) * 100) / 100
         }
       }
     },
     save() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
+          this.formobj.estimateRebate = this.estimateRebateSum
           this.submitdisabled = true
           req.save(this.formobj).then((resp) => {
             if (resp.success) {
-              this.$message({
-                showClose: true,
-                type: 'success',
-                message: resp.msg
-              })
+              this.$message({ showClose: true, type: 'success', message: resp.msg })
               this.handleReturn('true')
             }
           }).catch(() => {
@@ -275,6 +268,7 @@ export default {
         freight: '',
         manufaSaleChannel: '',
         manufaSaleChannelValue: '',
+        isReduceFreight: '',
         remarks: '',
         state: '',
         uploadDate: '',
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedAdd.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedAdd.vue
index 85b5157fa6..a864efb8e3 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedAdd.vue
@@ -206,23 +206,21 @@ export default {
       this.viewTitle = '【编辑】回款返利核对审核申请'
       console.log('编辑回显', row.sid)
       req.fetchDetailsBySid(row.sid).then((resp) => {
-        this.formobj = resp.data
-        this.formobj.instanceId = resp.data.procInstId
+        if (resp.success) {
+          this.formobj = resp.data
+          this.formobj.instanceId = resp.data.procInstId
+        }
       }).catch((e) => {
         this.formobj = row
       })
     },
     changeBrand(value) {
-      let bb = null
-      this.brand_list.forEach((e) => {
-        if (e.brandName === value) {
-          bb = {
-            name: e.brandName,
-            sid: e.sid
-          }
-        }
-      })
-      this.formobj.brandSid = bb.sid
+      const choose = this.brand_list.filter((item) => item.brandName === value)
+      if (choose !== null && choose.length > 0) {
+        this.formobj.brandSid = choose[0].sid
+      } else {
+        this.formobj.brandSid = ''
+      }
     },
     // 明细表添加一行数据
     handleSelect() {
@@ -244,10 +242,10 @@ export default {
           let v = 0
           for (var j in this.formobj.scmWhenCollectionrebateCheckapplydetailDetails) {
             if (this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionTypeValue === cval.collectionTypeValue) {
-              this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionMoney = parseInt(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionMoney) + parseInt(cval.collectionMoney)
-              this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].estimateRebate = parseInt(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].estimateRebate) + parseInt(cval.estimateRebate)
-              this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].uploadMoney = parseInt(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].uploadMoney) + parseInt(cval.uploadMoney)
-              this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].adjustmentMoney = parseInt(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].adjustmentMoney) + parseInt(cval.adjustmentMoney)
+              this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionMoney = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionMoney) + parseFloat(cval.collectionMoney)
+              this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].estimateRebate = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].estimateRebate) + parseFloat(cval.estimateRebate)
+              this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].uploadMoney = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].uploadMoney) + parseFloat(cval.uploadMoney)
+              this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].adjustmentMoney = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].adjustmentMoney) + parseFloat(cval.adjustmentMoney)
               this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionRebateSids.push(cval.sid)
               v = 1
               break
@@ -279,10 +277,10 @@ export default {
           let v = 0
           for (var l in this.formobj.scmLastCollectionrebateCheckapplydetailDetails) {
             if (this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].withholdingDate === bval.withholdingDate) {
-              this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionMoney = parseInt(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionMoney) + parseInt(bval.collectionMoney)
-              this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate = parseInt(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate) + parseInt(bval.estimateRebate)
-              this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney = parseInt(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney) + parseInt(bval.uploadMoney)
-              this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney = parseInt(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney) + parseInt(bval.adjustmentMoney)
+              this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionMoney = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionMoney) + parseFloat(bval.collectionMoney)
+              this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate) + parseFloat(bval.estimateRebate)
+              this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney) + parseFloat(bval.uploadMoney)
+              this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney) + parseFloat(bval.adjustmentMoney)
               this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionRebateSids.push(bval.sid)
               v = 1
               break
@@ -317,10 +315,10 @@ export default {
           let v = 0
           for (var j in aa) {
             if (aa[j].collectionTypeValue === cval.collectionTypeValue) {
-              aa[j].collectionMoney = parseInt(aa[j].collectionMoney) + parseInt(cval.collectionMoney)
-              aa[j].estimateRebate = parseInt(aa[j].estimateRebate) + parseInt(cval.estimateRebate)
-              aa[j].uploadMoney = parseInt(aa[j].uploadMoney) + parseInt(cval.uploadMoney)
-              aa[j].adjustmentMoney = parseInt(aa[j].adjustmentMoney) + parseInt(cval.adjustmentMoney)
+              aa[j].collectionMoney = parseFloat(aa[j].collectionMoney) + parseFloat(cval.collectionMoney)
+              aa[j].estimateRebate = parseFloat(aa[j].estimateRebate) + parseFloat(cval.estimateRebate)
+              aa[j].uploadMoney = parseFloat(aa[j].uploadMoney) + parseFloat(cval.uploadMoney)
+              aa[j].adjustmentMoney = parseFloat(aa[j].adjustmentMoney) + parseFloat(cval.adjustmentMoney)
               aa[j].collectionRebateSids.push(cval.sid)
               v = 1
               break
@@ -375,11 +373,7 @@ export default {
           req.save(this.formobj).then((resp) => {
             this.submitdisabled = false
             if (resp.success) {
-              this.$message({
-                showClose: true,
-                type: 'success',
-                message: resp.msg
-              })
+              this.$message({ showClose: true, type: 'success', message: resp.msg })
               this.handleReturn('true')
             }
           }).catch(() => {
@@ -397,11 +391,7 @@ export default {
           req.submitVehicleApply(this.formobj).then((resp) => {
             this.submitdisabled = false
             if (resp.success) {
-              this.$message({
-                showClose: true,
-                type: 'success',
-                message: resp.msg
-              })
+              this.$message({ showClose: true, type: 'success', message: resp.msg })
               this.handleReturn('true')
             }
           }).catch(() => {
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedInfo.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedInfo.vue
index b022f45521..60b4717d7b 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedInfo.vue
@@ -139,7 +139,9 @@ export default {
       this.viewTitle = '回款返利核对审核申请详情'
       console.log('编辑回显', row.sid)
       req.fetchDetailsBySid(row.sid).then((resp) => {
-        this.formobj = resp.data
+        if (resp.success) {
+          this.formobj = resp.data
+        }
       }).catch((e) => {
         this.formobj = row
       })
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue
index 0c6c4c251c..69c360f812 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue
@@ -188,7 +188,7 @@ export default {
     handleRebate() {
       if (this.formobj.scmCollectionRebateVehs.length !== 0) {
         for (var i = 0; i < this.formobj.scmCollectionRebateVehs.length; i++) {
-          this.formobj.scmCollectionRebateVehs[i].uploadMoney = parseFloat(this.formobj.scmCollectionRebateVehs[i].estimateRebate) / parseFloat(this.formobj.estimateRebate) * parseFloat(this.formobj.uploadMoney)
+          this.formobj.scmCollectionRebateVehs[i].uploadMoney = Math.round((parseFloat(this.formobj.scmCollectionRebateVehs[i].estimateRebate) / parseFloat(this.formobj.estimateRebate) * parseFloat(this.formobj.uploadMoney)) * 100) / 100
           this.formobj.scmCollectionRebateVehs[i].adjustmentMoney = parseFloat(this.formobj.scmCollectionRebateVehs[i].uploadMoney) - parseFloat(this.formobj.scmCollectionRebateVehs[i].estimateRebate)
         }
       }
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingAdd.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingAdd.vue
index 317ecdc5e9..df9fa7aeee 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingAdd.vue
@@ -177,23 +177,21 @@ export default {
       this.viewTitle = '【编辑】回款返利预提申请'
       console.log('编辑回显', row.sid)
       req.fetchBySid(row.sid).then((resp) => {
-        this.formobj = resp.data
-        this.formobj.instanceId = resp.data.procInstId
+        if (resp.success) {
+          this.formobj = resp.data
+          this.formobj.instanceId = resp.data.procInstId
+        }
       }).catch((e) => {
         this.formobj = row
       })
     },
     changeBrand(value) {
-      let bb = null
-      this.brand_list.forEach((e) => {
-        if (e.brandName === value) {
-          bb = {
-            name: e.brandName,
-            sid: e.sid
-          }
-        }
-      })
-      this.formobj.brandSid = bb.sid
+      const choose = this.brand_list.filter((item) => item.brandName === value)
+      if (choose !== null && choose.length > 0) {
+        this.formobj.brandSid = choose[0].sid
+      } else {
+        this.formobj.brandSid = ''
+      }
     },
     // 列表--选择
     handleSelect() {
@@ -215,9 +213,9 @@ export default {
         let v = 0
         for (var j in this.formobj.scmCollectionRebateWiths) {
           if (this.formobj.scmCollectionRebateWiths[j].collectionTypeValue === cval.collectionTypeValue && this.formobj.scmCollectionRebateWiths[j].calculationStandard === cval.calculationStandard) {
-            this.formobj.scmCollectionRebateWiths[j].collectionMoney = parseInt(this.formobj.scmCollectionRebateWiths[j].collectionMoney) + parseInt(cval.collectionMoney)
-            this.formobj.scmCollectionRebateWiths[j].freight = parseInt(this.formobj.scmCollectionRebateWiths[j].freight) + parseInt(cval.freight)
-            this.formobj.scmCollectionRebateWiths[j].estimateRebate = parseInt(this.formobj.scmCollectionRebateWiths[j].estimateRebate) + parseInt(cval.estimateRebate)
+            this.formobj.scmCollectionRebateWiths[j].collectionMoney = parseFloat(this.formobj.scmCollectionRebateWiths[j].collectionMoney !== '' ? this.formobj.scmCollectionRebateWiths[j].collectionMoney : 0) + parseFloat(cval.collectionMoney !== '' ? cval.collectionMoney : 0)
+            this.formobj.scmCollectionRebateWiths[j].freight = parseFloat(this.formobj.scmCollectionRebateWiths[j].freight !== '' ? this.formobj.scmCollectionRebateWiths[j].freight : 0) + parseFloat(cval.freight !== '' ? cval.freight : 0)
+            this.formobj.scmCollectionRebateWiths[j].estimateRebate = parseFloat(this.formobj.scmCollectionRebateWiths[j].estimateRebate !== '' ? this.formobj.scmCollectionRebateWiths[j].estimateRebate : 0) + parseFloat(cval.estimateRebate !== '' ? cval.estimateRebate : 0)
             this.formobj.scmCollectionRebateWiths[j].collectionRebateSids.push(cval.sid)
             v = 1
             break
@@ -255,9 +253,9 @@ export default {
           let v = 0
           for (var j in aa) {
             if (aa[j].collectionTypeValue === cval.collectionTypeValue && aa[j].calculationStandard === cval.calculationStandard) {
-              aa[j].collectionMoney = parseInt(aa[j].collectionMoney) + parseInt(cval.collectionMoney)
-              aa[j].freight = parseInt(aa[j].freight) + parseInt(cval.freight)
-              aa[j].estimateRebate = parseInt(aa[j].estimateRebate) + parseInt(cval.estimateRebate)
+              aa[j].collectionMoney = parseFloat(aa[j].collectionMoney !== '' ? aa[j].collectionMoney : 0) + parseFloat(cval.collectionMoney !== '' ? cval.collectionMoney : 0)
+              aa[j].freight = parseFloat(aa[j].freight !== '' ? aa[j].freight : 0) + parseFloat(cval.freight !== '' ? cval.freight : 0)
+              aa[j].estimateRebate = parseFloat(aa[j].estimateRebate !== '' ? aa[j].estimateRebate : 0) + parseFloat(cval.estimateRebate !== '' ? cval.estimateRebate : 0)
               aa[j].collectionRebateSids.push(cval.sid)
               v = 1
               break
@@ -311,11 +309,7 @@ export default {
           this.submitdisabled = true
           req.save(this.formobj).then((resp) => {
             if (resp.success) {
-              this.$message({
-                showClose: true,
-                type: 'success',
-                message: resp.msg
-              })
+              this.$message({ showClose: true, type: 'success', message: resp.msg })
               this.handleReturn('true')
             }
           }).catch(() => {
@@ -332,11 +326,7 @@ export default {
           this.submitdisabled = true
           req.submitVehicleApply(this.formobj).then((resp) => {
             if (resp.success) {
-              this.$message({
-                showClose: true,
-                type: 'success',
-                message: resp.msg
-              })
+              this.$message({ showClose: true, type: 'success', message: resp.msg })
               this.handleReturn('true')
             }
           }).catch(() => {
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingInfo.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingInfo.vue
index d96a789a6b..50c4d123e3 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingInfo.vue
@@ -129,7 +129,9 @@ export default {
       this.viewTitle = '回款返利预提申请详情'
       console.log('编辑回显', row.sid)
       req.fetchBySid(row.sid).then((resp) => {
-        this.formobj = resp.data
+        if (resp.success) {
+          this.formobj = resp.data
+        }
       }).catch((e) => {
         this.formobj = row
       })
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo.vue
index a2d74acc0b..dbd03695b6 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo.vue
@@ -211,7 +211,9 @@ export default {
       this.viewTitle = '回款返利核对审核申请详情'
       console.log('编辑回显', sid)
       req.fetchDetailsBySid(sid).then((resp) => {
-        this.formobj = resp.data
+        if (resp.success) {
+          this.formobj = resp.data
+        }
       }).catch((e) => {
         this.formobj = {}
       })
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiEdit.vue
index 6cef83964a..0ead5eac12 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiEdit.vue
@@ -201,23 +201,21 @@ export default {
       this.viewTitle = '【编辑】回款返利核对审核申请'
       console.log('编辑回显', sid)
       req.fetchDetailsBySid(sid).then((resp) => {
-        this.formobj = resp.data
-        this.formobj.instanceId = resp.data.procInstId
+        if (resp.success) {
+          this.formobj = resp.data
+          this.formobj.instanceId = resp.data.procInstId
+        }
       }).catch((e) => {
         this.formobj = {}
       })
     },
     changeBrand(value) {
-      let bb = null
-      this.brand_list.forEach((e) => {
-        if (e.brandName === value) {
-          bb = {
-            name: e.brandName,
-            sid: e.sid
-          }
-        }
-      })
-      this.formobj.brandSid = bb.sid
+      const choose = this.brand_list.filter((item) => item.brandName === value)
+      if (choose !== null && choose.length > 0) {
+        this.formobj.brandSid = choose[0].sid
+      } else {
+        this.formobj.brandSid = ''
+      }
     },
     // 明细表添加一行数据
     handleSelect() {
@@ -239,10 +237,10 @@ export default {
           let v = 0
           for (var j in this.formobj.scmWhenCollectionrebateCheckapplydetailDetails) {
             if (this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionTypeValue === cval.collectionTypeValue) {
-              this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionMoney = parseInt(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionMoney) + parseInt(cval.collectionMoney)
-              this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].estimateRebate = parseInt(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].estimateRebate) + parseInt(cval.estimateRebate)
-              this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].uploadMoney = parseInt(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].uploadMoney) + parseInt(cval.uploadMoney)
-              this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].adjustmentMoney = parseInt(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].adjustmentMoney) + parseInt(cval.adjustmentMoney)
+              this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionMoney = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionMoney) + parseFloat(cval.collectionMoney)
+              this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].estimateRebate = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].estimateRebate) + parseFloat(cval.estimateRebate)
+              this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].uploadMoney = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].uploadMoney) + parseFloat(cval.uploadMoney)
+              this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].adjustmentMoney = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].adjustmentMoney) + parseFloat(cval.adjustmentMoney)
               this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionRebateSids.push(cval.sid)
               v = 1
               break
@@ -274,10 +272,10 @@ export default {
           let v = 0
           for (var l in this.formobj.scmLastCollectionrebateCheckapplydetailDetails) {
             if (this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].withholdingDate === bval.withholdingDate) {
-              this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionMoney = parseInt(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionMoney) + parseInt(bval.collectionMoney)
-              this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate = parseInt(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate) + parseInt(bval.estimateRebate)
-              this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney = parseInt(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney) + parseInt(bval.uploadMoney)
-              this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney = parseInt(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney) + parseInt(bval.adjustmentMoney)
+              this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionMoney = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionMoney) + parseFloat(bval.collectionMoney)
+              this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate) + parseFloat(bval.estimateRebate)
+              this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney) + parseFloat(bval.uploadMoney)
+              this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney) + parseFloat(bval.adjustmentMoney)
               this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionRebateSids.push(bval.sid)
               v = 1
               break
@@ -312,10 +310,10 @@ export default {
           let v = 0
           for (var j in aa) {
             if (aa[j].collectionTypeValue === cval.collectionTypeValue) {
-              aa[j].estimateRebate = parseInt(aa[j].estimateRebate) + parseInt(cval.estimateRebate)
-              aa[j].collectionMoney = parseInt(aa[j].collectionMoney) + parseInt(cval.collectionMoney)
-              aa[j].uploadMoney = parseInt(aa[j].uploadMoney) + parseInt(cval.uploadMoney)
-              aa[j].adjustmentMoney = parseInt(aa[j].adjustmentMoney) + parseInt(cval.adjustmentMoney)
+              aa[j].estimateRebate = parseFloat(aa[j].estimateRebate) + parseFloat(cval.estimateRebate)
+              aa[j].collectionMoney = parseFloat(aa[j].collectionMoney) + parseFloat(cval.collectionMoney)
+              aa[j].uploadMoney = parseFloat(aa[j].uploadMoney) + parseFloat(cval.uploadMoney)
+              aa[j].adjustmentMoney = parseFloat(aa[j].adjustmentMoney) + parseFloat(cval.adjustmentMoney)
               aa[j].collectionRebateSids.push(cval.sid)
               v = 1
               break
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiYiBanInfo.vue
index 049deafd5e..c43ae200db 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiYiBanInfo.vue
@@ -175,7 +175,9 @@ export default {
       this.viewTitle = '回款返利核对审核申请详情'
       console.log('编辑回显', sid)
       req.fetchDetailsBySid(sid).then((resp) => {
-        this.formobj = resp.data
+        if (resp.success) {
+          this.formobj = resp.data
+        }
       }).catch((e) => {
         this.formobj = {}
       })
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiDanBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiDanBanInfo.vue
index 146190c469..ae9c230fc3 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiDanBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiDanBanInfo.vue
@@ -202,7 +202,9 @@ export default {
       this.viewTitle = '回款返利预提申请详情'
       console.log('编辑回显', sid)
       req.fetchBySid(sid).then((resp) => {
-        this.formobj = resp.data
+        if (resp.success) {
+          this.formobj = resp.data
+        }
       }).catch((e) => {
         this.formobj = {}
       })
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiEdit.vue
index 7949bd7288..6b1ef4fee8 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiEdit.vue
@@ -173,23 +173,21 @@ export default {
       this.viewTitle = '【编辑】回款返利预提申请'
       console.log('编辑回显', sid)
       req.fetchBySid(sid).then((resp) => {
-        this.formobj = resp.data
-        this.formobj.instanceId = resp.data.procInstId
+        if (resp.success) {
+          this.formobj = resp.data
+          this.formobj.instanceId = resp.data.procInstId
+        }
       }).catch((e) => {
         this.formobj = {}
       })
     },
     changeBrand(value) {
-      let bb = null
-      this.brand_list.forEach((e) => {
-        if (e.brandName === value) {
-          bb = {
-            name: e.brandName,
-            sid: e.sid
-          }
-        }
-      })
-      this.formobj.brandSid = bb.sid
+      const choose = this.brand_list.filter((item) => item.brandName === value)
+      if (choose !== null && choose.length > 0) {
+        this.formobj.brandSid = choose[0].sid
+      } else {
+        this.formobj.brandSid = ''
+      }
     },
     // 列表--选择
     handleSelect() {
@@ -211,9 +209,9 @@ export default {
         let v = 0
         for (var j in this.formobj.scmCollectionRebateWiths) {
           if (this.formobj.scmCollectionRebateWiths[j].collectionTypeValue === cval.collectionTypeValue) {
-            this.formobj.scmCollectionRebateWiths[j].collectionMoney = parseInt(this.formobj.scmCollectionRebateWiths[j].collectionMoney) + parseInt(cval.collectionMoney)
-            this.formobj.scmCollectionRebateWiths[j].freight = parseInt(this.formobj.scmCollectionRebateWiths[j].freight) + parseInt(cval.freight)
-            this.formobj.scmCollectionRebateWiths[j].estimateRebate = parseInt(this.formobj.scmCollectionRebateWiths[j].estimateRebate) + parseInt(cval.estimateRebate)
+            this.formobj.scmCollectionRebateWiths[j].collectionMoney = parseFloat(this.formobj.scmCollectionRebateWiths[j].collectionMoney !== '' ? this.formobj.scmCollectionRebateWiths[j].collectionMoney : 0) + parseFloat(cval.collectionMoney !== '' ? cval.collectionMoney : 0)
+            this.formobj.scmCollectionRebateWiths[j].freight = parseFloat(this.formobj.scmCollectionRebateWiths[j].freight !== '' ? this.formobj.scmCollectionRebateWiths[j].freight : 0) + parseFloat(cval.freight !== '' ? cval.freight : 0)
+            this.formobj.scmCollectionRebateWiths[j].estimateRebate = parseFloat(this.formobj.scmCollectionRebateWiths[j].estimateRebate !== '' ? this.formobj.scmCollectionRebateWiths[j].estimateRebate : 0) + parseFloat(cval.estimateRebate !== '' ? cval.estimateRebate : 0)
             this.formobj.scmCollectionRebateWiths[j].collectionRebateSids.push(cval.sid)
             v = 1
             break
@@ -251,9 +249,9 @@ export default {
           let v = 0
           for (var j in aa) {
             if (aa[j].collectionTypeValue === cval.collectionTypeValue) {
-              aa[j].collectionMoney = parseInt(aa[j].collectionMoney) + parseInt(cval.collectionMoney)
-              aa[j].freight = parseInt(aa[j].freight) + parseInt(cval.freight)
-              aa[j].estimateRebate = parseInt(aa[j].estimateRebate) + parseInt(cval.estimateRebate)
+              aa[j].collectionMoney = parseFloat(aa[j].collectionMoney !== '' ? aa[j].collectionMoney : 0) + parseFloat(cval.collectionMoney !== '' ? cval.collectionMoney : 0)
+              aa[j].freight = parseFloat(aa[j].freight !== '' ? aa[j].freight : 0) + parseFloat(cval.freight !== '' ? cval.freight : 0)
+              aa[j].estimateRebate = parseFloat(aa[j].estimateRebate !== '' ? aa[j].estimateRebate : 0) + parseFloat(cval.estimateRebate !== '' ? cval.estimateRebate : 0)
               aa[j].collectionRebateSids.push(cval.sid)
               v = 1
               break
@@ -307,11 +305,7 @@ export default {
           this.submitdisabled = true
           req.save(this.formobj).then((resp) => {
             if (resp.success) {
-              this.$message({
-                showClose: true,
-                type: 'success',
-                message: resp.msg
-              })
+              this.$message({ showClose: true, type: 'success', message: resp.msg })
               // 子页面向父级页面传递值(关闭弹框)
               window.parent.postMessage({
                 cmd: 'returnHeight',
@@ -335,11 +329,7 @@ export default {
           this.submitdisabled = true
           req.submitVehicleApply(this.formobj).then((resp) => {
             if (resp.success) {
-              this.$message({
-                showClose: true,
-                type: 'success',
-                message: resp.msg
-              })
+              this.$message({ showClose: true, type: 'success', message: resp.msg })
               // 子页面向父级页面传递值(关闭弹框)
               window.parent.postMessage({
                 cmd: 'returnHeight',
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiYiBanInfo.vue
index b36a4894cd..c19d2e7fb9 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiYiBanInfo.vue
@@ -165,7 +165,9 @@ export default {
       this.viewTitle = '回款返利预提申请详情'
       console.log('编辑回显', sid)
       req.fetchBySid(sid).then((resp) => {
-        this.formobj = resp.data
+        if (resp.success) {
+          this.formobj = resp.data
+        }
       }).catch((e) => {
         this.formobj = {}
       })