diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java index ea04881781..41b072de7c 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java @@ -670,8 +670,22 @@ public class ScmVehRebateService extends MybatisBaseService 0 && baseVehicleRebateVo.getBrandName().contains("陕汽")) { + money = costPrice.subtract(freight).subtract(topAmount); + } else { + money = costPrice.subtract(freight); + } + BigDecimal m = rule.multiply(money).divide(new BigDecimal("100")); scmVehRebate.setEstimateRebate(m.toString()); } else { scmVehRebate.setCalculationModeKey("002"); diff --git a/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagement.vue b/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagement.vue index 8ecbb80af7..2475afe7cf 100644 --- a/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagement.vue +++ b/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagement.vue @@ -313,7 +313,7 @@ export default { loading.close() if (resp.success) { this.$message({ type: 'success', message: resp.msg, showClose: true }) - this.loadList() + this.getList() } }).catch((e) => { loading.close() diff --git a/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differentialAdjustment/differentialAdjustment.vue b/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differentialAdjustment/differentialAdjustment.vue index 966703747e..691eb36d98 100644 --- a/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differentialAdjustment/differentialAdjustment.vue +++ b/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differentialAdjustment/differentialAdjustment.vue @@ -53,7 +53,8 @@ - + +