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

Merge branch dev/task-146349 of zentao/zentaopms (#10302)

Browse Source
This commit is contained in:
刘刚
2025-07-10 08:41:46 +08:00
committed by Gitfox
parent 85ce3e2d5a 5b5d6e114f
commit ca31d5d6c4
3 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+1 -1
View File
@@ -347,7 +347,7 @@ class commonModel extends model
*/
public function setApproval()
{
$this->config->openedApproval = (in_array($this->config->edition, array('biz', 'max', 'ipd'))) && ($this->config->vision == 'rnd');
$this->config->openedApproval = in_array($this->config->edition, array('biz', 'max', 'ipd')) && $this->config->vision != 'lite';
}
/**
module/common/test/model/setapproval.php
+8 -2
View File
@@ -14,7 +14,8 @@ cid=1
- 查看企业版是否开启了审批流程 @1
- 查看旗舰版是否开启了审批流程 @1
- 查看IPD版本是否开启了审批流程 @1
- 查看OR界面下的IPD版本是否开启了审批流程 @0
- 查看OR界面下的IPD版本是否开启了审批流程 @1
- 查看运营界面下的IPD版本是否开启了审批流程 @0
*/
@@ -38,4 +39,9 @@ r($config->openedApproval) && p('') && e('1'); // 查看IPD版本是否开启了
$config->vision = 'or';
$config->edition = 'ipd';
$tester->loadModel('common')->setApproval();
r($config->openedApproval) && p('') && e('0'); // 查看OR界面下的IPD版本是否开启了审批流程
r($config->openedApproval) && p('') && e('1'); // 查看OR界面下的IPD版本是否开启了审批流程
$config->vision = 'lite';
$config->edition = 'ipd';
$tester->loadModel('common')->setApproval();
r($config->openedApproval) && p('') && e('0'); // 查看运营界面下的IPD版本是否开启了审批流程
module/group/packagemanager.php
+12 -12
View File
@@ -2642,7 +2642,7 @@ $config->group->package->workflow->privs['workflow-ui'] = array('
$config->group->package->workflow->privs['workflow-release'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 60, 'depend' => array('workflow-browseFlow'), 'recommend' => array());
$config->group->package->workflow->privs['workflow-deactivate'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 65, 'depend' => array('workflow-browseFlow'), 'recommend' => array());
$config->group->package->workflow->privs['workflow-activate'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 70, 'depend' => array('workflow-browseFlow'), 'recommend' => array());
$config->group->package->workflow->privs['workflow-setApproval'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 75, 'depend' => array('workflow-browseFlow'), 'recommend' => array());
$config->group->package->workflow->privs['workflow-setApproval'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,or', 'order' => 75, 'depend' => array('workflow-browseFlow'), 'recommend' => array());
$config->group->package->workflow->privs['workflow-setFulltextSearch'] = array('edition' => 'max,ipd', 'vision' => 'rnd,lite', 'order' => 80, 'depend' => array('workflow-browseFlow'), 'recommend' => array());
$config->group->package->workflow->privs['workflow-setJS'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 85, 'depend' => array('workflow-browseFlow'), 'recommend' => array());
$config->group->package->workflow->privs['workflow-setCSS'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 90, 'depend' => array('workflow-browseFlow'), 'recommend' => array());
@@ -3182,17 +3182,17 @@ $config->group->package->approvalflow = new stdclass();
$config->group->package->approvalflow->order = 10;
$config->group->package->approvalflow->subset = 'featureconfig';
$config->group->package->approvalflow->privs = array();
$config->group->package->approvalflow->privs['approval-progress'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array('approvalflow-browse'), 'recommend' => array());
$config->group->package->approvalflow->privs['approvalflow-browse'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 4, 'depend' => array('approvalflow-role'), 'recommend' => array());
$config->group->package->approvalflow->privs['approvalflow-create'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 6, 'depend' => array('approvalflow-browse'), 'recommend' => array('approvalflow-delete', 'approvalflow-design', 'approvalflow-edit', 'approvalflow-view'));
$config->group->package->approvalflow->privs['approvalflow-edit'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 7, 'depend' => array('approvalflow-browse'), 'recommend' => array('approvalflow-create', 'approvalflow-delete', 'approvalflow-design', 'approvalflow-view'));
$config->group->package->approvalflow->privs['approvalflow-view'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('approvalflow-browse'), 'recommend' => array());
$config->group->package->approvalflow->privs['approvalflow-design'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 8, 'depend' => array('approvalflow-browse'), 'recommend' => array('approvalflow-create', 'approvalflow-delete', 'approvalflow-edit', 'approvalflow-view'));
$config->group->package->approvalflow->privs['approvalflow-delete'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 9, 'depend' => array('approvalflow-browse'), 'recommend' => array('approvalflow-create', 'approvalflow-design', 'approvalflow-edit', 'approvalflow-view'));
$config->group->package->approvalflow->privs['approvalflow-role'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array(), 'recommend' => array());
$config->group->package->approvalflow->privs['approvalflow-createRole'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 1, 'depend' => array('approvalflow-role'), 'recommend' => array('approvalflow-deleteRole', 'approvalflow-editRole'));
$config->group->package->approvalflow->privs['approvalflow-editRole'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 2, 'depend' => array('approvalflow-role'), 'recommend' => array('approvalflow-createRole', 'approvalflow-deleteRole'));
$config->group->package->approvalflow->privs['approvalflow-deleteRole'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 3, 'depend' => array('approvalflow-role'), 'recommend' => array('approvalflow-createRole', 'approvalflow-editRole'));
$config->group->package->approvalflow->privs['approval-progress'] = array('edition' => 'max,ipd', 'vision' => 'rnd,or', 'order' => 10, 'depend' => array('approvalflow-browse'), 'recommend' => array());
$config->group->package->approvalflow->privs['approvalflow-browse'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,or', 'order' => 4, 'depend' => array('approvalflow-role'), 'recommend' => array());
$config->group->package->approvalflow->privs['approvalflow-create'] = array('edition' => 'max,ipd', 'vision' => 'rnd,or', 'order' => 6, 'depend' => array('approvalflow-browse'), 'recommend' => array('approvalflow-delete', 'approvalflow-design', 'approvalflow-edit', 'approvalflow-view'));
$config->group->package->approvalflow->privs['approvalflow-edit'] = array('edition' => 'max,ipd', 'vision' => 'rnd,or', 'order' => 7, 'depend' => array('approvalflow-browse'), 'recommend' => array('approvalflow-create', 'approvalflow-delete', 'approvalflow-design', 'approvalflow-view'));
$config->group->package->approvalflow->privs['approvalflow-view'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,or', 'order' => 5, 'depend' => array('approvalflow-browse'), 'recommend' => array());
$config->group->package->approvalflow->privs['approvalflow-design'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,or', 'order' => 8, 'depend' => array('approvalflow-browse'), 'recommend' => array('approvalflow-create', 'approvalflow-delete', 'approvalflow-edit', 'approvalflow-view'));
$config->group->package->approvalflow->privs['approvalflow-delete'] = array('edition' => 'max,ipd', 'vision' => 'rnd,or', 'order' => 9, 'depend' => array('approvalflow-browse'), 'recommend' => array('approvalflow-create', 'approvalflow-design', 'approvalflow-edit', 'approvalflow-view'));
$config->group->package->approvalflow->privs['approvalflow-role'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,or', 'order' => 0, 'depend' => array(), 'recommend' => array());
$config->group->package->approvalflow->privs['approvalflow-createRole'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,or', 'order' => 1, 'depend' => array('approvalflow-role'), 'recommend' => array('approvalflow-deleteRole', 'approvalflow-editRole'));
$config->group->package->approvalflow->privs['approvalflow-editRole'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,or', 'order' => 2, 'depend' => array('approvalflow-role'), 'recommend' => array('approvalflow-createRole', 'approvalflow-deleteRole'));
$config->group->package->approvalflow->privs['approvalflow-deleteRole'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,or', 'order' => 3, 'depend' => array('approvalflow-role'), 'recommend' => array('approvalflow-createRole', 'approvalflow-editRole'));
$config->group->package->meetingroom = new stdclass();
$config->group->package->meetingroom->order = 30;