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

* Fix bug #44964.

Browse Source
This commit is contained in:
leiyong
2024-01-30 09:12:39 +00:00
parent bc908c3ae5
commit a006e4b05d
8 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/stakeholder/config/table.php
+12 -5
View File
@@ -26,29 +26,36 @@ $config->stakeholder->dtable->fieldList['from']['show'] = true;
$config->stakeholder->dtable->fieldList['from']['group'] = 2;
$config->stakeholder->dtable->fieldList['from']['width'] = '100px';
$config->stakeholder->dtable->fieldList['role']['title'] = $lang->stakeholder->role;
$config->stakeholder->dtable->fieldList['role']['name'] = 'role';
$config->stakeholder->dtable->fieldList['role']['type'] = 'text';
$config->stakeholder->dtable->fieldList['role']['show'] = true;
$config->stakeholder->dtable->fieldList['role']['group'] = 3;
$config->stakeholder->dtable->fieldList['role']['map'] = $lang->user->roleList;
$config->stakeholder->dtable->fieldList['phone']['title'] = $lang->stakeholder->phone;
$config->stakeholder->dtable->fieldList['phone']['name'] = 'phone';
$config->stakeholder->dtable->fieldList['phone']['type'] = 'text';
$config->stakeholder->dtable->fieldList['phone']['show'] = true;
$config->stakeholder->dtable->fieldList['phone']['group'] = 3;
$config->stakeholder->dtable->fieldList['phone']['group'] = 4;
$config->stakeholder->dtable->fieldList['qq']['title'] = $lang->stakeholder->qq;
$config->stakeholder->dtable->fieldList['qq']['name'] = 'qq';
$config->stakeholder->dtable->fieldList['qq']['type'] = 'text';
$config->stakeholder->dtable->fieldList['qq']['show'] = true;
$config->stakeholder->dtable->fieldList['qq']['group'] = 4;
$config->stakeholder->dtable->fieldList['qq']['group'] = 5;
$config->stakeholder->dtable->fieldList['weixin']['title'] = $lang->stakeholder->weixin;
$config->stakeholder->dtable->fieldList['weixin']['name'] = 'weixin';
$config->stakeholder->dtable->fieldList['weixin']['type'] = 'text';
$config->stakeholder->dtable->fieldList['weixin']['show'] = true;
$config->stakeholder->dtable->fieldList['weixin']['group'] = 5;
$config->stakeholder->dtable->fieldList['weixin']['group'] = 6;
$config->stakeholder->dtable->fieldList['email']['title'] = $lang->stakeholder->email;
$config->stakeholder->dtable->fieldList['email']['name'] = 'email';
$config->stakeholder->dtable->fieldList['email']['type'] = 'text';
$config->stakeholder->dtable->fieldList['email']['show'] = true;
$config->stakeholder->dtable->fieldList['email']['group'] = 6;
$config->stakeholder->dtable->fieldList['email']['group'] = 7;
$config->stakeholder->dtable->fieldList['actions']['title'] = $lang->actions;
$config->stakeholder->dtable->fieldList['actions']['name'] = 'actions';
@@ -58,4 +65,4 @@ $config->stakeholder->dtable->fieldList['actions']['fixed'] = 'right';
$config->stakeholder->dtable->fieldList['actions']['list'] = $config->stakeholder->actionList;
$config->stakeholder->dtable->fieldList['actions']['menu'] = $config->stakeholder->menu ?? array_keys($config->stakeholder->actionList);
$config->stakeholder->dtable->fieldList['actions']['required'] = true;
$config->stakeholder->dtable->fieldList['actions']['group'] = 7;
$config->stakeholder->dtable->fieldList['actions']['group'] = 8;
module/stakeholder/control.php
+1
View File
@@ -17,6 +17,7 @@ class stakeholder extends control
*/
public function browse(int $projectID, string $browseType = 'all', string $orderBy = 'id_desc', int $recTotal = 0, int $recPerPage = 20, int $pageID = 1)
{
$this->loadLang('user');
$this->loadModel('project')->setMenu($projectID);
/* Get stake holders list. */
module/stakeholder/lang/de.php
+1
View File
@@ -27,6 +27,7 @@ $lang->stakeholder->id = 'ID';
$lang->stakeholder->user = 'User';
$lang->stakeholder->type = 'Type';
$lang->stakeholder->name = 'Name';
$lang->stakeholder->role = 'Role';
$lang->stakeholder->phone = 'Mobile';
$lang->stakeholder->qq = 'QQ';
$lang->stakeholder->weixin = 'WeChat';
module/stakeholder/lang/en.php
+1
View File
@@ -27,6 +27,7 @@ $lang->stakeholder->id = 'ID';
$lang->stakeholder->user = 'User';
$lang->stakeholder->type = 'User Type';
$lang->stakeholder->name = 'Name';
$lang->stakeholder->role = 'Role';
$lang->stakeholder->phone = 'Mobile';
$lang->stakeholder->qq = 'QQ';
$lang->stakeholder->weixin = 'WeChat';
module/stakeholder/lang/fr.php
+1
View File
@@ -27,6 +27,7 @@ $lang->stakeholder->id = 'ID';
$lang->stakeholder->user = 'User';
$lang->stakeholder->type = 'Type';
$lang->stakeholder->name = 'Name';
$lang->stakeholder->role = 'Role';
$lang->stakeholder->phone = 'Mobile';
$lang->stakeholder->qq = 'QQ';
$lang->stakeholder->weixin = 'WeChat';
module/stakeholder/lang/vi.php
+1
View File
@@ -32,6 +32,7 @@ $lang->stakeholder->id = 'ID';
$lang->stakeholder->user = 'User';
$lang->stakeholder->type = 'Type';
$lang->stakeholder->name = 'Name';
$lang->stakeholder->role = 'Role';
$lang->stakeholder->phone = 'Mobile';
$lang->stakeholder->qq = 'QQ';
$lang->stakeholder->weixin = 'WeChat';
module/stakeholder/lang/zh-cn.php
+1
View File
@@ -27,6 +27,7 @@ $lang->stakeholder->id = '编号';
$lang->stakeholder->user = '用户';
$lang->stakeholder->type = '用户类型';
$lang->stakeholder->name = '姓名';
$lang->stakeholder->role = '职位';
$lang->stakeholder->phone = '手机';
$lang->stakeholder->qq = 'QQ';
$lang->stakeholder->weixin = '微信';
module/stakeholder/model.php
+1 -1
View File
@@ -244,7 +244,7 @@ class stakeholderModel extends model
*/
public function getStakeholders(int $projectID, string $browseType = 'all', string $orderBy = 'id_desc', object $pager = null): array
{
return $this->dao->select('t1.*, t2.phone, t2.realname as name, t2.email, t2.qq, t2.weixin, t2.nature, t2.analysis, t2.strategy, t3.name as companyName, t4.model as projectModel')->from(TABLE_STAKEHOLDER)->alias('t1')
return $this->dao->select('t1.*, t2.role, t2.phone, t2.realname as name, t2.email, t2.qq, t2.weixin, t2.nature, t2.analysis, t2.strategy, t3.name as companyName, t4.model as projectModel')->from(TABLE_STAKEHOLDER)->alias('t1')
->leftJoin(TABLE_USER)->alias('t2')->on('t1.user=t2.account')
->leftJoin(TABLE_COMPANY)->alias('t3')->on('t2.company=t3.id')
->leftJoin(TABLE_PROJECT)->alias('t4')->on('t1.objectID=t4.id')