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

Merge branch release/21.7.7 of zentao/zentaopms (#12314)

Browse Source
This commit is contained in:
刘刚
2025-11-13 09:35:55 +08:00
committed by Gitfox
parent 5d0d537257 53b6007d85
commit 35201cee33
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+4 -3
View File
@@ -3041,6 +3041,7 @@ class execution extends control
*/
public function export(string $status, int $productID, string $orderBy, string $from)
{
$status = strtolower($status);
if($_POST)
{
$executionLang = $this->lang->execution;
@@ -3067,10 +3068,10 @@ class execution extends control
$users = $this->loadModel('user')->getPairs('noletter');
$showTask = ($this->app->tab == 'project' && (bool)$this->cookie->showTask);
if($showTask && strtolower($status) == 'bysearch')
if($showTask && $status == 'bysearch')
{
$executionIdList = $this->loadModel('programplan')->getStageList($projectID, $productID, 'all', 'order');
$tasks = $this->programplan->getGanttTasks($projectID, array_keys($executionIdList), strtolower($status), 0, null);
$tasks = $this->programplan->getGanttTasks($projectID, array_keys($executionIdList), $status, 0, null);
$executionTasks = array();
$executionIdList = array();
foreach($tasks as $task)
@@ -3149,7 +3150,7 @@ class execution extends control
$fileName = $project->name . ' - ' . $executionConcept;
}
if($status != 'bysearch') $fileName = (in_array($status, array('all', 'undone', 'delayed')) ? $this->lang->execution->$status : $this->lang->execution->statusList[$status]) . $executionConcept;
if($status != 'bysearch') $fileName = (in_array($status, array('all', 'undone', 'delayed')) ? zget($this->lang->execution, $status, '') : zget($this->lang->execution->statusList, $status, '')) . $executionConcept;
$this->view->fileName = !empty($fileName) ? $fileName : $executionConcept;
$this->display();
}