Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java

@@ -659,7 +659,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                 if (StringUtils.isNotBlank(voucherDetail.getManufacturer())) {
                     manufacturer = voucherDetail.getManufacturer();
                 }
-                if (!voucherDetail.getType().equals("行销活动")) {
+                if (!voucherDetail.getType().equals("行销政策")) {
                     if (voucherDetail.getRemarks().equals("返利上传")) {
                         if (voucherDetail.getSceneCode().equals("1161.01.16")) {
                             cjfl = cjfl.add(voucherDetail.getAmount());

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);
     }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java

@@ -473,8 +473,8 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
             String finalSummaryTag = summaryTag;
             String[] split = finalSummaryTag.split("年");
             String y1 = split[0]; //预提申请标题年份
-            map.forEach((k, v) -> {
+            for (Map.Entry<String, List<ScmSpecialRebate>> entry : map.entrySet()) {
-                List<ScmSpecialRebate> rebates = v;
+                List<ScmSpecialRebate> v = entry.getValue();
                 GeneralVoucher generalVoucher = new GeneralVoucher();
                 generalVoucher.setBussDate(format);
                 List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
@@ -511,7 +511,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                                 }
                             }
                         }
-                        if (!rebate.getRebateTypeValue().equals("行销活动")) {
+                        if (!rebate.getRebateTypeValue().equals("行销政策")) {
                             if (onceState.intValue() == 2 || tag.equals("1")) {
                                 //没有进行过核对申请
                                 BigDecimal oneMoney = BigDecimal.ZERO;//一次上传金额
@@ -634,7 +634,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                                     BigDecimal daizhifuchaMoney = BigDecimal.ZERO;//待支付差额
                                     BigDecimal yingshouMoney = BigDecimal.ZERO;//应收返利
                                     if (StringUtils.isNotBlank(rebate.getAdjustmentMoney())) {
-                                         adMoney = new BigDecimal(rebate.getAdjustmentMoney());
+                                        adMoney = new BigDecimal(rebate.getAdjustmentMoney());
                                     }
                                     if (null != rebate.getOnceTreatCost()) {
                                         daizhifuchaMoney = daizhifuchaMoney.add(rebate.getOnceTreatCost());
@@ -710,7 +710,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                                 feiyong = oneMoney.subtract(yicidaizhifu).subtract(yizhichufeiyong).subtract(yicididing);
                                 if (oneMoney.compareTo(BigDecimal.ZERO) != 0) {
                                     GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
-                                    voucherDetail.setType("行销活动");
+                                    voucherDetail.setType("行销政策");
                                     voucherDetail.setTimeFlag(finalSummaryTag);
                                     voucherDetail.setSceneCode("1161.01.16");
                                     voucherDetail.setDeptCode(deptCode); //部门编码赋值
@@ -721,7 +721,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                                 }
                                 if (yicidaizhifu.compareTo(BigDecimal.ZERO) != 0) {
                                     GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
-                                    voucherDetail.setType("行销活动");
+                                    voucherDetail.setType("行销政策");
                                     voucherDetail.setTimeFlag(finalSummaryTag);
                                     voucherDetail.setCustomerCode("DZFCJFL");
                                     voucherDetail.setSceneCode("2181.07.00");
@@ -733,7 +733,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                                 if (yizhichufeiyong.compareTo(BigDecimal.ZERO) != 0) {
                                     GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
                                     voucherDetail.setTimeFlag(finalSummaryTag);
-                                    voucherDetail.setType("行销活动");
+                                    voucherDetail.setType("行销政策");
                                     voucherDetail.setDeptCode(deptCode); //部门编码赋值
                                     voucherDetail.setManufacturer(gysCode);
                                     voucherDetail.setAmount(yizhichufeiyong);
@@ -744,7 +744,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                                 if (yicididing.compareTo(BigDecimal.ZERO) != 0) {
                                     GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
                                     voucherDetail.setTimeFlag(finalSummaryTag);
-                                    voucherDetail.setType("行销活动");
+                                    voucherDetail.setType("行销政策");
                                     voucherDetail.setDeptCode(deptCode); //部门编码赋值
                                     voucherDetail.setManufacturer(gysCode);
                                     voucherDetail.setAmount(yicididing);
@@ -755,7 +755,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                                 if (feiyong.compareTo(BigDecimal.ZERO) != 0) {
                                     GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
                                     voucherDetail.setTimeFlag(finalSummaryTag);
-                                    voucherDetail.setType("行销活动");
+                                    voucherDetail.setType("行销政策");
                                     voucherDetail.setDeptCode(deptCode); //部门编码赋值
                                     voucherDetail.setAmount(feiyong);
                                     voucherDetail.setSceneCode("6401.14");
@@ -783,7 +783,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                             erfeiyong = twoMoney.subtract(ercidaizhifu).subtract(erzhichufeiyong).subtract(ercididing);
                             if (twoMoney.compareTo(BigDecimal.ZERO) != 0) {
                                 GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
-                                voucherDetail.setType("行销活动");
+                                voucherDetail.setType("行销政策");
                                 voucherDetail.setTimeFlag(finalSummaryTag);
                                 voucherDetail.setSceneCode("1161.01.16");
                                 voucherDetail.setDeptCode(deptCode); //部门编码赋值
@@ -794,7 +794,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                             }
                             if (ercidaizhifu.compareTo(BigDecimal.ZERO) != 0) {
                                 GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
-                                voucherDetail.setType("行销活动");
+                                voucherDetail.setType("行销政策");
                                 voucherDetail.setTimeFlag(finalSummaryTag);
                                 voucherDetail.setCustomerCode("DZFCJFL");
                                 voucherDetail.setSceneCode("2181.07.00");
@@ -806,7 +806,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                             if (erzhichufeiyong.compareTo(BigDecimal.ZERO) != 0) {
                                 GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
                                 voucherDetail.setTimeFlag(finalSummaryTag);
-                                voucherDetail.setType("行销活动");
+                                voucherDetail.setType("行销政策");
                                 voucherDetail.setDeptCode(deptCode); //部门编码赋值
                                 voucherDetail.setManufacturer(gysCode);
                                 voucherDetail.setAmount(erzhichufeiyong);
@@ -817,7 +817,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                             if (ercididing.compareTo(BigDecimal.ZERO) != 0) {
                                 GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
                                 voucherDetail.setTimeFlag(finalSummaryTag);
-                                voucherDetail.setType("行销活动");
+                                voucherDetail.setType("行销政策");
                                 voucherDetail.setDeptCode(deptCode); //部门编码赋值
                                 voucherDetail.setManufacturer(gysCode);
                                 voucherDetail.setAmount(ercididing);
@@ -828,7 +828,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                             if (erfeiyong.compareTo(BigDecimal.ZERO) != 0) {
                                 GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
                                 voucherDetail.setTimeFlag(finalSummaryTag);
-                                voucherDetail.setType("行销活动");
+                                voucherDetail.setType("行销政策");
                                 voucherDetail.setDeptCode(deptCode); //部门编码赋值
                                 voucherDetail.setAmount(erfeiyong);
                                 voucherDetail.setSceneCode("6401.14");
@@ -851,7 +851,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                                     if (daizhifuchaMoney.compareTo(BigDecimal.ZERO) != 0) {
                                         GeneralVoucher.GeneralVoucherDetail voucherDetail1 = new GeneralVoucher.GeneralVoucherDetail();
                                         voucherDetail1.setTimeFlag(finalSummaryTag);
-                                        voucherDetail1.setType("行销活动");
+                                        voucherDetail1.setType("行销政策");
                                         voucherDetail1.setDeptCode(deptCode);
                                         voucherDetail1.setManufacturer(gysCode);
                                         voucherDetail1.setAmount(daizhifuchaMoney);
@@ -860,7 +860,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                                         voucherDetails.add(voucherDetail1);
                                         GeneralVoucher.GeneralVoucherDetail voucherDetail2 = new GeneralVoucher.GeneralVoucherDetail();
                                         voucherDetail2.setTimeFlag(finalSummaryTag);
-                                        voucherDetail2.setType("行销活动");
+                                        voucherDetail2.setType("行销政策");
                                         voucherDetail2.setDeptCode(deptCode);
                                         voucherDetail2.setAmount(daizhifuchaMoney);
                                         voucherDetail2.setSceneCode("6401.14");
@@ -878,7 +878,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                         finKingDeeFeign.saveRebateSpecialReviewVoucher(generalVoucher);
                     }
                 }
-            });
+            }
         }
 
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java

@@ -475,7 +475,7 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
                 List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
                 if (!v.isEmpty()) {
                     for (ScmSpecialRebate rebate : v) {
-                        if (!rebate.getRebateTypeValue().equals("行销活动")) {
+                        if (!rebate.getRebateTypeValue().equals("行销政策")) {
                             if (StringUtils.isNotBlank(rebate.getUseOrgSid())) {
                                 String useOrgSid = rebate.getUseOrgSid();
                                 SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();

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) {
+        this.formobj.scmWhenSpecialrebateCheckapplydetailDetails.forEach((i) => {
-          if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].brandName === e.brandName) {
+          if (i.rebateTypeValue === e.rebateTypeValue && i.purchaseSystemName === e.purchaseSystemName && i.brandName === e.brandName) {
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num) + parseFloat(1)
+            i.num = parseFloat(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
+            i.withRebate = Math.round((parseFloat(i.withRebate !== '' ? 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
+            i.withholdCost = Math.round((parseFloat(i.withholdCost !== '' ? 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
+            i.uploadMoney = Math.round((parseFloat(i.uploadMoney !== '' ? 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
+            i.stayDetermineMoney = Math.round((parseFloat(i.stayDetermineMoney !== '' ? 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
+            i.adjustmentMoney = Math.round((parseFloat(i.adjustmentMoney !== '' ? 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
+            i.money = Math.round((parseFloat(i.money !== '' ? i.money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].specialRebateSids.push(e.sid)
+            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) {
+        this.formobj.scmLastSpecialrebateCheckapplydetailDetails.forEach((l) => {
-          if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].brandName === s.brandName) {
+          if (l.withholdingDate === s.withholdingDate && l.purchaseSystemName === s.purchaseSystemName && l.brandName === s.brandName) {
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num) + parseFloat(1)
+            l.num = parseFloat(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
+            l.withRebate = Math.round((parseFloat(l.withRebate !== '' ? 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
+            l.withholdCost = Math.round((parseFloat(l.withholdCost !== '' ? 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
+            l.uploadMoney = Math.round((parseFloat(l.uploadMoney !== '' ? 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
+            l.stayDetermineMoney = Math.round((parseFloat(l.stayDetermineMoney !== '' ? 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
+            l.adjustmentMoney = Math.round((parseFloat(l.adjustmentMoney !== '' ? 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
+            l.money = Math.round((parseFloat(l.money !== '' ? l.money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].specialRebateSids.push(s.sid)
+            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) {
+        this.formobj.scmWhenSpecialrebateCheckapplydetailDetails.forEach((i) => {
-          if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].brandName === e.brandName) {
+          if (i.rebateTypeValue === e.rebateTypeValue && i.purchaseSystemName === e.purchaseSystemName && i.brandName === e.brandName) {
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num) + parseFloat(1)
+            i.num = parseFloat(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
+            i.withRebate = Math.round((parseFloat(i.withRebate !== '' ? 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
+            i.withholdCost = Math.round((parseFloat(i.withholdCost !== '' ? 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
+            i.uploadMoney = Math.round((parseFloat(i.uploadMoney !== '' ? 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
+            i.stayDetermineMoney = Math.round((parseFloat(i.stayDetermineMoney !== '' ? 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
+            i.adjustmentMoney = Math.round((parseFloat(i.adjustmentMoney !== '' ? 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
+            i.money = Math.round((parseFloat(i.money !== '' ? i.money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].specialRebateSids.push(e.sid)
+            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) {
+        this.formobj.scmLastSpecialrebateCheckapplydetailDetails.forEach((l) => {
-          if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].brandName === s.brandName) {
+          if (l.withholdingDate === s.withholdingDate && l.purchaseSystemName === s.purchaseSystemName && l.brandName === s.brandName) {
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num) + parseFloat(1)
+            l.num = parseFloat(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
+            l.withRebate = Math.round((parseFloat(l.withRebate !== '' ? 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
+            l.withholdCost = Math.round((parseFloat(l.withholdCost !== '' ? 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
+            l.uploadMoney = Math.round((parseFloat(l.uploadMoney !== '' ? 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
+            l.stayDetermineMoney = Math.round((parseFloat(l.stayDetermineMoney !== '' ? 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
+            l.adjustmentMoney = Math.round((parseFloat(l.adjustmentMoney !== '' ? 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
+            l.money = Math.round((parseFloat(l.money !== '' ? l.money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].specialRebateSids.push(s.sid)
+            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

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) {
+        this.formobj.scmWhenSpecialrebateCheckapplydetailDetails.forEach((i) => {
-          if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].brandName === e.brandName) {
+          if (i.rebateTypeValue === e.rebateTypeValue && i.purchaseSystemName === e.purchaseSystemName && i.brandName === e.brandName) {
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num) + parseFloat(1)
+            i.num = parseFloat(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
+            i.withRebate = Math.round((parseFloat(i.withRebate !== '' ? 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
+            i.withholdCost = Math.round((parseFloat(i.withholdCost !== '' ? 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
+            i.uploadMoney = Math.round((parseFloat(i.uploadMoney !== '' ? 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
+            i.stayDetermineMoney = Math.round((parseFloat(i.stayDetermineMoney !== '' ? 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
+            i.adjustmentMoney = Math.round((parseFloat(i.adjustmentMoney !== '' ? 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
+            i.money = Math.round((parseFloat(i.money !== '' ? i.money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].specialRebateSids.push(e.sid)
+            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) {
+        this.formobj.scmLastSpecialrebateCheckapplydetailDetails.forEach((l) => {
-          if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].brandName === s.brandName) {
+          if (l.withholdingDate === s.withholdingDate && l.purchaseSystemName === s.purchaseSystemName && l.brandName === s.brandName) {
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num) + parseFloat(1)
+            l.num = parseFloat(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
+            l.withRebate = Math.round((parseFloat(l.withRebate !== '' ? 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
+            l.withholdCost = Math.round((parseFloat(l.withholdCost !== '' ? 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
+            l.uploadMoney = Math.round((parseFloat(l.uploadMoney !== '' ? 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
+            l.stayDetermineMoney = Math.round((parseFloat(l.stayDetermineMoney !== '' ? 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
+            l.adjustmentMoney = Math.round((parseFloat(l.adjustmentMoney !== '' ? 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
+            l.money = Math.round((parseFloat(l.money !== '' ? l.money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].specialRebateSids.push(s.sid)
+            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) {
+        this.formobj.scmWhenSpecialrebateCheckapplydetailDetails.forEach((i) => {
-          if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].brandName === e.brandName) {
+          if (i.rebateTypeValue === e.rebateTypeValue && i.purchaseSystemName === e.purchaseSystemName && i.brandName === e.brandName) {
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num) + parseFloat(1)
+            i.num = parseFloat(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
+            i.withRebate = Math.round((parseFloat(i.withRebate !== '' ? 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
+            i.withholdCost = Math.round((parseFloat(i.withholdCost !== '' ? 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
+            i.uploadMoney = Math.round((parseFloat(i.uploadMoney !== '' ? 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
+            i.stayDetermineMoney = Math.round((parseFloat(i.stayDetermineMoney !== '' ? 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
+            i.adjustmentMoney = Math.round((parseFloat(i.adjustmentMoney !== '' ? 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
+            i.money = Math.round((parseFloat(i.money !== '' ? i.money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].specialRebateSids.push(e.sid)
+            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) {
+        this.formobj.scmLastSpecialrebateCheckapplydetailDetails.forEach((l) => {
-          if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].brandName === s.brandName) {
+          if (l.withholdingDate === s.withholdingDate && l.purchaseSystemName === s.purchaseSystemName && l.brandName === s.brandName) {
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num) + parseFloat(1)
+            l.num = parseFloat(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
+            l.withRebate = Math.round((parseFloat(l.withRebate !== '' ? 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
+            l.withholdCost = Math.round((parseFloat(l.withholdCost !== '' ? 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
+            l.uploadMoney = Math.round((parseFloat(l.uploadMoney !== '' ? 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
+            l.stayDetermineMoney = Math.round((parseFloat(l.stayDetermineMoney !== '' ? 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
+            l.adjustmentMoney = Math.round((parseFloat(l.adjustmentMoney !== '' ? 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
+            l.money = Math.round((parseFloat(l.money !== '' ? l.money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].specialRebateSids.push(s.sid)
+            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