Merge branch 'master_liuhong_35865' into 'master'

Master liuhong 35865

See merge request easycorp/zentaopms!4857
This commit is contained in:
王怡栋
2022-08-09 05:34:18 +00:00
5 changed files with 9 additions and 8 deletions
+1 -1
View File
@@ -4369,7 +4369,7 @@ class executionModel extends model
}
echo empty($execution->children) ? html::a(helper::createLink('execution', 'view', "executionID=$execution->id"), $execution->name) : $execution->name;
echo '<td>' . zget($users, $execution->PM) . '</td>';
echo "<td class='status-{$execution->status}'>" . zget($this->lang->project->statusList, $execution->status) . '</td>';
echo "<td class='status-{$execution->status} text-center'>" . zget($this->lang->project->statusList, $execution->status) . '</td>';
echo '<td>' . html::ring($execution->hours->progress) . '</td>';
echo helper::isZeroDate($execution->begin) ? '<td></td>' : '<td>' . $execution->begin . '</td>';
if(!helper::isZeroDate($execution->end))