Merge branch dev/bug-63548 of zentao/zentaopms (#9945)

This commit is contained in:
刘刚
2025-06-26 15:25:03 +08:00
committed by Gitfox
+8 -3
View File
@@ -76,8 +76,12 @@ $hiddenTeam = $task->mode != '' ? '' : 'hidden';
$disabledEstStarted = $project && $project->taskDateLimit == 'limit' && !empty($parentTask) && helper::isZeroDate($parentTask->estStarted);
$disabledDeadline = $project && $project->taskDateLimit == 'limit' && !empty($parentTask) && helper::isZeroDate($parentTask->deadline);
$execution->canStartExecution = $this->loadModel('execution')->checkStageStatus($execution->id, 'start');
$task->executionInfo = $execution;
/* 检查是否可以开始执行。*/
if($this->config->edition == 'ipd')
{
$execution->canStartExecution = $this->loadModel('execution')->checkStageStatus($execution->id, 'start');
$task->executionInfo = $execution;
}
if($task->status == 'wait') unset($statusOptions['pause']);
@@ -120,6 +124,7 @@ detailHeader
)
);
$recordWorkhourDisabled = !empty($task->children) ? 'disabled' : '';
detailBody
(
set::isForm(true),
@@ -528,7 +533,7 @@ detailBody
),
$this->task->isClickable($task, 'recordWorkhour') ? btn
(
setClass('ghost text-primary', !empty($task->children) ? 'disabled' : true),
setClass('ghost text-primary', $recordWorkhourDisabled),
icon('time'),
set::href(inlink('recordWorkhour', "id={$task->id}&from=edittask")),
setData('toggle', 'modal')