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

* [task#142093,done,1h] add execution deliverable col.

Browse Source
This commit is contained in:
sunguangming
2025-04-28 13:54:37 +08:00
committed by 刘刚
parent a97d1c7fb9
commit 586d4dcce0
4 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/config/dtable.php
+11
View File
@@ -49,6 +49,17 @@ $config->execution->dtable->fieldList['status']['width'] = '80';
$config->execution->dtable->fieldList['status']['group'] = '1';
$config->execution->dtable->fieldList['status']['show'] = true;
if(in_array($config->edition, array('max', 'ipd')))
{
$config->execution->dtable->fieldList['deliverable']['title'] = $lang->execution->deliverableAbbr;
$config->execution->dtable->fieldList['deliverable']['name'] = 'deliverable';
$config->execution->dtable->fieldList['deliverable']['type'] = 'html';
$config->execution->dtable->fieldList['deliverable']['width'] = '100px';
$config->execution->dtable->fieldList['deliverable']['group'] = '1';
$config->execution->dtable->fieldList['deliverable']['show'] = true;
$config->execution->dtable->fieldList['deliverable']['sortType'] = false;
}
$config->execution->dtable->fieldList['PM']['title'] = $lang->execution->execPM;
$config->execution->dtable->fieldList['PM']['name'] = 'PM';
$config->execution->dtable->fieldList['PM']['type'] = 'avatarBtn';
module/execution/control.php
+1
View File
@@ -2873,6 +2873,7 @@ class execution extends control
$this->app->loadLang('stage');
$this->app->loadLang('programplan');
$this->loadModel('product');
$this->loadModel('project');
$this->loadModel('datatable');
$from = $this->app->tab;
module/execution/model.php
+3 -1
View File
@@ -1431,7 +1431,7 @@ class executionModel extends model
$executionQuery = $browseType == 'bySearch' ? $this->getExecutionQuery($param) : '';
$projectModel = $this->dao->select('model')->from(TABLE_PROJECT)->where('id')->eq($projectID)->fetch('model');
return $this->dao->select('t1.*,t2.name projectName, t2.model as projectModel')->from(TABLE_EXECUTION)->alias('t1')
return $this->dao->select('t1.*,t1.deliverable,t2.name projectName, t2.model as projectModel')->from(TABLE_EXECUTION)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
->beginIF($productID)->leftJoin(TABLE_PROJECTPRODUCT)->alias('t3')->on('t1.id=t3.project')->fi()
->where('t1.type')->in('sprint,stage,kanban')
@@ -4808,6 +4808,8 @@ class executionModel extends model
$execution->PMAvatar = zget($avatarList, $execution->PMAccount, '');
}
if(in_array($this->config->edition, array('max', 'ipd'))) $execution->deliverable = $this->project->countDeliverable($execution, 'execution');
$rows[$execution->id] = $execution;
/* Append tasks and child stages. */
module/project/config/dtable.php
+11
View File
@@ -200,6 +200,17 @@ $config->project->execution->dtable->fieldList['status']['width'] = '80';
$config->project->execution->dtable->fieldList['status']['group'] = '1';
$config->project->execution->dtable->fieldList['status']['show'] = true;
if(in_array($config->edition, array('max', 'ipd')))
{
$config->project->execution->dtable->fieldList['deliverable']['title'] = $lang->project->deliverableAbbr;
$config->project->execution->dtable->fieldList['deliverable']['name'] = 'deliverable';
$config->project->execution->dtable->fieldList['deliverable']['type'] = 'html';
$config->project->execution->dtable->fieldList['deliverable']['width'] = '100px';
$config->project->execution->dtable->fieldList['deliverable']['group'] = '1';
$config->project->execution->dtable->fieldList['deliverable']['show'] = true;
$config->project->execution->dtable->fieldList['deliverable']['sortType'] = false;
}
$config->project->execution->dtable->fieldList['PM']['title'] = $lang->project->PM;
$config->project->execution->dtable->fieldList['PM']['name'] = 'PM';
$config->project->execution->dtable->fieldList['PM']['type'] = 'avatarBtn';