Merge branch 'master_xieqiyu_kanban' into 'master'

Master xieqiyu kanban

See merge request easycorp/zentaopms!4398
This commit is contained in:
王怡栋
2022-07-07 05:10:07 +00:00
3 changed files with 81 additions and 10 deletions
+13
View File
@@ -3181,6 +3181,19 @@ class execution extends control
}
return $this->send($response);
}
$execution = $this->execution->getByID($executionID);
if($this->app->tab == 'execution' and $execution->type == 'kanban')
{
$execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
$execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
$rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
$kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
$kanbanData = json_encode($kanbanData);
return print(js::closeModal('parent', '', "parent.updateKanban($kanbanData)"));
}
return print(js::reload('parent'));
}
}