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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289

Browse Source
This commit is contained in:
guofeilong
2023-02-24 13:47:19 +08:00
parent 220a047bc3 b227ebdfcf
commit c62dbb7792
39 changed files with 615 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
-1
View File
@@ -84,7 +84,6 @@ class project extends control
$project->PM = zget($users, $project->PM);
$project->status = $this->processStatus('project', $project);
$project->model = zget($projectLang->modelList, $project->model);
$project->budget = $project->budget . zget($projectLang->unitList, $project->budgetUnit);
$project->budget = $project->budget != 0 ? $project->budget . zget($projectLang->unitList, $project->budgetUnit) : $this->lang->project->future;
$project->parent = $project->parentName;
$project->hasProduct = zget($projectLang->projectTypeList, $project->hasProduct);
module/project/model.php
+1 -1
View File
@@ -2624,7 +2624,7 @@ class projectModel extends model
$this->loadModel('program');
$projects = $this->program->getProjectStats(0, 'all', 0, 'order_asc');
$executions = $this->loadModel('execution')->getStatData(0, 'doing');
$executions = $this->loadModel('execution')->getStatData(0, 'doing', 0, 0, false, 'hasParentName|skipParent');
$doingExecutions = array();
$latestExecutions = array();