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

Merge branch 'zentaopms_239_tanghucheng_69000' into 'zentaopms_239'

Browse Source 
* Finish task #69001.

See merge request easycorp/zentaopms!5329
This commit is contained in:
刘刚
2022-09-14 09:42:28 +00:00
parent c19e0c7428 710b11ff0c
commit 46db1983ad
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/project/ext/view/create.html.php
+1
View File
@@ -87,6 +87,7 @@
<?php
echo html::hidden('model', $model);
echo html::hidden('vision', 'lite');
echo html::hidden('hasProduct', 1);
echo html::hidden('parent', 0);
echo html::submitButton();
echo $gobackLink ? html::a($gobackLink, $lang->goback, '', 'class="btn btn-wide"') : html::backButton();
module/project/config.php
+1 -1
View File
@@ -11,7 +11,7 @@ $config->project->editor->activate = array('id' => 'comment', 'tools' => 'simple
$config->project->editor->view = array('id' => 'lastComment', 'tools' => 'simpleTools');
$config->project->list = new stdclass();
$config->project->list->exportFields = 'id,parent,code,name,linkedProducts,status,begin,end,budget,PM,end,desc';
$config->project->list->exportFields = 'id,parent,code,name,hasProduct,linkedProducts,status,begin,end,budget,PM,end,desc';
$config->project->create = new stdclass();
$config->project->edit = new stdclass();
module/project/control.php
+12 -5
View File
@@ -46,6 +46,7 @@ class project extends control
/* Create field lists. */
$fields = $this->post->exportFields ? $this->post->exportFields : explode(',', $projectConfig->list->exportFields);
foreach($fields as $key => $fieldName)
{
$fieldName = trim($fieldName);
@@ -53,6 +54,8 @@ class project extends control
unset($fields[$key]);
}
if(isset($fields['hasProduct'])) $fields['hasProduct'] = $projectLang->type;
$involved = $this->cookie->involved ? $this->cookie->involved : 0;
$projects = $this->project->getInfoList($status, $orderBy, '', $involved);
$users = $this->loadModel('user')->getPairs('noletter');
@@ -60,15 +63,19 @@ class project extends control
$this->loadModel('product');
foreach($projects as $i => $project)
{
$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->parent = $project->parentName;
$hasProduct = $project->hasProduct;
$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->parent = $project->parentName;
$project->hasProduct = zget($projectLang->projectTypeList, $project->hasProduct);
$linkedProducts = $this->product->getProducts($project->id, 'all', '', false);
$project->linkedProducts = implode('，', $linkedProducts);
if(!$hasProduct) $project->linkedProducts = '';
if($this->post->exportType == 'selected')
{
$checkedItem = $this->cookie->checkedItem;