From ea27a3213f1b786445317c7bd5a6472518bbc79e Mon Sep 17 00:00:00 2001 From: ylj20011123 Date: Wed, 10 Sep 2025 18:25:57 +0800 Subject: [PATCH] update --- package.json | 2 +- .../reports/revenueConfirmation/components/compareList.tsx | 6 +++--- .../settlementAccount/component/YearExamineDetailTable.tsx | 4 ++++ src/versionEnv.ts | 6 +++--- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index cbe8cab..cfc56f4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ant-design-pro", - "version": "4.5.53", + "version": "4.5.54", "private": true, "description": "An out-of-box UI solution for enterprise applications", "scripts": { diff --git a/src/pages/reports/revenueConfirmation/components/compareList.tsx b/src/pages/reports/revenueConfirmation/components/compareList.tsx index 69c0f46..f3ea017 100644 --- a/src/pages/reports/revenueConfirmation/components/compareList.tsx +++ b/src/pages/reports/revenueConfirmation/components/compareList.tsx @@ -2054,8 +2054,11 @@ const compareList: React.FC<{ MobilePayCorrect: MobilePayCorrect || 0, CashPayCorrect: CashPayCorrect || 0 } + console.log('reqreqrsdasda', req); + const data = await handleGetProjectPeriodIncome(req) console.log('data3232', data) + console.log('compareCurrent3232', compareCurrent) if (data && data.length > 0) { const secondItem: any = data[0] @@ -2157,9 +2160,6 @@ const compareList: React.FC<{ } } - - - // setSecondTable([data[0]]) } if (handleGetRefreshTableData) { handleGetRefreshTableData() diff --git a/src/pages/reports/settlementAccount/component/YearExamineDetailTable.tsx b/src/pages/reports/settlementAccount/component/YearExamineDetailTable.tsx index 7baff1d..b3d15ce 100644 --- a/src/pages/reports/settlementAccount/component/YearExamineDetailTable.tsx +++ b/src/pages/reports/settlementAccount/component/YearExamineDetailTable.tsx @@ -2422,6 +2422,10 @@ const YearExamineDetailTable = ({ parentRow, currentApprovalstate, onRef, setIsS if (isFirst.current) { isFirst.current = false + console.log('isShowClosebtn.currentisShowClosebtn.current', isShowClosebtn.current); + console.log('parentRowparentRowparentRowparentRow', parentRow); + + if (isYear && isShowClosebtn.current && parentRow?.PeriodClosed) { handleCloseSettlement(closeReqTableDataRef.current) } else if (isShowClosebtn.current && parentRow?.CLOSED_DATE && !isYear && parentRow?.PeriodClosed) { diff --git a/src/versionEnv.ts b/src/versionEnv.ts index 20eb4d1..4054db1 100644 --- a/src/versionEnv.ts +++ b/src/versionEnv.ts @@ -1,4 +1,4 @@ // 由 scripts/writeVersion.js 自动生成 -export const VERSION = "4.5.53"; -export const GIT_HASH = "4073d23"; -export const BUILD_TIME = "2025-09-09T01:03:58.611Z"; +export const VERSION = "4.5.54"; +export const GIT_HASH = "26ef480"; +export const BUILD_TIME = "2025-09-10T08:05:17.397Z";