Merge branch release/21.7.5 of zentao/zentaopms (#11170)
This commit is contained in:
@@ -3127,6 +3127,8 @@ class taskModel extends model
|
||||
$now = helper::now();
|
||||
if($team->status == 'done')
|
||||
{
|
||||
if(isset($oldTask->team[$currentTeam->id])) $oldTask->team[$currentTeam->id]->status = $team->status; // 通过开始直接完成的情况,status会变成done
|
||||
|
||||
$task->assignedTo = $this->getAssignedTo4Multi($oldTask->team, $oldTask, 'current');
|
||||
$task->assignedDate = $now;
|
||||
}
|
||||
|
||||
@@ -100,7 +100,7 @@ formGridPanel
|
||||
(
|
||||
set::tagName('div'),
|
||||
setID('teamTable'),
|
||||
set::mode('add'),
|
||||
set::mode(!empty($task->team) ? 'edit' : 'add'),
|
||||
!empty($task->team) ? set::data(array_values($task->team)) : null,
|
||||
set::sortable(true),
|
||||
set::size('sm'),
|
||||
|
||||
Reference in New Issue
Block a user