From 83dab60040f7cf1368c68819c8c7790e0e4c4ee5 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Mon, 10 Nov 2025 15:42:44 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20Report=E5=A2=9E=E5=8A=A0=E5=AF=B9?= =?UTF-8?q?=E6=AF=94=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Index.jsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/views/report/Index.jsx b/src/views/report/Index.jsx index ec926ca..a3ffbbc 100644 --- a/src/views/report/Index.jsx +++ b/src/views/report/Index.jsx @@ -252,7 +252,7 @@ function Index() { title: 'Transaction Amount(USD)', dataIndex: 'AmountUSD', key: 'AmountUSD', - render: (value, { diff }) => <>{comm.formatPrice(value)}, + render: (value, { diff }) => <>{comm.formatPrice(value)}, // }, { @@ -374,11 +374,12 @@ function Index() { const onGetData = async (formVal) => { reset(); + const fixDate1 = dayjs(formVal.startdate).startOf('month').format(DATE_FORMAT); const fixDiff1 = dayjs(formVal.datesDiff1).startOf('month').format(DATE_FORMAT); const res = await Promise.all([ - getHWVendorScores(formVal.agency || travelAgencyId, formVal.startdate, formVal.enddate), - getHWProductScores(formVal.agency || travelAgencyId, formVal.startdate, formVal.enddate), - getHWCommendScores(formVal.agency || travelAgencyId, formVal.startdate, formVal.enddate), + getHWVendorScores(formVal.agency || travelAgencyId, fixDate1, formVal.enddate), + getHWProductScores(formVal.agency || travelAgencyId, fixDate1, formVal.enddate), + getHWCommendScores(formVal.agency || travelAgencyId, fixDate1, formVal.enddate), ...(comm.isEmpty(formVal.datesDiff1) ? [] : [ getHWVendorScores(formVal.agency || travelAgencyId, fixDiff1, formVal.datesDiff2, true), getHWProductScores(formVal.agency || travelAgencyId, fixDiff1, formVal.datesDiff2, true),