Merge branch 'master' into Merge184

This commit is contained in:
tanghucheng
2023-11-20 02:10:27 -05:00
346 changed files with 3461 additions and 2330 deletions
+1 -1
View File
@@ -70,7 +70,7 @@ formPanel
set::suffix($lang->project->tenThousandYuan),
set::suffixWidth(50)
),
$parentProgram ? formHidden('budgetUnit', $parentProgram->budgetUnit) : picker(set::name('budgetUnit'), set::items($budgetUnitList), set::value($config->project->defaultCurrency))
$parentProgram ? formHidden('budgetUnit', $parentProgram->budgetUnit) : picker(set::name('budgetUnit'), set::items($budgetUnitList), set::value($config->project->defaultCurrency), set::required(true))
)
),
formGroup
+1
View File
@@ -56,6 +56,7 @@ $fieldListExtend['id']['type'] = 'checkID';
$this->config->stakeholder->dtable->fieldList = $fieldListExtend;
$cols = $this->loadModel('datatable')->getSetting('stakeholder');
unset($cols['name']['link']);
/* Set list and menu of actions to customize the actions of stakeholder in program module. */
$cols['actions']['list'] = array('unlinkStakeholder' => array