Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'

* fix bug 20234,20022

See merge request easycorp/zentaopms!2072
This commit is contained in:
王怡栋
2022-03-04 06:38:10 +00:00
4 changed files with 21 additions and 2 deletions
+2 -1
View File
@@ -3152,6 +3152,7 @@ class taskModel extends model
$value = round($task->$id, 1);
$title = " title='{$value} {$this->lang->execution->workHour}'";
}
if($id == 'lane') $title = " title='{$task->lane}'";
echo "<td class='" . $class . "'" . $title . ">";
if($this->config->edition != 'open') $this->loadModel('flow')->printFlowCell('task', $task, $id);
@@ -3220,7 +3221,7 @@ class taskModel extends model
$this->printAssignedHtml($task, $users);
break;
case 'lane':
echo trim($task->lane);
echo mb_substr($task->lane, 0, 8);
break;
case 'assignedDate':
echo substr($task->assignedDate, 5, 11);