diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index 3493bf2437..ea57235a15 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -6116,8 +6116,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 dto.setFinSourceKey(busSalesOrder.getFinancePlan());
                 SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(busSalesOrder.getSid()).getData();
                 if (loanSolutions != null) {
-                    //2三方金融、3自营非担保
-                    dto.setFinSourceKey(StringUtils.isNotBlank(loanSolutions.getTypeKey()) ? "3" : "2");
+                    if (StringUtils.isNotBlank(loanSolutions.getTypeKey())) {
+                        if ("02".equals(loanSolutions.getTypeKey())) {
+                            dto.setFinSourceKey("2");//三方金融
+                        } else {
+                            dto.setFinSourceKey("3");//自营非担保
+                        }
+                    }
                 }
             } else {
                 dto.setFinSourceKey(busSalesOrder.getFinancePlan());
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/syspost/SysPostService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/syspost/SysPostService.java
index 153abcda91..fbedaae3ff 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/syspost/SysPostService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/syspost/SysPostService.java
@@ -15,6 +15,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -150,6 +151,7 @@ public class SysPostService extends MybatisBaseService<SysPostMapper, SysPost> {
             qw.like("post.name", name);
         }
         List<SysPostAllVo> list = baseMapper.getAllPost(qw);
-        return null;
+        list.removeAll(Collections.singleton(null));
+        return rb.success().setData(list);
     }
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java
index 9d2fb586f1..d1a4122d6f 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java
@@ -52,33 +52,33 @@ import java.math.BigDecimal;
 public class ScmSpecialRebate extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-	@ApiModelProperty("品牌sid")
+    @ApiModelProperty("品牌sid")
     private String brandSid; // 品牌sid
-	@ApiModelProperty("品牌名称")
+    @ApiModelProperty("品牌名称")
     private String brandName; // 品牌名称
-	@ApiModelProperty("返利类型key")
+    @ApiModelProperty("返利类型key")
     private String rebateTypeKey; // 返利类型key
-	@ApiModelProperty("返利类型value")
+    @ApiModelProperty("返利类型value")
     private String rebateTypeValue; // 返利类型value
-	@ApiModelProperty("返利名称")
+    @ApiModelProperty("返利名称")
     private String rebateName; // 返利名称
-	@ApiModelProperty("预计返利")
+    @ApiModelProperty("预计返利")
     private String estimateRebate; // 预计返利
-	@ApiModelProperty("预提日期")
+    @ApiModelProperty("预提日期")
     private String withholdingDate; // 预提日期
-	@ApiModelProperty("上传日期")
+    @ApiModelProperty("上传日期")
     private String uploadDate; // 上传日期
-	@ApiModelProperty("上传金额")
+    @ApiModelProperty("上传金额")
     private String uploadMoney; // 上传金额
-	@ApiModelProperty("二次上传日期")
+    @ApiModelProperty("二次上传日期")
     private String secondaryUploadDate; // 二次上传日期
-	@ApiModelProperty("二次上传金额")
+    @ApiModelProperty("二次上传金额")
     private String secondaryUploadMoney; // 二次上传金额
-	@ApiModelProperty("是否调整")
+    @ApiModelProperty("是否调整")
     private String isAdjustment; // 是否调整
-	@ApiModelProperty("调整金额")
+    @ApiModelProperty("调整金额")
     private String adjustmentMoney; // 调整金额
-	@ApiModelProperty("调整说明")
+    @ApiModelProperty("调整说明")
     private String adjustmentRemarks; // 调整说明
     @ApiModelProperty("调整状态")
     private Integer adjustmentState;
@@ -129,13 +129,13 @@ public class ScmSpecialRebate extends BaseEntity {
     @ApiModelProperty("二次抵顶费用说明")
     private String secondSuppRemark;
 
-	@ApiModelProperty("使用组织sid")
+    @ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
-	@ApiModelProperty("使用组织名称")
+    @ApiModelProperty("使用组织名称")
     private String useOrgName; // 使用组织名称
-	@ApiModelProperty("创建组织sid")
+    @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
-	@ApiModelProperty("创建组织名称")
+    @ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
     @ApiModelProperty("组织全路径")
     private String orgPath;
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml
index a3e2c945eb..ae4c93b518 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml
@@ -30,7 +30,7 @@
                GROUP_CONCAT(svc.vehRebateSid)                                                       vehRebateSid,
                SUM(svc.uploadMoney)                                                                 uploadMoney,
                SUM(svc.stayDetermineMoney)                                                          stayDetermineMoney,
-               SUM(svc.adjustmentMoney)                                                             adjustmentMoney,
+               SUM(CAST(svc.adjustmentMoney AS DECIMAL(10, 2)))                                     adjustmentMoney,
                SUM(svc.expectTreatCost + svc.expectSuppCost)                                        withholdCost,
                SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) money,
                SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) -
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue
index e89aaafa3a..6e0a686694 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue
@@ -223,20 +223,20 @@ export default {
       // 按照返利类型统计
       list.forEach((e) => {
         let v = 0
-        for (var i in this.formobj.scmWhenSpecialrebateCheckapplydetailDetails) {
-          if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].brandName === e.brandName) {
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num) + parseFloat(1)
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].specialRebateSids.push(e.sid)
+        this.formobj.scmWhenSpecialrebateCheckapplydetailDetails.forEach((i) => {
+          if (i.rebateTypeValue === e.rebateTypeValue && i.purchaseSystemName === e.purchaseSystemName && i.brandName === e.brandName) {
+            i.num = parseFloat(i.num) + parseFloat(1)
+            i.withRebate = Math.round((parseFloat(i.withRebate !== '' ? i.withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
+            i.withholdCost = Math.round((parseFloat(i.withholdCost !== '' ? i.withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
+            i.uploadMoney = Math.round((parseFloat(i.uploadMoney !== '' ? i.uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
+            i.stayDetermineMoney = Math.round((parseFloat(i.stayDetermineMoney !== '' ? i.stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
+            i.adjustmentMoney = Math.round((parseFloat(i.adjustmentMoney !== '' ? i.adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
+            i.money = Math.round((parseFloat(i.money !== '' ? i.money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
+            i.fyAdjustmentMoney = Math.round((parseFloat(i.fyAdjustmentMoney !== '' ? i.fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100
+            i.specialRebateSids.push(e.sid)
             v = 1
-            break
           }
-        }
+        })
         if (v === 0) {
           // 第一次对比没有参照，放入参照物
           this.formobj.scmWhenSpecialrebateCheckapplydetailDetails.push({
@@ -253,7 +253,7 @@ export default {
             stayDetermineMoney: e.stayDetermineMoney,
             adjustmentMoney: e.adjustmentMoney,
             money: e.money,
-            fyAdjustmentMoney: '',
+            fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
             specialRebateSids: [e.sid],
             sid: '',
             mainSid: ''
@@ -263,20 +263,20 @@ export default {
       // 按照预提年月统计
       list.forEach((s) => {
         let k = 0
-        for (var l in this.formobj.scmLastSpecialrebateCheckapplydetailDetails) {
-          if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].brandName === s.brandName) {
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num) + parseFloat(1)
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].specialRebateSids.push(s.sid)
+        this.formobj.scmLastSpecialrebateCheckapplydetailDetails.forEach((l) => {
+          if (l.withholdingDate === s.withholdingDate && l.purchaseSystemName === s.purchaseSystemName && l.brandName === s.brandName) {
+            l.num = parseFloat(l.num) + parseFloat(1)
+            l.withRebate = Math.round((parseFloat(l.withRebate !== '' ? l.withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
+            l.withholdCost = Math.round((parseFloat(l.withholdCost !== '' ? l.withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
+            l.uploadMoney = Math.round((parseFloat(l.uploadMoney !== '' ? l.uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
+            l.stayDetermineMoney = Math.round((parseFloat(l.stayDetermineMoney !== '' ? l.stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
+            l.adjustmentMoney = Math.round((parseFloat(l.adjustmentMoney !== '' ? l.adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
+            l.money = Math.round((parseFloat(l.money !== '' ? l.money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
+            l.fyAdjustmentMoney = Math.round((parseFloat(l.fyAdjustmentMoney !== '' ? l.fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100
+            l.specialRebateSids.push(s.sid)
             k = 1
-            break
           }
-        }
+        })
         if (k === 0) {
           this.formobj.scmLastSpecialrebateCheckapplydetailDetails.push({
             withholdingDate: s.withholdingDate,
@@ -291,19 +291,13 @@ export default {
             stayDetermineMoney: s.stayDetermineMoney,
             adjustmentMoney: s.adjustmentMoney,
             money: s.money,
-            fyAdjustmentMoney: '',
+            fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
             specialRebateSids: [s.sid],
             sid: '',
             mainSid: ''
           })
         }
       })
-      this.formobj.scmWhenSpecialrebateCheckapplydetailDetails.forEach((p) => {
-        p.fyAdjustmentMoney = Math.round((parseFloat(p.money !== '' ? p.money : 0) - parseFloat(p.withholdCost !== '' ? p.withholdCost : 0)) * 100) / 100
-      })
-      this.formobj.scmLastSpecialrebateCheckapplydetailDetails.forEach((q) => {
-        q.fyAdjustmentMoney = Math.round((parseFloat(q.money !== '' ? q.money : 0) - parseFloat(q.withholdCost !== '' ? q.withholdCost : 0)) * 100) / 100
-      })
     },
     // 明细表删除一行数据
     dataDelete(index) {
@@ -331,20 +325,20 @@ export default {
       // 按照返利类型统计
       this.formobj.scmSpecialrebateCheckapplydetailDetails.forEach((e) => {
         let v = 0
-        for (var i in this.formobj.scmWhenSpecialrebateCheckapplydetailDetails) {
-          if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].brandName === e.brandName) {
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num) + parseFloat(1)
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].specialRebateSids.push(e.sid)
+        this.formobj.scmWhenSpecialrebateCheckapplydetailDetails.forEach((i) => {
+          if (i.rebateTypeValue === e.rebateTypeValue && i.purchaseSystemName === e.purchaseSystemName && i.brandName === e.brandName) {
+            i.num = parseFloat(i.num) + parseFloat(1)
+            i.withRebate = Math.round((parseFloat(i.withRebate !== '' ? i.withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
+            i.withholdCost = Math.round((parseFloat(i.withholdCost !== '' ? i.withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
+            i.uploadMoney = Math.round((parseFloat(i.uploadMoney !== '' ? i.uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
+            i.stayDetermineMoney = Math.round((parseFloat(i.stayDetermineMoney !== '' ? i.stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
+            i.adjustmentMoney = Math.round((parseFloat(i.adjustmentMoney !== '' ? i.adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
+            i.money = Math.round((parseFloat(i.money !== '' ? i.money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
+            i.fyAdjustmentMoney = Math.round((parseFloat(i.fyAdjustmentMoney !== '' ? i.fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100
+            i.specialRebateSids.push(e.sid)
             v = 1
-            break
           }
-        }
+        })
         if (v === 0) {
           // 第一次对比没有参照，放入参照物
           this.formobj.scmWhenSpecialrebateCheckapplydetailDetails.push({
@@ -361,7 +355,7 @@ export default {
             stayDetermineMoney: e.stayDetermineMoney,
             adjustmentMoney: e.adjustmentMoney,
             money: e.money,
-            fyAdjustmentMoney: '',
+            fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
             specialRebateSids: [e.sid],
             sid: '',
             mainSid: ''
@@ -371,20 +365,20 @@ export default {
       // 按照预提年月统计
       this.formobj.scmSpecialrebateCheckapplydetailDetails.forEach((s) => {
         let k = 0
-        for (var l in this.formobj.scmLastSpecialrebateCheckapplydetailDetails) {
-          if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].brandName === s.brandName) {
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num) + parseFloat(1)
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].specialRebateSids.push(s.sid)
+        this.formobj.scmLastSpecialrebateCheckapplydetailDetails.forEach((l) => {
+          if (l.withholdingDate === s.withholdingDate && l.purchaseSystemName === s.purchaseSystemName && l.brandName === s.brandName) {
+            l.num = parseFloat(l.num) + parseFloat(1)
+            l.withRebate = Math.round((parseFloat(l.withRebate !== '' ? l.withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
+            l.withholdCost = Math.round((parseFloat(l.withholdCost !== '' ? l.withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
+            l.uploadMoney = Math.round((parseFloat(l.uploadMoney !== '' ? l.uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
+            l.stayDetermineMoney = Math.round((parseFloat(l.stayDetermineMoney !== '' ? l.stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
+            l.adjustmentMoney = Math.round((parseFloat(l.adjustmentMoney !== '' ? l.adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
+            l.money = Math.round((parseFloat(l.money !== '' ? l.money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
+            l.fyAdjustmentMoney = Math.round((parseFloat(l.fyAdjustmentMoney !== '' ? l.fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100
+            l.specialRebateSids.push(s.sid)
             k = 1
-            break
           }
-        }
+        })
         if (k === 0) {
           this.formobj.scmLastSpecialrebateCheckapplydetailDetails.push({
             withholdingDate: s.withholdingDate,
@@ -399,23 +393,13 @@ export default {
             stayDetermineMoney: s.stayDetermineMoney,
             adjustmentMoney: s.adjustmentMoney,
             money: s.money,
-            fyAdjustmentMoney: '',
+            fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
             specialRebateSids: [s.sid],
             sid: '',
             mainSid: ''
           })
         }
       })
-      if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails.length > 0) {
-        this.formobj.scmWhenSpecialrebateCheckapplydetailDetails.forEach((p) => {
-          p.fyAdjustmentMoney = Math.round((parseFloat(p.money !== '' ? p.money : 0) - parseFloat(p.withholdCost !== '' ? p.withholdCost : 0)) * 100) / 100
-        })
-      }
-      if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails.length > 0) {
-        this.formobj.scmLastSpecialrebateCheckapplydetailDetails.forEach((q) => {
-          q.fyAdjustmentMoney = Math.round((parseFloat(q.money !== '' ? q.money : 0) - parseFloat(q.withholdCost !== '' ? q.withholdCost : 0)) * 100) / 100
-        })
-      }
     },
     resetState() {
       this.viewState = 1
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue
index c6ebc48d73..633cc86a25 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue
@@ -190,20 +190,20 @@ export default {
       // 按照返利类型统计
       list.forEach((e) => {
         let v = 0
-        for (var i in this.formobj.scmWhenSpecialrebateCheckapplydetailDetails) {
-          if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].brandName === e.brandName) {
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num) + parseFloat(1)
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].specialRebateSids.push(e.sid)
+        this.formobj.scmWhenSpecialrebateCheckapplydetailDetails.forEach((i) => {
+          if (i.rebateTypeValue === e.rebateTypeValue && i.purchaseSystemName === e.purchaseSystemName && i.brandName === e.brandName) {
+            i.num = parseFloat(i.num) + parseFloat(1)
+            i.withRebate = Math.round((parseFloat(i.withRebate !== '' ? i.withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
+            i.withholdCost = Math.round((parseFloat(i.withholdCost !== '' ? i.withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
+            i.uploadMoney = Math.round((parseFloat(i.uploadMoney !== '' ? i.uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
+            i.stayDetermineMoney = Math.round((parseFloat(i.stayDetermineMoney !== '' ? i.stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
+            i.adjustmentMoney = Math.round((parseFloat(i.adjustmentMoney !== '' ? i.adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
+            i.money = Math.round((parseFloat(i.money !== '' ? i.money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
+            i.fyAdjustmentMoney = Math.round((parseFloat(i.fyAdjustmentMoney !== '' ? i.fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100
+            i.specialRebateSids.push(e.sid)
             v = 1
-            break
           }
-        }
+        })
         if (v === 0) {
           // 第一次对比没有参照，放入参照物
           this.formobj.scmWhenSpecialrebateCheckapplydetailDetails.push({
@@ -220,7 +220,7 @@ export default {
             stayDetermineMoney: e.stayDetermineMoney,
             adjustmentMoney: e.adjustmentMoney,
             money: e.money,
-            fyAdjustmentMoney: '',
+            fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
             specialRebateSids: [e.sid],
             sid: '',
             mainSid: ''
@@ -230,20 +230,20 @@ export default {
       // 按照预提年月统计
       list.forEach((s) => {
         let k = 0
-        for (var l in this.formobj.scmLastSpecialrebateCheckapplydetailDetails) {
-          if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].brandName === s.brandName) {
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num) + parseFloat(1)
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].specialRebateSids.push(s.sid)
+        this.formobj.scmLastSpecialrebateCheckapplydetailDetails.forEach((l) => {
+          if (l.withholdingDate === s.withholdingDate && l.purchaseSystemName === s.purchaseSystemName && l.brandName === s.brandName) {
+            l.num = parseFloat(l.num) + parseFloat(1)
+            l.withRebate = Math.round((parseFloat(l.withRebate !== '' ? l.withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
+            l.withholdCost = Math.round((parseFloat(l.withholdCost !== '' ? l.withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
+            l.uploadMoney = Math.round((parseFloat(l.uploadMoney !== '' ? l.uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
+            l.stayDetermineMoney = Math.round((parseFloat(l.stayDetermineMoney !== '' ? l.stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
+            l.adjustmentMoney = Math.round((parseFloat(l.adjustmentMoney !== '' ? l.adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
+            l.money = Math.round((parseFloat(l.money !== '' ? l.money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
+            l.fyAdjustmentMoney = Math.round((parseFloat(l.fyAdjustmentMoney !== '' ? l.fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100
+            l.specialRebateSids.push(s.sid)
             k = 1
-            break
           }
-        }
+        })
         if (k === 0) {
           this.formobj.scmLastSpecialrebateCheckapplydetailDetails.push({
             withholdingDate: s.withholdingDate,
@@ -258,19 +258,13 @@ export default {
             stayDetermineMoney: s.stayDetermineMoney,
             adjustmentMoney: s.adjustmentMoney,
             money: s.money,
-            fyAdjustmentMoney: '',
+            fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
             specialRebateSids: [s.sid],
             sid: '',
             mainSid: ''
           })
         }
       })
-      this.formobj.scmWhenSpecialrebateCheckapplydetailDetails.forEach((p) => {
-        p.fyAdjustmentMoney = Math.round((parseFloat(p.money !== '' ? p.money : 0) - parseFloat(p.withholdCost !== '' ? p.withholdCost : 0)) * 100) / 100
-      })
-      this.formobj.scmLastSpecialrebateCheckapplydetailDetails.forEach((q) => {
-        q.fyAdjustmentMoney = Math.round((parseFloat(q.money !== '' ? q.money : 0) - parseFloat(q.withholdCost !== '' ? q.withholdCost : 0)) * 100) / 100
-      })
     },
     // 明细表删除一行数据
     dataDelete(index) {
@@ -298,20 +292,20 @@ export default {
       // 按照返利类型统计
       this.formobj.scmSpecialrebateCheckapplydetailDetails.forEach((e) => {
         let v = 0
-        for (var i in this.formobj.scmWhenSpecialrebateCheckapplydetailDetails) {
-          if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].brandName === e.brandName) {
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num) + parseFloat(1)
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].specialRebateSids.push(e.sid)
+        this.formobj.scmWhenSpecialrebateCheckapplydetailDetails.forEach((i) => {
+          if (i.rebateTypeValue === e.rebateTypeValue && i.purchaseSystemName === e.purchaseSystemName && i.brandName === e.brandName) {
+            i.num = parseFloat(i.num) + parseFloat(1)
+            i.withRebate = Math.round((parseFloat(i.withRebate !== '' ? i.withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
+            i.withholdCost = Math.round((parseFloat(i.withholdCost !== '' ? i.withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
+            i.uploadMoney = Math.round((parseFloat(i.uploadMoney !== '' ? i.uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
+            i.stayDetermineMoney = Math.round((parseFloat(i.stayDetermineMoney !== '' ? i.stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
+            i.adjustmentMoney = Math.round((parseFloat(i.adjustmentMoney !== '' ? i.adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
+            i.money = Math.round((parseFloat(i.money !== '' ? i.money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
+            i.fyAdjustmentMoney = Math.round((parseFloat(i.fyAdjustmentMoney !== '' ? i.fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100
+            i.specialRebateSids.push(e.sid)
             v = 1
-            break
           }
-        }
+        })
         if (v === 0) {
           // 第一次对比没有参照，放入参照物
           this.formobj.scmWhenSpecialrebateCheckapplydetailDetails.push({
@@ -328,7 +322,7 @@ export default {
             stayDetermineMoney: e.stayDetermineMoney,
             adjustmentMoney: e.adjustmentMoney,
             money: e.money,
-            fyAdjustmentMoney: '',
+            fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
             specialRebateSids: [e.sid],
             sid: '',
             mainSid: ''
@@ -338,20 +332,20 @@ export default {
       // 按照预提年月统计
       this.formobj.scmSpecialrebateCheckapplydetailDetails.forEach((s) => {
         let k = 0
-        for (var l in this.formobj.scmLastSpecialrebateCheckapplydetailDetails) {
-          if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].brandName === s.brandName) {
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num) + parseFloat(1)
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].specialRebateSids.push(s.sid)
+        this.formobj.scmLastSpecialrebateCheckapplydetailDetails.forEach((l) => {
+          if (l.withholdingDate === s.withholdingDate && l.purchaseSystemName === s.purchaseSystemName && l.brandName === s.brandName) {
+            l.num = parseFloat(l.num) + parseFloat(1)
+            l.withRebate = Math.round((parseFloat(l.withRebate !== '' ? l.withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
+            l.withholdCost = Math.round((parseFloat(l.withholdCost !== '' ? l.withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
+            l.uploadMoney = Math.round((parseFloat(l.uploadMoney !== '' ? l.uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
+            l.stayDetermineMoney = Math.round((parseFloat(l.stayDetermineMoney !== '' ? l.stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
+            l.adjustmentMoney = Math.round((parseFloat(l.adjustmentMoney !== '' ? l.adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
+            l.money = Math.round((parseFloat(l.money !== '' ? l.money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
+            l.fyAdjustmentMoney = Math.round((parseFloat(l.fyAdjustmentMoney !== '' ? l.fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100
+            l.specialRebateSids.push(s.sid)
             k = 1
-            break
           }
-        }
+        })
         if (k === 0) {
           this.formobj.scmLastSpecialrebateCheckapplydetailDetails.push({
             withholdingDate: s.withholdingDate,
@@ -366,23 +360,13 @@ export default {
             stayDetermineMoney: s.stayDetermineMoney,
             adjustmentMoney: s.adjustmentMoney,
             money: s.money,
-            fyAdjustmentMoney: '',
+            fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
             specialRebateSids: [s.sid],
             sid: '',
             mainSid: ''
           })
         }
       })
-      if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails.length > 0) {
-        this.formobj.scmWhenSpecialrebateCheckapplydetailDetails.forEach((p) => {
-          p.fyAdjustmentMoney = Math.round((parseFloat(p.money !== '' ? p.money : 0) - parseFloat(p.withholdCost !== '' ? p.withholdCost : 0)) * 100) / 100
-        })
-      }
-      if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails.length > 0) {
-        this.formobj.scmLastSpecialrebateCheckapplydetailDetails.forEach((q) => {
-          q.fyAdjustmentMoney = Math.round((parseFloat(q.money !== '' ? q.money : 0) - parseFloat(q.withholdCost !== '' ? q.withholdCost : 0)) * 100) / 100
-        })
-      }
     },
     resetState() {
       this.viewState = 1