From 75b4dae712fe3b11b2f9f68c34468ab71a677e34 Mon Sep 17 00:00:00 2001 From: wjh Date: Mon, 22 Apr 2024 16:26:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=93=E7=AE=97=E8=A1=A8=E6=9C=AC?= =?UTF-8?q?=E6=9C=9F=E6=98=8E=E7=BB=86=E6=98=BE=E7=A4=BA=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E4=B8=BA0=E7=9A=84=E5=86=85=E5=AE=B9=20(#796)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: sealday Reviewed-on: https://git.daoyoucloud.com/daoyoucloud/tachybase/pulls/796 Co-authored-by: wjh Co-committed-by: wjh --- .changeset/short-guests-tickle.md | 5 +++++ .../plugin-rental/src/server/services/settlement-service.ts | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 .changeset/short-guests-tickle.md diff --git a/.changeset/short-guests-tickle.md b/.changeset/short-guests-tickle.md new file mode 100644 index 000000000..f065f16bd --- /dev/null +++ b/.changeset/short-guests-tickle.md @@ -0,0 +1,5 @@ +--- +"@hera/plugin-rental": patch +--- + +结算单本期明细显示数据为0的内容 diff --git a/packages/plugins/@hera/plugin-rental/src/server/services/settlement-service.ts b/packages/plugins/@hera/plugin-rental/src/server/services/settlement-service.ts index 80b771516..9f6ac4eef 100644 --- a/packages/plugins/@hera/plugin-rental/src/server/services/settlement-service.ts +++ b/packages/plugins/@hera/plugin-rental/src/server/services/settlement-service.ts @@ -668,7 +668,7 @@ export class SettlementService { const recordsCategoryFeeItem = feeData(createFeesDatas, settlementAbout, 'category'); const recordsProductFeeItem = feeData(createFeesDatas, settlementAbout, 'product'); //本期信息 - let createDatas = [ + const createDatas = [ ...createCategoryDatasItem.list, ...createProductDatasItem.list, ...recordsCategoryFeeItem, @@ -677,7 +677,6 @@ export class SettlementService { createDatas.sort((a, b) => { return new Date(a.date).getTime() - new Date(b.date).getTime(); }); - createDatas = createDatas.filter((value) => value.name.includes('$$') || value.count); //筛选历史结存 createCategoryDatasItem.history = createCategoryDatasItem.history?.filter((value) => value.count); createProductDatasItem.history = createProductDatasItem.history?.filter(