1
This commit is contained in:
2026-03-20 17:13:55 +08:00
parent cadecbe64c
commit 019e4abb61

View File

@ -3617,11 +3617,13 @@ export default function App() {
endDate: timelineResult.endDate.includes('未找到') ? timelineResult.endDate : formatDate(nodeEndTime, 'STORAGE_FORMAT')
};
}
nodeEndTime = adjustToNextWorkingHour(nodeEndTime, nodeCalculationMethod, processNode.weekendDays, nodeExcludedDates);
} else {
nodeEndTime = new Date(cumulativeTime);
if (forceEndTimeTo18 && nodeEndTime && !isNaN(nodeEndTime.getTime())) {
nodeEndTime = setTimeOfDay(nodeEndTime, 18, 0);
}
nodeEndTime = adjustToNextWorkingHour(nodeEndTime, nodeCalculationMethod, processNode.weekendDays, nodeExcludedDates);
if (timelineValue) {
if (nodeCalculationMethod === '内部') {
nodeStartTime = addInternalBusinessTime(nodeEndTime, -timelineValue, processNode.weekendDays, nodeExcludedDates);
@ -3893,6 +3895,7 @@ export default function App() {
if (shouldForceEndTimeTo18(result) && nodeEndTime && !isNaN(nodeEndTime.getTime())) {
nodeEndTime = setTimeOfDay(nodeEndTime, 18, 0);
}
nodeEndTime = adjustToNextWorkingHour(nodeEndTime, nodeCalculationMethod, nodeWeekendDays, nodeExcludedDates);
const actualEnd = opts?.ignoreActualCompletionDates
? null