From 42d12a3fa39c9ade3d2c9f8a53ee388ed4dd3d51 Mon Sep 17 00:00:00 2001 From: caojia <1301869380@qq.com> Date: Tue, 3 Nov 2026 14:19:20 +0800 Subject: [PATCH 1/5] =?UTF-8?q?:fire:=20=E7=A7=BB=E9=99=A4=E6=AF=9B?= =?UTF-8?q?=E5=88=A9=E5=88=86=E6=9E=90=E6=95=B0=E6=8D=AE=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PrcProfitReportServiceImpl.java | 4 ---- .../mapper/price/PrcProfitReportMapper.xml | 17 ----------------- 2 files changed, 21 deletions(-) diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcProfitReportServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcProfitReportServiceImpl.java index 2fb489a3..6e1b5cad 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcProfitReportServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcProfitReportServiceImpl.java @@ -7,7 +7,6 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; // 提成功能暂停使用：import org.springframework.transaction.annotation.Transactional; -import com.bms.common.annotation.DataScope; import com.bms.common.exception.ServiceException; import com.bms.common.utils.SecurityUtils; // 提成功能暂停使用：import com.bms.price.domain.PrcProfitCommissionRate; @@ -35,7 +34,6 @@ public class PrcProfitReportServiceImpl implements IPrcProfitReportService */ @Override - @DataScope(deptAlias = "su", deptField = "dept_id", userAlias = "su", userField = "user_id", permission = "report:profit:list") public List selectOrderRows(PrcProfitReportQuery query) { normalizeMultiValueFilters(query); @@ -43,7 +41,6 @@ public class PrcProfitReportServiceImpl implements IPrcProfitReportService } @Override - @DataScope(deptAlias = "su", deptField = "dept_id", userAlias = "su", userField = "user_id", permission = "report:profit:list") public List selectProductRows(PrcProfitReportQuery query) { normalizeMultiValueFilters(query); @@ -51,7 +48,6 @@ public class PrcProfitReportServiceImpl implements IPrcProfitReportService } @Override - @DataScope(deptAlias = "su", deptField = "dept_id", userAlias = "su", userField = "user_id", permission = "report:profit:list") public List selectSummary(PrcProfitReportQuery query) { normalizeMultiValueFilters(query); 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 5904c397..6d363433 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 @@ -203,23 +203,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and (i.product_amount is null or i.redline_amount is null or i.sales_amount is null) - - and exists ( - select 1 - from sys_user su - where su.del_flag = '0' - and ( - (p.belong_saler_code is not null and p.belong_saler_code != '' - and (su.user_name = p.belong_saler_code collate utf8mb4_general_ci - or su.user_id = p.belong_saler_code + 0)) - or - (p.settlement_man_code is not null and p.settlement_man_code != '' - and (su.user_name = p.settlement_man_code collate utf8mb4_general_ci - or su.user_id = p.settlement_man_code + 0)) - ) - ${params.dataScope} - ) - From 229f1f9bad8f31f9818717fdf9b295ee21bc4db7 Mon Sep 17 00:00:00 2001 From: caojia <1301869380@qq.com> Date: Tue, 3 Nov 2026 14:31:06 +0800 Subject: [PATCH 2/5] =?UTF-8?q?:lipstick:=20=E8=B0=83=E6=95=B4=E6=AF=9B?= =?UTF-8?q?=E5=88=A9=E5=88=86=E6=9E=90=E7=AD=9B=E9=80=89=E9=A1=B9=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bms-front/src/views/report/profit/index.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bms-front/src/views/report/profit/index.vue b/bms-front/src/views/report/profit/index.vue index f7eea0bc..087bc175 100644 --- a/bms-front/src/views/report/profit/index.vue +++ b/bms-front/src/views/report/profit/index.vue @@ -27,14 +27,14 @@ - + @@ -53,14 +53,14 @@ - + From 844b501686a37e8c701ce4b8a071d787ac143c8f Mon Sep 17 00:00:00 2001 From: caojia <1301869380@qq.com> Date: Tue, 3 Nov 2026 15:58:00 +0800 Subject: [PATCH 3/5] =?UTF-8?q?:lipstick:=20=E8=B0=83=E6=95=B4=E4=BE=A7?= =?UTF-8?q?=E6=A0=8F=20Logo=20=E6=98=BE=E7=A4=BA=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bms-front/src/layout/components/Sidebar/Logo.vue | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/bms-front/src/layout/components/Sidebar/Logo.vue b/bms-front/src/layout/components/Sidebar/Logo.vue index 91cf95a7..65dc2c3f 100644 --- a/bms-front/src/layout/components/Sidebar/Logo.vue +++ b/bms-front/src/layout/components/Sidebar/Logo.vue @@ -75,10 +75,11 @@ const getLogoTextColor = computed(() => { width: 100%; & .sidebar-logo { - width: 32px; - height: 32px; + width: 96px; + height: 24px; + object-fit: contain; vertical-align: middle; - margin-right: 12px; + margin-right: 10px; } & .sidebar-title { @@ -95,8 +96,10 @@ const getLogoTextColor = computed(() => { &.collapse { .sidebar-logo { + width: 32px; + height: 32px; margin-right: 0px; } } } - \ No newline at end of file + From 86255c45f643c8f5d676062b291f1d29e1a58d42 Mon Sep 17 00:00:00 2001 From: caojia <1301869380@qq.com> Date: Tue, 3 Nov 2026 16:46:43 +0800 Subject: [PATCH 4/5] =?UTF-8?q?:wrench:=20=E5=B0=86=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=AF=B7=E6=B1=82=E8=B6=85=E6=97=B6=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=B8=BA20=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bms-front/src/utils/request.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bms-front/src/utils/request.js b/bms-front/src/utils/request.js index 04a3dcdb..e099e582 100644 --- a/bms-front/src/utils/request.js +++ b/bms-front/src/utils/request.js @@ -17,7 +17,7 @@ const service = axios.create({ // axios中请求配置有baseURL选项，表示请求URL公共部分 baseURL: import.meta.env.VITE_APP_BASE_API, // 超时 - timeout: 10000 + timeout: 20000 }) // request拦截器 From 6b78e13e5ca786f0dffbfa59e24daea08462356e Mon Sep 17 00:00:00 2001 From: caojia <1301869380@qq.com> Date: Tue, 3 Nov 2026 16:55:15 +0800 Subject: [PATCH 5/5] =?UTF-8?q?:sparkles:=20=E9=99=90=E5=88=B6=E5=BA=94?= =?UTF-8?q?=E6=94=B6=E8=B4=A6=E5=8D=95=E4=BB=85=E6=8B=89=E5=8F=96=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E4=B8=8A=E6=B8=B8=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/price/PrcOrderBillMapper.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/bms-back/bms-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml index 32b9ada4..81bea61b 100644 --- a/bms-back/bms-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml @@ -616,8 +616,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + and p.order_status in (3, 4, 5, 6, 7, 8, 11) + + + and ( exists ( select 1 from prc_income_bill_fee f @@ -685,6 +691,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" inner join prc_income_bill_fee f on f.bill_id = p.bill_id and f.ar_bill_status = #{feeArBillStatus} where p.customer_id = #{customerId} + and p.customer_code like concat('%', #{customerCode}, '%')