diff --git a/module/project/js/common.ui.js b/module/project/js/common.ui.js index 389ad3c196..f5d47e2743 100644 --- a/module/project/js/common.ui.js +++ b/module/project/js/common.ui.js @@ -246,14 +246,13 @@ function checkProjectInfo() if(typeof(data.availableBudget) != 'undefined') { - const budget = $('[name=budget]').val() * budgetUnitValue; + const budget = $('[name=budget]').val(); + const currency = currencySymbol[data.budgetUnit]; + const availableBudget = data.availableBudget.toFixed(2); + $('[name=budget]').attr('placeholder', parentBudget + currency + availableBudget); if(budget != 0 && budget !== null && budget > data.availableBudget) { - const currency = currencySymbol[data.budgetUnit]; - const availableBudget = (data.availableBudget / budgetUnitValue).toFixed(2); - const budgetTip = budgetOverrun.replace('%s', currency + availableBudget); - $('[name=budget]').attr('placeholder', budgetTip); - $('#budgetTip').html(budgetTip); + $('#budgetTip').html(budgetOverrun.replace('%s', currency + availableBudget)); $('#budgetTip').append($('' + ignore + '')); $('#budgetTip').removeClass('hidden'); $('#budgetTip').off('click', '#ignoreBudget').on('click', '#ignoreBudget', function(){ignoreTip('budgetTip')}); diff --git a/module/project/ui/common.field.php b/module/project/ui/common.field.php index 845ce34430..e1bfd08a33 100644 --- a/module/project/ui/common.field.php +++ b/module/project/ui/common.field.php @@ -101,7 +101,7 @@ $fields->field('budget') ->foldable() ->checkbox(array('text' => $lang->project->future, 'name' => 'future', 'checked' => $budgetFuture)) ->control('inputControl', array('control' => 'input', 'name' => 'budget', 'prefix' => array('control' => 'dropdown', 'name' => 'budgetUnit', 'items' => $budgetItemList, 'widget' => true, 'text' => zget($lang->project->currencySymbol, data('project.budgetUnit') ? data('project.budgetUnit') : $currency), 'className' => 'btn ghost' . ($budgetFuture ? ' disabled pointer-events-none' : '')), 'prefixWidth' => 34, 'disabled' => $budgetFuture)) - ->tip(sprintf($lang->project->budgetOverrun, zget($lang->project->currencySymbol, $currency) . data('program.budget'))) + ->tip(sprintf($lang->project->parentBudget, zget($lang->project->currencySymbol, $currency) . data('paretnProgram.budget'))) ->tipProps(array('id' => 'budgetTip')) ->tipClass('text-warning hidden'); diff --git a/module/project/ui/create.html.php b/module/project/ui/create.html.php index 161f0df068..b63c2fdb59 100644 --- a/module/project/ui/create.html.php +++ b/module/project/ui/create.html.php @@ -18,7 +18,6 @@ jsVar('budgetOverrun', $lang->project->budgetOverrun); jsVar('currencySymbol', $lang->project->currencySymbol); jsVar('parentBudget', $lang->project->parentBudget); jsVar('budgetUnitLabel', $lang->project->tenThousandYuan); -jsVar('budgetUnitValue', $config->project->budget->tenThousand); jsVar('+projectID', $copyProjectID); jsVar('LONG_TIME', LONG_TIME); jsVar('weekend', $config->execution->weekend); diff --git a/module/project/ui/edit.html.php b/module/project/ui/edit.html.php index 82e501a4fc..4a41d5f55e 100644 --- a/module/project/ui/edit.html.php +++ b/module/project/ui/edit.html.php @@ -18,7 +18,6 @@ jsVar('budgetOverrun', $lang->project->budgetOverrun); jsVar('currencySymbol', $lang->project->currencySymbol); jsVar('parentBudget', $lang->project->parentBudget); jsVar('budgetUnitLabel', $lang->project->tenThousandYuan); -jsVar('budgetUnitValue', $config->project->budget->tenThousand); jsVar('unmodifiableProducts', $unmodifiableProducts); jsVar('unmodifiableBranches', $unmodifiableBranches); jsVar('unmodifiableMainBranches', $unmodifiableMainBranches); diff --git a/module/project/zen.php b/module/project/zen.php index 70bb0de849..6dea54e93c 100755 --- a/module/project/zen.php +++ b/module/project/zen.php @@ -420,7 +420,7 @@ class projectZen extends project $this->view->users = $this->user->getPairs('noclosed|nodeleted'); $this->view->project = $project; $this->view->programList = $programList; - $this->view->program = $program; + $this->view->parentProgram = $program; $this->view->projectID = $projectID; $this->view->allProducts = $allProducts; $this->view->multiBranchProducts = $this->product->getMultiBranchPairs(); @@ -433,7 +433,6 @@ class projectZen extends project $this->view->unmodifiableMainBranches = $unmodifiableMainBranches; $this->view->URSRPairs = $this->loadModel('custom')->getURSRPairs(); $this->view->parentProject = $parentProject; - $this->view->parentProgram = $this->program->getByID($project->parent); $this->view->availableBudget = $parentProject ? $this->program->getBudgetLeft($parentProject) + (float)$project->budget : $project->budget; $this->view->budgetUnitList = $this->project->getBudgetUnitList(); $this->view->model = $project->model;