diff --git a/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/PrcProfitReportQuery.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/PrcProfitReportQuery.java index 6e62a0bc..651bd1aa 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/PrcProfitReportQuery.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/PrcProfitReportQuery.java @@ -33,7 +33,9 @@ public class PrcProfitReportQuery extends BaseEntity private List customerNames; private String belongSalerCode; private String productCode; + private String productName; private String countryCode; + private String countryName; private String currency; /** 订单维度应收状态筛选:UNBILLED、PARTIAL、BILLED。 */ private String arBillStatus; diff --git a/bms-back/bms-system/src/main/resources/mapper/price/PrcProfitReportMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcProfitReportMapper.xml index ac667444..a1093f80 100644 --- a/bms-back/bms-system/src/main/resources/mapper/price/PrcProfitReportMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcProfitReportMapper.xml @@ -197,6 +197,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + and p.product_name like concat('%', #{productName}, '%') + + + and p.country_name like concat('%', #{countryName}, '%') + diff --git a/bms-front/src/views/report/profit/index.vue b/bms-front/src/views/report/profit/index.vue index 524542bc..cc0df466 100644 --- a/bms-front/src/views/report/profit/index.vue +++ b/bms-front/src/views/report/profit/index.vue @@ -46,6 +46,28 @@ + + + + + + + + + + + + + + + + + + + + + + - + @@ -119,10 +141,7 @@
- - - - + 订单明细
- - + + + + + + + + + + + + + + + + + + + + + + +
@@ -212,35 +207,6 @@ /> - - - - - - - - - - - - - - - - - - - - - - - @@ -309,15 +275,14 @@