Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug $26002,25249

Browse Source
This commit is contained in:
liuyongkai
2022-08-05 03:08:10 +00:00
parent 7ca2f66a28
commit 8837c4c100
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+9 -2
View File
@@ -3782,6 +3782,7 @@ class taskModel extends model
*/
public function buildNestedList($execution, $task, $isChild = false, $showmore = false, $users = array())
{
$today = helper::today();
$showmore = $showmore ? 'showmore' : '';
$trAttrs = "data-id='t$task->id'";
if(!$isChild)
@@ -3809,8 +3810,14 @@ class taskModel extends model
$list .= helper::isZeroDate($task->estStarted) ? '<td></td>' : '<td>' . $task->estStarted . '</td>';
if(!helper::isZeroDate($task->deadline))
{
$today = helper::today();
$list .= strtotime($today) > strtotime($task->deadline) ? '<td class="delayed">' . $task->deadline . '</td>' : '<td>' . $task->deadline . '</td>';
if($task->status != 'done')
{
$list .= strtotime($today) > strtotime($task->deadline) ? '<td class="delayed" title="已延期">' . $task->deadline . '</td>' : '<td>' . $task->deadline . '</td>';
}
else
{
$list .= '<td>' . $task->deadline . '</td>';
}
}
else
{