Merge remote-tracking branch 'origin/master'

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

@@ -264,8 +264,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                     bennian = bennian.add(amount);
                 }
                 total = total.add(amount);
-                deptNo = voucherDetail.getDeptCode();
-                manufacturer = voucherDetail.getManufacturer();
+                if (StringUtils.isNotBlank(voucherDetail.getDeptCode())) {
+                    deptNo = voucherDetail.getDeptCode();
+                }
+                if (StringUtils.isNotBlank(voucherDetail.getManufacturer())) {
+                    manufacturer = voucherDetail.getManufacturer();
+                }
                 timeFlag = voucherDetail.getTimeFlag();
             }
             if (shangnian.compareTo(BigDecimal.ZERO) != 0) {
@@ -402,10 +406,17 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         String timeFlag = "";
         List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = voucher.getVoucherDetails();
         if (!voucherDetails.isEmpty()) {
+
             for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
                 timeFlag = voucherDetail.getTimeFlag();
-                deptNo = voucherDetail.getDeptCode();
-                manufacturer = voucherDetail.getManufacturer();
+                if (!voucherDetail.getRemarks().equals("金融贴息")) {
+                    if (StringUtils.isNotBlank(voucherDetail.getDeptCode())) {
+                        deptNo = voucherDetail.getDeptCode();
+                    }
+                }
+                if (StringUtils.isNotBlank(voucherDetail.getManufacturer())) {
+                    manufacturer = voucherDetail.getManufacturer();
+                }
                 if (voucherDetail.getRemarks().equals("金融贴息")) {
                     if (voucherDetail.getSceneCode().equals("1161.01.16")) {
                         cjwdxJR = cjwdxJR.add(voucherDetail.getAmount());
@@ -523,6 +534,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         }
         log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(newVoucher));
         return voucherService.saveVoucher(newVoucher);
+
     }
 
     @Override
@@ -547,8 +559,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = voucher.getVoucherDetails();
         if (!voucherDetails.isEmpty()) {
             for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
-                deptNo = voucherDetail.getDeptCode();
-                manufacturer = voucherDetail.getManufacturer();
+                if (StringUtils.isNotBlank(voucherDetail.getDeptCode())) {
+                    deptNo = voucherDetail.getDeptCode();
+                }
+                if (StringUtils.isNotBlank(voucherDetail.getManufacturer())) {
+                    manufacturer = voucherDetail.getManufacturer();
+                }
                 timeFlag = voucherDetail.getTimeFlag();
                 if (voucherDetail.getSceneCode().equals("1161.02.15")) {
                     snfl = snfl.add(voucherDetail.getAmount());
@@ -637,8 +653,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         if (!voucherDetails.isEmpty()) {
             for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
                 timeFlag = voucherDetail.getTimeFlag();
-                deptNo = voucherDetail.getDeptCode();
-                manufacturer = voucherDetail.getManufacturer();
+                if (StringUtils.isNotBlank(voucherDetail.getDeptCode())) {
+                    deptNo = voucherDetail.getDeptCode();
+                }
+                if (StringUtils.isNotBlank(voucherDetail.getManufacturer())) {
+                    manufacturer = voucherDetail.getManufacturer();
+                }
                 if (!voucherDetail.getType().equals("行销活动")) {
                     if (voucherDetail.getRemarks().equals("返利上传")) {
                         if (voucherDetail.getSceneCode().equals("1161.01.16")) {
@@ -854,8 +874,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         if (!voucherDetails.isEmpty()) {
             for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
                 timeFlag = voucherDetail.getTimeFlag();
-                deptNo = voucherDetail.getDeptCode();
-                manufacturer = voucherDetail.getManufacturer();
+                if (StringUtils.isNotBlank(voucherDetail.getDeptCode())) {
+                    deptNo = voucherDetail.getDeptCode();
+                }
+                if (StringUtils.isNotBlank(voucherDetail.getManufacturer())) {
+                    manufacturer = voucherDetail.getManufacturer();
+                }
                 if (voucherDetail.getSceneCode().equals("1161.02.15")) {
                     sn = sn.add(voucherDetail.getAmount());
                 }
@@ -924,8 +948,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         if (!voucherDetails.isEmpty()) {
             for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
                 timeFlag = voucherDetail.getTimeFlag();
-                deptNo = voucherDetail.getDeptCode();
-                manufacturer = voucherDetail.getManufacturer();
+                if (StringUtils.isNotBlank(voucherDetail.getDeptCode())) {
+                    deptNo = voucherDetail.getDeptCode();
+                }
+                if (StringUtils.isNotBlank(voucherDetail.getManufacturer())) {
+                    manufacturer = voucherDetail.getManufacturer();
+                }
                 BigDecimal amount = voucherDetail.getAmount();
                 if (voucherDetail.getRemarks().equals("返利上传")) {
                     if (voucherDetail.getSceneCode().equals("1161.01.16")) {

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeign.java

@@ -57,11 +57,16 @@ import java.util.List;
         fallback = ScmSpecialrebateCheckapplydetailFeignFallback.class)
 public interface ScmSpecialrebateCheckapplydetailFeign {
 
-    @ApiOperation("专项返利核对查看详情")
+    @ApiOperation("专项返利核对查看全部详情")
     @GetMapping("/specialRebateCheckDetails/{sid}")
     @ResponseBody
     public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateCheckDetails(@PathVariable("sid") String sid);
 
+    @ApiOperation("专项返利核对查看分组详情")
+    @GetMapping("/specialRebateGroupDetails/{sid}")
+    @ResponseBody
+    public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateGroupDetails(@PathVariable("sid") String sid);
+
     @ApiOperation("app查询明细")
     @GetMapping("/appMx/{sid}")
     @ResponseBody

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeignFallback.java

@@ -41,6 +41,11 @@ public class ScmSpecialrebateCheckapplydetailFeignFallback implements ScmSpecial
 		return null;
 	}
 
+	@Override
+	public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateGroupDetails(String sid) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<List<ScmSpecialRebateDetailsVo>> appMx(String sid) {
 		return null;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeign.java

@@ -72,11 +72,16 @@ public interface ScmVehrebateCheckapplydetailFeign {
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
 
-    @ApiOperation("单车返利核对查看详情")
+    @ApiOperation("单车返利核对查看所有详情")
     @GetMapping("/vehRebateCheckDetails/{sid}")
     @ResponseBody
     public ResultBean<List<ScmVehRebateDetailsVo>> vehRebateCheckDetails(@PathVariable("sid") String sid);
 
+    @ApiOperation("单车返利核对查看分组详情")
+    @GetMapping("/vehRebateGroupDetails/{sid}")
+    @ResponseBody
+    public ResultBean<List<ScmVehRebateDetailsVo>> vehRebateGroupDetails(@PathVariable("sid") String sid);
+
     @ApiOperation("app查询明细")
     @GetMapping("/appMx/{sid}")
     @ResponseBody

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeignFallback.java

@@ -70,6 +70,11 @@ public class ScmVehrebateCheckapplydetailFeignFallback implements ScmVehrebateCh
 		return null;
 	}
 
+	@Override
+	public ResultBean<List<ScmVehRebateDetailsVo>> vehRebateGroupDetails(String sid) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<List<ScmVehRebateDetailsVo>> appMx(String sid) {
 		return null;

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailRest.java

@@ -60,6 +60,11 @@ public class ScmSpecialrebateCheckapplydetailRest implements ScmSpecialrebateChe
 		return scmSpecialrebateCheckapplydetailService.specialRebateCheckDetails(sid);
 	}
 
+	@Override
+	public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateGroupDetails(String sid) {
+		return scmSpecialrebateCheckapplydetailService.specialRebateGroupDetails(sid);
+	}
+
 	@Override
 	public ResultBean<List<ScmSpecialRebateDetailsVo>> appMx(String sid) {
 		return scmSpecialrebateCheckapplydetailService.appMx(sid);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java

@@ -118,4 +118,17 @@ public class ScmSpecialrebateCheckapplydetailService extends MybatisBaseService<
         }
         return rb.success().setData(scmSpecialRebateDetailsVos);
     }
+
+    public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateGroupDetails(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<ScmSpecialRebateDetailsVo> scmSpecialRebateDetailsVos = new ArrayList<>();
+        String[] sids = sid.split(",");
+        for (String s : sids) {
+            ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo = baseMapper.appMx(s);
+            scmSpecialRebateDetailsVo.setWithholdCost(scmSpecialRebateDetailsVo.getExpectItureCost().add(scmSpecialRebateDetailsVo.getExpectTreatCost()).add(scmSpecialRebateDetailsVo.getExpectSuppCost()));
+            scmSpecialRebateDetailsVo.setMoney(scmSpecialRebateDetailsVo.getOnceItureCost().add(scmSpecialRebateDetailsVo.getOnceTreatCost()).add(scmSpecialRebateDetailsVo.getOnceSuppCost()).add(scmSpecialRebateDetailsVo.getSecondItureCost()).add(scmSpecialRebateDetailsVo.getSecondTreatCost()).add(scmSpecialRebateDetailsVo.getSecondSuppCost()).toString());
+            scmSpecialRebateDetailsVos.add(scmSpecialRebateDetailsVo);
+        }
+        return rb.success().setData(scmSpecialRebateDetailsVos);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java

@@ -68,7 +68,6 @@ import com.yxt.anrui.scm.api.scmvehrebatecheckapply.flow.SubmitScmVehRebateCheck
 import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo;
 import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDto;
 import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo;
-import com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApply;
 import com.yxt.anrui.scm.biz.scmvehrebate.ScmVehRebateService;
 import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService;
 import com.yxt.anrui.scm.biz.scmvehrebatewithapply.ScmVehRebateWithApplyService;
@@ -496,7 +495,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
                     scmVehRebateService.updateOnceCheckState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 1);
                 }
 
-                pushVehRebateWithVoucher(bv.getBusinessSid(),"0"); //推送返利核对凭证
+                pushVehRebateWithVoucher(bv.getBusinessSid(), "0"); //推送返利核对凭证
             }
             return rb.success().setData(resultBean.getData());
         } else {
@@ -534,8 +533,8 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
             String finalSummaryTag = summaryTag;
             String[] split = finalSummaryTag.split("年");
             String y1 = split[0]; //预提申请标题年份
-            map.forEach((k, v) -> {
-                List<ScmVehRebate> rebates = v;
+            for (Map.Entry<String, List<ScmVehRebate>> entry : map.entrySet()) {
+                List<ScmVehRebate> v = entry.getValue();
                 GeneralVoucher generalVoucher = new GeneralVoucher();
                 generalVoucher.setBussDate(format);
                 List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
@@ -690,34 +689,46 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
                             //确认调整时
                             if (StringUtils.isNotBlank(rebate.getIsAdjustment())) {
                                 if (rebate.getIsAdjustment().equals("是")) {
-                                    if (StringUtils.isNotBlank(rebate.getAdjustmentMoney())) {
-                                        BigDecimal adMoney = new BigDecimal(rebate.getAdjustmentMoney());
-                                        if (adMoney.compareTo(BigDecimal.ZERO) != 0) {
-                                            GeneralVoucher.GeneralVoucherDetail voucherDetail1 = new GeneralVoucher.GeneralVoucherDetail();
-                                            voucherDetail1.setTimeFlag(finalSummaryTag);
-                                            voucherDetail1.setDeptCode(deptCode); //部门编码赋值
-                                            voucherDetail1.setManufacturer(gysCode);
-                                            voucherDetail1.setAmount(adMoney);
-                                            String palceGenDate = rebate.getPalceGenDate();
-                                            String[] palceGenDateSplit = palceGenDate.split("-");
-                                            String y2 = palceGenDateSplit[0];//所属年份
-                                            if (y1.equals(y2)) {
-                                                voucherDetail1.setSceneCode("1161.01.15");
-                                            } else {
-                                                voucherDetail1.setSceneCode("1161.02.15");
-                                            }
-                                            voucherDetail1.setRemarks("预留费用调整");
-                                            voucherDetails.add(voucherDetail1);
-                                            GeneralVoucher.GeneralVoucherDetail voucherDetail2 = new GeneralVoucher.GeneralVoucherDetail();
-                                            voucherDetail2.setTimeFlag(finalSummaryTag);
-                                            voucherDetail2.setCustomerCode("DZFCJFL"); //客户编码
-                                            voucherDetail2.setAmount(adMoney);
-                                            voucherDetail2.setSceneCode("1161.04.00");
-                                            voucherDetail2.setRemarks("预留费用调整");
-                                            voucherDetails.add(voucherDetail2);
+                                    BigDecimal treatAdjustmentMoney = BigDecimal.ZERO;
+                                    BigDecimal onceTreatCost = BigDecimal.ZERO;
+                                    BigDecimal secondTreatCost = BigDecimal.ZERO;
+                                    BigDecimal expectTreatCost = BigDecimal.ZERO;
+                                    if (null != rebate.getOnceTreatCost()) {
+                                        onceTreatCost = rebate.getOnceTreatCost();
+                                    }
+                                    if (null != rebate.getSecondTreatCost()) {
+                                        secondTreatCost = rebate.getSecondTreatCost();
+                                    }
+                                    if (null != rebate.getExpectTreatCost()) {
+                                        expectTreatCost = rebate.getExpectTreatCost();
+                                    }
+                                    treatAdjustmentMoney = onceTreatCost.add(secondTreatCost).subtract(expectTreatCost);
+                                    if (treatAdjustmentMoney.compareTo(BigDecimal.ZERO) != 0) {
+                                        GeneralVoucher.GeneralVoucherDetail voucherDetail1 = new GeneralVoucher.GeneralVoucherDetail();
+                                        voucherDetail1.setTimeFlag(finalSummaryTag);
+                                        voucherDetail1.setDeptCode(deptCode); //部门编码赋值
+                                        voucherDetail1.setManufacturer(gysCode);
+                                        voucherDetail1.setAmount(treatAdjustmentMoney);
+                                        String palceGenDate = rebate.getPalceGenDate();
+                                        String[] palceGenDateSplit = palceGenDate.split("-");
+                                        String y2 = palceGenDateSplit[0];//所属年份
+                                        if (y1.equals(y2)) {
+                                            voucherDetail1.setSceneCode("1161.01.15");
+                                        } else {
+                                            voucherDetail1.setSceneCode("1161.02.15");
                                         }
+                                        voucherDetail1.setRemarks("预留费用调整");
+                                        voucherDetails.add(voucherDetail1);
+                                        GeneralVoucher.GeneralVoucherDetail voucherDetail2 = new GeneralVoucher.GeneralVoucherDetail();
+                                        voucherDetail2.setTimeFlag(finalSummaryTag);
+                                        voucherDetail2.setCustomerCode("DZFCJFL"); //客户编码
+                                        voucherDetail2.setAmount(treatAdjustmentMoney);
+                                        voucherDetail2.setDeptCode(deptCode); //部门编码赋值
+                                        voucherDetail2.setManufacturer(gysCode);
+                                        voucherDetail2.setSceneCode("2181.07.00");
+                                        voucherDetail2.setRemarks("预留费用调整");
+                                        voucherDetails.add(voucherDetail2);
                                     }
-
                                     if (null != rebate.getDiffAmount()) {
                                         BigDecimal esRebate = rebate.getDiffAmount();
                                         if (esRebate.compareTo(BigDecimal.ZERO) != 0) {
@@ -832,7 +843,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
                         finKingDeeFeign.pushCostAdjustmentsBill(costAdjustmentsBill);
                     }
                 }
-            });
+            }
         }
 
 
@@ -1020,7 +1031,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
         List<ScmVehrebateCheckapplydetailDetailsVo> scmWhenVehrebateCheckapplydetailDetails = scmVehrebateCheckapplyDetailsVo.getScmWhenVehrebateCheckapplydetailDetails();
         Map<String, Object> dataMap = new HashMap<String, Object>();
         //标题
-        dataMap.put("title",scmVehrebateCheckapplyDetailsVo.getCheckApply() + "单车返利核对审批");
+        dataMap.put("title", scmVehrebateCheckapplyDetailsVo.getCheckApply() + "单车返利核对审批");
         //分公司
         dataMap.put("useOrgName", scmVehrebateCheckapplyDetailsVo.getCreateOrgName());
         //创建部门
@@ -1144,11 +1155,11 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
         List<AppVehrebateCheckapplydetailDetailsVo> when = scmVehrebateCheckapplydetailService.fetchByMainSid(sid);
         List<AppVehrebateCheckapplydetailDetailsVo> last = scmVehrebateCheckapplydetailService.fetchByMainSid(sid);
         for (AppVehrebateCheckapplydetailDetailsVo appVehrebateCheckapplydetailDetailsVo : when) {
-            List<AppVehrebateCheckapplydetailDetailssVo> type = scmVehrebateCheckapplydetailService.fetchByMainSidType(sid,appVehrebateCheckapplydetailDetailsVo.getPurchaseSystemName(),appVehrebateCheckapplydetailDetailsVo.getBrandName());
+            List<AppVehrebateCheckapplydetailDetailssVo> type = scmVehrebateCheckapplydetailService.fetchByMainSidType(sid, appVehrebateCheckapplydetailDetailsVo.getPurchaseSystemName(), appVehrebateCheckapplydetailDetailsVo.getBrandName());
             appVehrebateCheckapplydetailDetailsVo.setDetails(type);
         }
         for (AppVehrebateCheckapplydetailDetailsVo appVehrebateCheckapplydetailDetailsVo : last) {
-            List<AppVehrebateCheckapplydetailDetailssVo> date = scmVehrebateCheckapplydetailService.fetchByMainSidDate(sid,appVehrebateCheckapplydetailDetailsVo.getPurchaseSystemName(),appVehrebateCheckapplydetailDetailsVo.getBrandName());
+            List<AppVehrebateCheckapplydetailDetailssVo> date = scmVehrebateCheckapplydetailService.fetchByMainSidDate(sid, appVehrebateCheckapplydetailDetailsVo.getPurchaseSystemName(), appVehrebateCheckapplydetailDetailsVo.getBrandName());
             appVehrebateCheckapplydetailDetailsVo.setDetails(date);
         }
         appVehrebateCheckapplyDetailsVo.setScmWhenVehrebateCheckapplydetailDetails(when);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailRest.java

@@ -80,6 +80,11 @@ public class ScmVehrebateCheckapplydetailRest implements ScmVehrebateCheckapplyd
         return scmVehrebateCheckapplydetailService.vehRebateCheckDetails(sid);
     }
 
+    @Override
+    public ResultBean<List<ScmVehRebateDetailsVo>> vehRebateGroupDetails(String sid) {
+        return scmVehrebateCheckapplydetailService.vehRebateGroupDetails(sid);
+    }
+
     @Override
     public ResultBean<List<ScmVehRebateDetailsVo>> appMx(String sid) {
         return scmVehrebateCheckapplydetailService.appMx(sid);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailService.java

@@ -90,7 +90,7 @@ public class ScmVehrebateCheckapplydetailService extends MybatisBaseService<ScmV
 
     public ResultBean<List<ScmVehRebateDetailsVo>> vehRebateCheckDetails(String sid) {
         ResultBean rb = ResultBean.fireFail();
-        List<ScmVehRebateDetailsVo>  scmVehRebateDetailsVos = baseMapper.selByVehRebteSid(sid);
+        List<ScmVehRebateDetailsVo> scmVehRebateDetailsVos = baseMapper.selByVehRebteSid(sid);
         for (ScmVehRebateDetailsVo scmVehRebateDetailsVo : scmVehRebateDetailsVos) {
             scmVehRebateDetailsVo.setWithholdCost(scmVehRebateDetailsVo.getExpectTreatCost().add(scmVehRebateDetailsVo.getExpectSuppCost()));
             scmVehRebateDetailsVo.setMoney(scmVehRebateDetailsVo.getOnceTreatCost().add(scmVehRebateDetailsVo.getOnceSuppCost()).add(scmVehRebateDetailsVo.getSecondTreatCost()).add(scmVehRebateDetailsVo.getSecondSuppCost()).toString());
@@ -122,4 +122,17 @@ public class ScmVehrebateCheckapplydetailService extends MybatisBaseService<ScmV
         }
         return rb.success().setData(scmVehRebateDetailsVos);
     }
+
+    public ResultBean<List<ScmVehRebateDetailsVo>> vehRebateGroupDetails(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<ScmVehRebateDetailsVo> scmVehRebateDetailsVos = new ArrayList<>();
+        String[] vehRebateSids = sid.split(",");
+        for (String vehRebateSid : vehRebateSids) {
+            ScmVehRebateDetailsVo scmVehRebateDetailsVo = baseMapper.selByVehRebteSidNew(vehRebateSid);
+            scmVehRebateDetailsVo.setWithholdCost(scmVehRebateDetailsVo.getExpectTreatCost().add(scmVehRebateDetailsVo.getExpectSuppCost()));
+            scmVehRebateDetailsVo.setMoney(scmVehRebateDetailsVo.getOnceTreatCost().add(scmVehRebateDetailsVo.getOnceSuppCost()).add(scmVehRebateDetailsVo.getSecondTreatCost()).add(scmVehRebateDetailsVo.getSecondSuppCost()).toString());
+            scmVehRebateDetailsVos.add(scmVehRebateDetailsVo);
+        }
+        return rb.success().setData(scmVehRebateDetailsVos);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java

@@ -557,18 +557,28 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
                                 }
                             }
                             //添加成本调整单
+                            BigDecimal esRebate = BigDecimal.ZERO;//预计返利
+                            BigDecimal expectTreatCost = BigDecimal.ZERO;//其中待支付
+                            BigDecimal expectSuppCost = BigDecimal.ZERO;//其中抵顶
+                            BigDecimal pushMoney = BigDecimal.ZERO;//推送费用
                             if (StringUtils.isNotBlank(rebate.getEstimateRebate())) {
-                                BigDecimal esRebate = new BigDecimal(rebate.getEstimateRebate());
-                                if (esRebate.compareTo(BigDecimal.ZERO) != 0) {
-                                    CostAdjustmentsBill.CostAdjustmentsBillDetailDto dto = new CostAdjustmentsBill.CostAdjustmentsBillDetailDto();
-                                    dto.setCompanyCode(useOrgCode);
-                                    dto.setMaterialID(vinCode);
-                                    dto.setDeptCode(deptCode);
-                                    dto.setAmount(esRebate.negate().toString());
-                                    resultDetails.add(dto);
-                                }
+                                 esRebate = new BigDecimal(rebate.getEstimateRebate());
+                            }
+                            if (rebate.getExpectTreatCost() != null) {
+                                expectTreatCost = rebate.getExpectTreatCost();
+                            }
+                            if (rebate.getExpectSuppCost() != null) {
+                                expectSuppCost = rebate.getExpectSuppCost();
+                            }
+                            pushMoney = esRebate.subtract(expectTreatCost).subtract(expectSuppCost);
+                            if (pushMoney.compareTo(BigDecimal.ZERO) != 0) {
+                                CostAdjustmentsBill.CostAdjustmentsBillDetailDto dto = new CostAdjustmentsBill.CostAdjustmentsBillDetailDto();
+                                dto.setCompanyCode(useOrgCode);
+                                dto.setMaterialID(vinCode);
+                                dto.setDeptCode(deptCode);
+                                dto.setAmount(pushMoney.negate().toString());
+                                resultDetails.add(dto);
                             }
-
                         } else {
                             String salesDeptCode = ""; //销售部门编码
                             String customerCode = ""; //出库单客户编码

anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js

@@ -100,9 +100,9 @@ export default {
     })
   },
   // 查看明细
-  vehRebateCheckDetails: function(data) {
+  vehRebateGroupDetails: function(data) {
     return request({
-      url: '/scm/v1/scmvehrebatecheckapplydetail/vehRebateCheckDetails/' + data,
+      url: '/scm/v1/scmvehrebatecheckapplydetail/vehRebateGroupDetails/' + data,
       method: 'get'
     })
   },

anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js

@@ -100,9 +100,9 @@ export default {
     })
   },
   // 查看明细
-  specialRebateCheckDetails: function(data) {
+  specialRebateGroupDetails: function(data) {
     return request({
-      url: '/scm/v1/scmspecialrebatecheckapplydetail/specialRebateCheckDetails/' + data,
+      url: '/scm/v1/scmspecialrebatecheckapplydetail/specialRebateGroupDetails/' + data,
       method: 'get'
     })
   },

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue

@@ -262,9 +262,9 @@ export default {
           })
         }
       })
-      let k = 0
       // 按照预提年月统计
       list.forEach((s) => {
+        let k = 0
         for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) {
           if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].brandName === s.brandName) {
             this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num) + parseFloat(1)
@@ -366,9 +366,9 @@ export default {
           })
         }
       })
-      let k = 0
       // 按照预提年月统计
       this.formobj.scmVehrebateCheckapplydetailList.forEach((s) => {
+        let k = 0
         for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) {
           if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].brandName === s.brandName) {
             this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num) + parseFloat(1)

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue

@@ -56,8 +56,8 @@
             <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
             <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
             <el-table-column label="明细" align="center" min-width="100">
-              <template>
-                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -76,8 +76,8 @@
             <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
             <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
             <el-table-column label="明细" align="center" min-width="100">
-              <template>
-                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -153,9 +153,9 @@ export default {
         this.formobj = row
       })
     },
-    handleLook() {
+    handleLook(row) {
       this.viewState = 2
-      this.$refs['divInfo'].showInfo(this.formobj.sid)
+      this.$refs['divInfo'].showInfo(row.vehRebateSids)
     },
     resetState() {
       this.viewState = 1

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue

@@ -30,9 +30,7 @@
                 <el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
               </el-form-item>
               <el-form-item label="返利类型">
-                <el-select v-model="listQuery.params.rebateTypeKey" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in rebateType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-                </el-select>
+                <el-input v-model="listQuery.params.rebateTypeValue" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="返利名称">
                 <el-input v-model="listQuery.params.rebateName" placeholder="" clearable/>
@@ -254,7 +252,7 @@ import ButtonBar from '@/components/ButtonBar'
 import bicyclerebatecheck from './bicyclerebatecheck'
 import bicyclerebatecheckAdd from './bicyclerebatecheckAdd'
 import bicyclerebatetobecheckedByUpdate from './bicyclerebatetobecheckedByUpdate'
-import { brandDown, getOrgSidByPath, typeValues } from '@/api/cheliang/dictcommons'
+import { getOrgSidByPath } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'BicycleRebateToBeChecked',
@@ -293,7 +291,6 @@ export default {
       list: [],
       sids: [],
       FormLoading: false,
-      rebateType_list: [],
       state_list: [
         {
           dictKey: '0',
@@ -312,7 +309,7 @@ export default {
           brandName: '',
           createOrgSid: '',
           vinNo: '',
-          rebateTypeKey: '',
+          rebateTypeValue: '',
           rebateName: '',
           state: '',
           createEndTime: '',
@@ -371,11 +368,6 @@ export default {
   },
   methods: {
     init() {
-      typeValues({ type: 'rebateType' }).then((res) => {
-        if (res.success) {
-          this.rebateType_list = res.data
-        }
-      })
       getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
         if (resp.success) {
           this.listQuery.params.createOrgSid = resp.data
@@ -450,7 +442,7 @@ export default {
           brandName: '',
           createOrgSid: '',
           vinNo: '',
-          rebateTypeKey: '',
+          rebateTypeValue: '',
           rebateName: '',
           state: '',
           createEndTime: '',

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedInfo.vue

@@ -75,12 +75,12 @@ export default {
     }
   },
   methods: {
-    showInfo(sid) {
+    showInfo(vehRebateSids) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
       this.viewTitle = '单车返利核对审核申请明细'
-      req.vehRebateCheckDetails(sid).then((resp) => {
+      req.vehRebateGroupDetails(vehRebateSids).then((resp) => {
         if (resp.success) {
           this.list = resp.data
         }

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedInfo.vue

@@ -72,12 +72,12 @@ export default {
     }
   },
   methods: {
-    showInfo(sid) {
+    showInfo(specialRebateSids) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
       this.viewTitle = '专项返利核对审核申请明细'
-      req.specialRebateCheckDetails(sid).then((resp) => {
+      req.specialRebateGroupDetails(specialRebateSids).then((resp) => {
         if (resp.success) {
           this.list = resp.data
         }

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue

@@ -261,9 +261,9 @@ export default {
           })
         }
       })
-      let k = 0
       // 按照预提年月统计
       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)
@@ -365,9 +365,9 @@ export default {
           })
         }
       })
-      let k = 0
       // 按照预提年月统计
       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)

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckInfo.vue

@@ -56,8 +56,8 @@
             <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
             <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
             <el-table-column label="明细" align="center" min-width="100">
-              <template>
-                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -76,8 +76,8 @@
             <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
             <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
             <el-table-column label="明细" align="center" min-width="100">
-              <template>
-                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -152,9 +152,9 @@ export default {
         this.formobj = row
       })
     },
-    handleLook() {
+    handleLook(row) {
       this.viewState = 2
-      this.$refs['divInfo'].showInfo(this.formobj.sid)
+      this.$refs['divInfo'].showInfo(row.specialRebateSids)
     },
     resetState() {
       this.viewState = 1

anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue

@@ -56,8 +56,8 @@
             <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
             <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
             <el-table-column label="明细" align="center" min-width="100">
-              <template>
-                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -76,8 +76,8 @@
             <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
             <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
             <el-table-column label="明细" align="center" min-width="100">
-              <template>
-                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -223,9 +223,9 @@ export default {
         this.formobj = {}
       })
     },
-    handleLook() {
+    handleLook(row) {
       this.viewState = 2
-      this.$refs['divInfo'].showInfo(this.formobj.sid)
+      this.$refs['divInfo'].showInfo(row.vehRebateSids)
     },
     resetState() {
       this.viewState = 1

anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue

@@ -230,9 +230,9 @@ export default {
           })
         }
       })
-      let k = 0
       // 按照预提年月统计
       list.forEach((s) => {
+        let k = 0
         for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) {
           if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].brandName === s.brandName) {
             this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num) + parseFloat(1)
@@ -334,9 +334,9 @@ export default {
           })
         }
       })
-      let k = 0
       // 按照预提年月统计
       this.formobj.scmVehrebateCheckapplydetailList.forEach((s) => {
+        let k = 0
         for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) {
           if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].brandName === s.brandName) {
             this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num) + parseFloat(1)

anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue

@@ -56,8 +56,8 @@
             <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
             <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
             <el-table-column label="明细" align="center" min-width="100">
-              <template>
-                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -76,8 +76,8 @@
             <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
             <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
             <el-table-column label="明细" align="center" min-width="100">
-              <template>
-                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -189,9 +189,9 @@ export default {
         this.formobj = {}
       })
     },
-    handleLook() {
+    handleLook(row) {
       this.viewState = 2
-      this.$refs['divInfo'].showInfo(this.formobj.sid)
+      this.$refs['divInfo'].showInfo(row.vehRebateSids)
     },
     resetState() {
       this.viewState = 1

anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedInfo.vue

@@ -75,12 +75,12 @@ export default {
     }
   },
   methods: {
-    showInfo(sid) {
+    showInfo(vehRebateSids) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
       this.viewTitle = '单车返利核对审核申请明细'
-      req.vehRebateCheckDetails(sid).then((resp) => {
+      req.vehRebateGroupDetails(vehRebateSids).then((resp) => {
         if (resp.success) {
           this.list = resp.data
         }

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedInfo.vue

@@ -72,12 +72,12 @@ export default {
     }
   },
   methods: {
-    showInfo(sid) {
+    showInfo(specialRebateSids) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
       this.viewTitle = '专项返利核对审核申请明细'
-      req.specialRebateCheckDetails(sid).then((resp) => {
+      req.specialRebateGroupDetails(specialRebateSids).then((resp) => {
         if (resp.success) {
           this.list = resp.data
         }

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue

@@ -56,8 +56,8 @@
             <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
             <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
             <el-table-column label="明细" align="center" min-width="100">
-              <template>
-                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -76,8 +76,8 @@
             <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
             <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
             <el-table-column label="明细" align="center" min-width="100">
-              <template>
-                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -222,9 +222,9 @@ export default {
         this.formobj = {}
       })
     },
-    handleLook() {
+    handleLook(row) {
       this.viewState = 2
-      this.$refs['divInfo'].showInfo(this.formobj.sid)
+      this.$refs['divInfo'].showInfo(row.specialRebateSids)
     },
     resetState() {
       this.viewState = 1

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue

@@ -228,9 +228,9 @@ export default {
           })
         }
       })
-      let k = 0
       // 按照预提年月统计
       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)
@@ -332,9 +332,9 @@ export default {
           })
         }
       })
-      let k = 0
       // 按照预提年月统计
       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)

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue

@@ -56,8 +56,8 @@
             <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
             <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
             <el-table-column label="明细" align="center" min-width="100">
-              <template>
-                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -76,8 +76,8 @@
             <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
             <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
             <el-table-column label="明细" align="center" min-width="100">
-              <template>
-                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -188,9 +188,9 @@ export default {
         this.formobj = {}
       })
     },
-    handleLook() {
+    handleLook(row) {
       this.viewState = 2
-      this.$refs['divInfo'].showInfo(this.formobj.sid)
+      this.$refs['divInfo'].showInfo(row.specialRebateSids)
     },
     resetState() {
       this.viewState = 1