diff --git a/package.json b/package.json index 07630bb..8e197a9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ant-design-pro", - "version": "4.5.71", + "version": "4.5.73", "private": true, "description": "An out-of-box UI solution for enterprise applications", "scripts": { diff --git a/src/pages/User/login/index.tsx b/src/pages/User/login/index.tsx index 6ad64b0..092a032 100644 --- a/src/pages/User/login/index.tsx +++ b/src/pages/User/login/index.tsx @@ -159,16 +159,6 @@ const Login: React.FC = (props) => { } }, []) - - function successCallback(position: { coords: { latitude: any; longitude: any; }; }) { - const latitude = position.coords.latitude; - const longitude = position.coords.longitude; - } - - function errorCallback(error) { - } - - function getBrowserVersion() { const userAgent: string = navigator.userAgent; let version: any = ""; diff --git a/src/pages/reports/revenueConfirmation/components/compareList.tsx b/src/pages/reports/revenueConfirmation/components/compareList.tsx index d210f8a..5b0d448 100644 --- a/src/pages/reports/revenueConfirmation/components/compareList.tsx +++ b/src/pages/reports/revenueConfirmation/components/compareList.tsx @@ -2916,13 +2916,20 @@ const compareList: React.FC<{ }}> 重新申请 : - compareCurrent?.PEND_STATE === 0 ? + // pend_state 为 0 是原先的按钮判断 后面 是添加 当前如果是12月份 12月份还没过完 不让它进行 发起结算的操作 + compareCurrent?.PEND_STATE === 0 && moment().format('YYYY/MM') !== compareCurrent?.STATISTICS_MONTH ? { console.log('compareCurrent', compareCurrent); console.log('lastMonthIsOverlastMonthIsOverlastMonthIsOver', lastMonthIsOver); console.log('MonthSettlementRefMonthSettlementRefMonthSettlementRef', MonthSettlementRef); + + // if (moment().format('YYYY/MM') === compareCurrent?.STATISTICS_MONTH) { + // message.error('未到结算日期，无法发起结算！') + // return + // } + if (lastMonthIsOver) { // 是否显示下面四项为0的时候的询问框 let showNotice: any = false diff --git a/src/pages/reports/settlementAccount/component/YearExamineDetailTable.tsx b/src/pages/reports/settlementAccount/component/YearExamineDetailTable.tsx index 4b529d6..ccbe9b6 100644 --- a/src/pages/reports/settlementAccount/component/YearExamineDetailTable.tsx +++ b/src/pages/reports/settlementAccount/component/YearExamineDetailTable.tsx @@ -2816,7 +2816,8 @@ const YearExamineDetailTable = ({ parentRow, currentApprovalstate, onRef, setIsS {/* 判断当期项目 是不是最后一期 是最后一期的话 就显示 历史期的数据 */} {/* */} { - parentRow?.PROJECT_ENDDATE && parentRow?.ENDDATE && moment(parentRow?.PROJECT_ENDDATE).format('YYYY-MM-DD') === moment(parentRow?.ENDDATE).format('YYYY-MM-DD') && parentRow?.BUSINESSAPPROVAL_ID > 0 ? + // parentRow?.PROJECT_ENDDATE && parentRow?.ENDDATE && moment(parentRow?.PROJECT_ENDDATE).format('YYYY-MM-DD') === moment(parentRow?.ENDDATE).format('YYYY-MM-DD') && parentRow?.BUSINESSAPPROVAL_ID > 0 ? + parentRow?.ProjectExit ? : "" } diff --git a/src/pages/reports/settlementAccount/component/afterSettlement.tsx b/src/pages/reports/settlementAccount/component/afterSettlement.tsx index 42d1e1a..9030f99 100644 --- a/src/pages/reports/settlementAccount/component/afterSettlement.tsx +++ b/src/pages/reports/settlementAccount/component/afterSettlement.tsx @@ -561,7 +561,8 @@ const AfterSettlement = ({ parentRow, dataRef, onShow, setIsFinishCalibration, o { - parentRow?.PROJECT_ENDDATE && parentRow?.ENDDATE && moment(parentRow?.PROJECT_ENDDATE).format('YYYY-MM-DD') === moment(parentRow?.ENDDATE).format('YYYY-MM-DD') ? + // parentRow?.PROJECT_ENDDATE && parentRow?.ENDDATE && moment(parentRow?.PROJECT_ENDDATE).format('YYYY-MM-DD') === moment(parentRow?.ENDDATE).format('YYYY-MM-DD') ? + parentRow?.ProjectExit ? : "" } diff --git a/src/pages/reports/settlementAccount/index.tsx b/src/pages/reports/settlementAccount/index.tsx index 6720f5d..d734234 100644 --- a/src/pages/reports/settlementAccount/index.tsx +++ b/src/pages/reports/settlementAccount/index.tsx @@ -84,7 +84,8 @@ const settlementAccount: React.FC<{ currentUser: CurrentUser }> = (props) => { } return record?.BUSINESSPROJECT_NAME ? indexStr > 0 ? { - new Date(record?.PROJECT_ENDDATE).getTime() < new Date().getTime() ? + // new Date(record?.PROJECT_ENDDATE).getTime() < new Date().getTime() ? + record?.ProjectExit ? 【退场项目】 : @@ -103,7 +104,8 @@ const settlementAccount: React.FC<{ currentUser: CurrentUser }> = (props) => { : { - new Date(record?.PROJECT_ENDDATE).getTime() < new Date().getTime() ? + // new Date(record?.PROJECT_ENDDATE).getTime() < new Date().getTime() ? + record?.ProjectExit ? 【退场项目】 : diff --git a/src/utils/format.ts b/src/utils/format.ts index 61bf52f..84ace0c 100644 --- a/src/utils/format.ts +++ b/src/utils/format.ts @@ -212,7 +212,8 @@ export const handleNewPrint = (printName: string, title: string, neckBox?: any, // styles 获取页面的样式 // tableDom 要打印显示的表格 直接dom元素拿进来(处理好的) // footer 打印内容底部的自定义样式 需求不一样 样式也不一样 外面写好样式和标签直接传入 - const printWindow = window.open('', '_blank', 'width=1400,height=800'); + // const printWindow = window.open('', '_blank', 'width=1400,height=800'); + const printWindow = window.open('about:blank', '_blank', 'width=1400,height=800'); if (printWindow) { printWindow.document.open(); printWindow.document.write(` diff --git a/src/versionEnv.ts b/src/versionEnv.ts index 7b7742b..791f454 100644 --- a/src/versionEnv.ts +++ b/src/versionEnv.ts @@ -1,4 +1,4 @@ // 由 scripts/writeVersion.js 自动生成 -export const VERSION = "4.5.71"; -export const GIT_HASH = "51b2e91"; -export const BUILD_TIME = "2025-11-26T02:50:02.357Z"; +export const VERSION = "4.5.73"; +export const GIT_HASH = "dde90fb"; +export const BUILD_TIME = "2025-12-03T10:27:22.507Z";