This commit is contained in:
sunguangming
2023-12-25 18:58:24 +08:00
parent bdfe3e2f20
commit 82cbad914b
3 changed files with 3 additions and 4 deletions
+1 -2
View File
@@ -127,8 +127,7 @@ class programplan extends control
$viewData->programPlan = $programPlan;
$viewData->productList = $productList;
$viewData->project = $project;
$viewData->plans = $plans;
$viewData->executions = $executions;
$viewData->plans = !empty($executions) ? $executions : $plans;
$this->programplanZen->buildCreateView($viewData);
}
+1 -1
View File
@@ -211,7 +211,7 @@ $fnGenerateDefaultData = function() use ($config, $plans, $planID, $stages, $exe
$item->realBegan = $plan->realBegan;
$item->realEnd = $plan->realEnd;
$item->desc = $plan->desc;
$item->setMilestone = $plan->setMilestone;
$item->setMilestone = isset($plan->setMilestone) ? $plan->setMilestone : false;
if(in_array($config->edition, array('max', 'ipd')) && $executionType == 'stage')
{
$item->output = empty($plan->output) ? 0 : explode(',', $plan->output);
+1 -1
View File
@@ -43,7 +43,7 @@ class programplanZen extends programplan
$this->view->productID = $viewData->productID ?: key($viewData->productList);
$this->view->stages = empty($viewData->planID) ? $this->loadModel('stage')->getStages('id_asc', 0, $viewData->project->model) : array();
$this->view->programPlan = $viewData->programPlan;
$this->view->plans = empty($viewData->executions) ? $viewData->plans : $viewData->executions;
$this->view->plans = $viewData->plans;
$this->view->planID = $viewData->planID;
$this->view->type = 'lists';
$this->view->executionType = $viewData->executionType;