Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247

This commit is contained in:
tianshujie
2022-10-20 08:54:08 +08:00
11 changed files with 31 additions and 25 deletions
+5 -5
View File
@@ -4059,14 +4059,14 @@ class taskModel extends model
}
}
$list .= '</td>';
$list .= '<td>' . zget($users, $task->assignedTo, '') . '</td>';
$list .= "<td class='status-{$task->status} text-center'>" . $this->processStatus('task', $task) . '</td>';
$list .= '<td></td>';
$list .= '<td>' . zget($users, $task->assignedTo, '') . '</td>';
$list .= helper::isZeroDate($task->estStarted) ? '<td class="c-date"></td>' : '<td class="c-date">' . $task->estStarted . '</td>';
$list .= helper::isZeroDate($task->deadline) ? '<td class="c-date"></td>' : '<td class="c-date">' . $task->deadline . '</td>';
$list .= '<td>' . $task->estimate . $this->lang->execution->workHourUnit . '</td>';
$list .= '<td>' . $task->consumed . $this->lang->execution->workHourUnit . '</td>';
$list .= '<td>' . $task->left . $this->lang->execution->workHourUnit . '</td>';
$list .= '<td class="hours text-right">' . $task->estimate . $this->lang->execution->workHourUnit . '</td>';
$list .= '<td class="hours text-right">' . $task->consumed . $this->lang->execution->workHourUnit . '</td>';
$list .= '<td class="hours text-right">' . $task->left . $this->lang->execution->workHourUnit . '</td>';
$list .= '<td></td>';
$list .= '<td></td>';
$list .= '<td class="c-actions">';
$list .= $this->buildOperateMenu($task, 'browse');