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

Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x

Browse Source
This commit is contained in:
Yagami
2020-08-21 13:51:40 +08:00
parent a245bb6954 af7e3883a5
commit de2b16d64e
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/risk/config.php
View File

@@ -52,8 +52,8 @@ $config->risk->search['params']['prevention'] = array('operator' => 'incl
$config->risk->search['params']['remedy'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
$config->risk->search['params']['plannedClosedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->risk->search['params']['actualClosedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->risk->search['params']['createBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users');
$config->risk->search['params']['createDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->risk->search['params']['createdBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users');
$config->risk->search['params']['createdDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->risk->search['params']['resolution'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
$config->risk->search['params']['resolvedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users');
$config->risk->search['params']['activateBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users');

1
module/risk/lang/zh-cn.php
View File

@@ -94,6 +94,7 @@ $lang->risk->priList['high'] = '高';
$lang->risk->priList['middle'] = '中';
$lang->risk->priList['low'] = '低';
$lang->risk->statusList[''] = '';
$lang->risk->statusList['active'] = '开放';
$lang->risk->statusList['closed'] = '关闭';
$lang->risk->statusList['hangup'] = '挂起';

2
module/risk/model.php
View File

@@ -117,7 +117,7 @@ class riskModel extends model
*/
public function getList($browseType = '', $param = '', $orderBy = 'id_desc', $pager = null)
{
if($browseType == 'bySearch') return $this->getBySearch($param, $orderBy, $pager);
if($browseType == 'bysearch') return $this->getBySearch($param, $orderBy, $pager);
return $this->dao->select('*')->from(TABLE_RISK)
->where('deleted')->eq(0)