diff --git a/module/execution/ui/edit.field.php b/module/execution/ui/edit.field.php
new file mode 100644
index 0000000000..d8c5c845c3
--- /dev/null
+++ b/module/execution/ui/edit.field.php
@@ -0,0 +1,300 @@
+<?php
+namespace zin;
+
+global $lang, $config;
+
+$fields = defineFieldList('execution.edit');
+
+$project         = data('project');
+$execution       = data('execution');
+$productBranches = data('product.branches');
+$linkedPlans     = data('product.plans');
+$linkedProducts  = data('linkedProducts');
+$branchGroups    = data('branchGroups');
+$productPlans    = data('productPlans');
+
+if($project)
+{
+    if($project->model == 'scrum')
+    {
+        $fields->field('project')
+            ->width('1/2')
+            ->label($lang->execution->projectName)
+            ->items(data('allProjects'))
+            ->value(data('execution.project'))
+            ->wrapAfter(empty($config->setCode));
+    }
+    elseif($project->model == 'kanban')
+    {
+        $fields->field('project')
+            ->type('hidden')
+            ->value(data('execution.project'));
+        $projectBox = formHidden('project', $execution->project);
+    }
+    elseif($project->model == 'agileplus')
+    {
+        $fields->field('project')
+            ->label($lang->execution->method)
+            ->disabled()
+            ->value(zget($lang->execution->typeList, data('execution.project')));
+    }
+    elseif($app->tab == 'project' && $project->model == 'waterfallplus')
+    {
+        $fields->field('parent')
+            ->width('1/2')
+            ->label($lang->programplan->parent)
+            ->items(data('parentStageList'))
+            ->value(data('execution.parent'));
+    }
+
+    if(in_array($project->model, array('waterfall', 'waterfallplus')))
+    {
+        $fields->field('attribute')
+            ->label($lang->stage->type)
+            ->labelHint($lang->execution->typeTip);
+        if($enableOptionalAttr)
+        {
+            $fields->field('attribute')
+                ->width('1/2')
+                ->required()
+                ->items($lang->stage->typeList)
+                ->value(data('execution.attribute'));
+        }
+        else
+        {
+            $fields->field('attribute')
+                ->width('1/8')
+                ->disabled()
+                ->value(zget($lang->stage->typeList, data('execution.attribute')));
+        }
+    }
+    elseif($execution->type != 'kanban' && $project->model != 'ipd')
+    {
+        $fields->field('lifetime')
+            ->width('1/2')
+            ->required()
+            ->id('lifetime')
+            ->label($lang->execution->type)
+            ->items($lang->execution->lifeTimeList)
+            ->value(data('execution.lifetime'));
+    }
+}
+
+$fields->field('name')
+    ->required()
+    ->label($lang->execution->name)
+    ->value(data('execution.name'));
+
+if(!empty($config->setCode))
+{
+    $fields->field('code')
+        ->label($lang->execution->code)
+        ->value(data('execution.code'))
+        ->required()
+        ->width('1/2');
+}
+
+$fields->field('planDate')
+    ->width('1/2')
+    ->control('inputGroup')
+    ->label($lang->execution->dateRange)
+    ->itemBegin('begin')->control('datePicker')->value(data('execution.begin'))->itemEnd()
+    ->itemBegin()->control('addon')->text($lang->project->to)->itemEnd()
+    ->itemBegin('end')->control('datePicker')->value(data('execution.end'))->itemEnd();
+
+$fields->field('days')
+    ->label("{$lang->execution->days} ({$lang->execution->day})")
+    ->required(strpos(",{$config->execution->edit->requiredFields},", ",days,") !== false)
+    ->value(data('execution.days'))
+    ->width('1/2');
+
+if($project->model != 'waterfall' && $project->model != 'waterfallplus')
+{
+    $hidden = empty($project->hasProduct);
+    if(!empty($project->hasProduct) && $linkedProducts)
+    {
+        $i = 0;
+        foreach($linkedProducts as $product)
+        {
+            $plans     = isset($productPlans[$product->id]) ? $productPlans[$product->id] : array();
+            $branches  = isset($branchGroups[$product->id]) ? $branchGroups[$product->id] : array();
+            $hasBranch = $product->type != 'normal' && !empty($branches);
+            $fields->field("products[{$i}]")
+                ->width($hasBranch ? '1/4' : '1/2')
+                ->className($hidden ? 'hidden' : '')
+                ->label($i == 0 ? $lang->project->manageProducts : '')
+                ->items(data('allProducts'))
+                ->value($product->id);
+
+            $fields->field("branch[{$i}][]")
+                ->width('1/4')
+                ->multiple()
+                ->className($hidden || !$hasBranch ? 'hidden' : '')
+                ->label($i == 0 ? $lang->product->branchName['branch'] : '')
+                ->items($branches)
+                ->value($productBranches ? implode(',', $productBranches) : array());
+
+            $fields->field("plans[$product->id][]")
+                ->width('1/2')
+                ->multiple()
+                ->label($lang->project->associatePlan)
+                ->items($plans)
+                ->value($linkedPlans ? implode(',', $linkedPlans) : array());
+
+            $i ++;
+        }
+    }
+    elseif(empty($project->hasProduct))
+    {
+        $planProductID = current(array_keys($linkedProducts));
+        $fields->field("plans[$planProductID][]")
+            ->width('1/2')
+            ->multiple()
+            ->label($lang->execution->linkPlan)
+            ->items(isset($productPlans[$planProductID]) ? $productPlans[$planProductID] : array())
+            ->value(isset($linkedProducts[$planProductID]) ? $linkedProducts[$planProductID]->plans : '');
+
+        $fields->field('products[0]')->type('hidden')->value($planProductID);
+        $fields->field('branch[0]')->type('hidden')->value('');
+    }
+    else
+    {
+        $fields->field('products[0]')
+            ->width('1/4')
+            ->className($hidden ? 'hidden' : '')
+            ->label($lang->project->manageProducts)
+            ->items(data('allProducts'))
+            ->value('');
+
+        $fields->field('branch[0][]')
+            ->width('1/4')
+            ->className('hidden')
+            ->multiple()
+            ->label($lang->product->branchName['branch'])
+            ->items(array())
+            ->value('');
+
+        $fields->field('plans[0][]')
+            ->width('1/2')
+            ->multiple()
+            ->label($lang->project->associatePlan)
+            ->items(array())
+            ->value('');
+    }
+}
+elseif(!empty($project->hasProduct))
+{
+    $i = 0;
+    foreach($linkedProducts as $product)
+    {
+        $fields->field("products[{$i}]")
+            ->width($hasBranch ? '1/4' : '1/2')
+            ->className($hidden ? 'hidden' : '')
+            ->label($i == 0 ? $lang->project->manageProducts : '')
+            ->items(data('allProducts'))
+            ->value(data('product.id'))
+            ->disabled(in_array($project->model, array('waterfall', 'waterfallplus')))
+            ->required(in_array($project->model, array('waterfall', 'waterfallplus')));
+
+        $fields->field("branch[{$i}][]")
+            ->width('1/4')
+            ->multiple()
+            ->className($hidden ? 'hidden' : '')
+            ->label($i == 0 ? $lang->product->branchName['branch'] : '')
+            ->disabled($project->model == 'waterfall' || $project->model == 'waterfallplus')
+            ->items($branches)
+            ->value($productBranches ? implode(',', $productBranches) : array());
+
+        $fields->field("plans[$product->id][]")
+            ->width('1/2')
+            ->multiple()
+            ->label($lang->project->associatePlan)
+            ->items($plans)
+            ->value($linkedPlans ? implode(',', $linkedPlans) : array());
+
+        $i ++;
+    }
+
+    if(empty($linkedProducts))
+    {
+        $fields->field('products[0]')->type('hidden')->value(array());
+        $fields->field('branch[][]')->type('hidden')->items(array())->value('')->multiple();
+    }
+}
+else
+{
+    $fields->field('products[0]')->type('hidden')->value(key($linkedProducts));
+    $fields->field('branch[][]')
+        ->className('hidden')
+        ->items(isset($linkedBranches[key($linkedProducts)]) ? $linkedBranches[key($linkedProducts)] : array())
+        ->value(isset($linkedBranches[key($linkedProducts)]) ? implode(',', $linkedBranches[key($linkedProducts)]) : '')
+        ->multiple();
+}
+
+if(data('execution.type') == 'stage' && isset($config->setPercent) && $config->setPercent == 1)
+{
+    $fields->field('percent')
+        ->required()
+        ->label($lang->stage->percent)
+        ->value(data('execution.percent'))
+        ->width('1/2');
+}
+
+$fields->field('PO')
+    ->label($lang->execution->PO)
+    ->items(data('poUsers'))
+    ->value(data('execution.PO'));
+
+$fields->field('QD')
+    ->label($lang->execution->QD)
+    ->items(data('qdUsers'))
+    ->value(data('execution.QD'));
+
+$fields->field('PM')
+    ->label($lang->execution->PM)
+    ->items(data('pmUsers'))
+    ->value(data('execution.PM'));
+
+$fields->field('RD')
+    ->label($lang->execution->RD)
+    ->items(data('rdUsers'))
+    ->value(data('execution.RD'));
+
+if($project && $project->model != 'ipd')
+{
+    $fields->field('status')
+        ->required()
+        ->label($lang->execution->status)
+        ->items($lang->execution->statusList)
+        ->value(data('execution.status'))
+        ->width('1/2');
+}
+
+$fields->field('team')
+    ->label($lang->execution->teamName)
+    ->value(data('execution.team'));
+
+$teamMembers = data('teamMembers');
+$fields->field('teamMembers')
+    ->width('full')
+    ->name('teamMembers[]')
+    ->label($lang->execution->team)
+    ->multiple()
+    ->items(data('users'))
+    ->value($teamMembers ? array_keys($teamMembers) : array());
+
+$fields->field('desc')
+    ->width('full')
+    ->control('editor')
+    ->value(data('execution.desc'));
+
+$fields->field('acl')
+    ->foldable()
+    ->width('full')
+    ->control(array(
+        'type' => 'aclBox',
+        'aclItems' => $lang->execution->aclList,
+        'whitelistLabel' => $lang->whitelist,
+        'userLabel' => $lang->product->users,
+        'userItems' => data('users')
+    ));
diff --git a/module/execution/ui/edit.html.php b/module/execution/ui/edit.html.php
index 7a7729465f..18d3c2ffaa 100644
--- a/module/execution/ui/edit.html.php
+++ b/module/execution/ui/edit.html.php
@@ -9,6 +9,7 @@ declare(strict_types=1);
  * @link        https://www.zentao.net
  */
 namespace zin;
+$fields = useFields('execution.edit');
 
 jsVar('weekend', $config->execution->weekend);
 jsVar('errorSameProducts', $lang->execution->errorSameProducts);
@@ -26,600 +27,15 @@ jsVar('executionAttr', $execution->attribute);
 jsVar('window.lastProjectID', $execution->project);
 jsVar('multiBranchProducts', $multiBranchProducts);
 
-$projectBox = null;
-if(isset($project))
-{
-    if($project->model == 'scrum')
-    {
-        $projectBox = formGroup
-            (
-                set::width('1/2'),
-                set::name('project'),
-                set::label($lang->execution->projectName),
-                set::items($allProjects),
-                set::value($execution->project),
-                on::change('changeProject')
-            );
-    }
-    elseif($project->model == 'kanban')
-    {
-        $projectBox = formHidden('project', $execution->project);
-    }
-    elseif($project->model == 'agileplus')
-    {
-        $projectBox = formGroup
-            (
-                set::className('items-center'),
-                set::label($lang->execution->method),
-                zget($lang->execution->typeList, $execution->type)
-            );
-    }
-    elseif($app->tab == 'project' && $project->model == 'waterfallplus')
-    {
-        $projectBox = formGroup
-            (
-                set::width('1/2'),
-                set::name('parent'),
-                set::label($lang->programplan->parent),
-                set::items($parentStageList),
-                set::value($execution->parent)
-            );
-    }
-}
-
-$typeBox = null;
-if(in_array($project->model, array('waterfall', 'waterfallplus')))
-{
-    $typeList = $lang->stage->typeList;
-    $typeBox  = formRow
-        (
-            formGroup
-            (
-                set::width($enableOptionalAttr ? '1/2' : '1/8'),
-                set::label($lang->stage->type),
-                set::className('items-center'),
-                $enableOptionalAttr ? picker
-                (
-                    set::name('attribute'),
-                    set::items($typeList),
-                    set::value($execution->attribute),
-                    set::required(true)
-                ) : span(zget($typeList, $execution->attribute))
-            ),
-            formGroup
-            (
-                div
-                (
-                    setClass('pl-2 flex self-center'),
-                    setStyle(array('color' => 'var(--form-label-color)')),
-                    icon
-                    (
-                        'help',
-                        set('data-toggle', 'tooltip'),
-                        set('id', 'typeHover')
-                    )
-                )
-            )
-        );
-}
-elseif($execution->type != 'kanban' and $project->model != 'ipd')
-{
-    $typeBox = formRow
-        (
-            formGroup
-            (
-                set::width('1/2'),
-                set::label($lang->execution->type),
-                picker
-                (
-                    set::id('lifetime'),
-                    set::name('lifetime'),
-                    set::items($lang->execution->lifeTimeList),
-                    set::value($execution->lifetime),
-                    set::required(true),
-                    on::change('showLifeTimeTips')
-                )
-            ),
-            formGroup
-            (
-                set::width('1/2'),
-                set::id('lifeTimeTips'),
-                set::className('text-gray'),
-                set::className($execution->lifetime != 'ops' ? 'hidden' : ''),
-                span($lang->execution->typeDesc)
-            )
-        );
-}
-
-$productsBox = null;
-if($project->model != 'waterfall' && $project->model != 'waterfallplus')
-{
-    $hidden = true;
-    if(!empty($project->hasProduct)) $hidden = false;
-    if(!empty($project) && !empty($project->hasProduct) && $linkedProducts)
-    {
-        $i = 0;
-        foreach($linkedProducts as $product)
-        {
-            $hasBranch = $product->type != 'normal' && isset($branchGroups[$product->id]);
-            $branches  = isset($branchGroups[$product->id]) ? $branchGroups[$product->id] : array();
-            $plans     = isset($productPlans[$product->id]) ? $productPlans[$product->id] : array();
-            $productsBox[] = formRow
-                (
-                    set::hidden($hidden),
-                    formGroup
-                    (
-                        set::width($hasBranch ? '1/4' : '1/2'),
-                        setClass('linkProduct'),
-                        $i == 0 ? set::label($lang->project->manageProducts) : set::label(''),
-                        inputGroup
-                        (
-                            div
-                            (
-                                setClass('grow'),
-                                picker
-                                (
-                                    set::id("products{$i}"),
-                                    set::name("products[{$i}]"),
-                                    set::items($allProducts),
-                                    set::value($product->id),
-                                    set::last($product->id),
-                                    $hasBranch ? set::lastBranch(implode(',', $product->branches)) : null
-                                )
-                            )
-                        )
-                    ),
-                    formGroup
-                    (
-                        set::width('1/4'),
-                        setClass('ml-px'),
-                        $hasBranch ? null : setClass('hidden'),
-                        inputGroup
-                        (
-                            $lang->product->branchName['branch'],
-                            picker
-                            (
-                                set::id("branch{$i}"),
-                                set::name("branch[$i][]"),
-                                set::items($branches),
-                                set::value(implode(',', $product->branches)),
-                                set::multiple(true),
-                                on::change("branchChange")
-                            )
-                        )
-                    ),
-                    formGroup
-                    (
-                        set::width('1/2'),
-                        set::label($lang->project->associatePlan),
-                        set::className('planBox'),
-                        inputGroup
-                        (
-                            set::id("plan{$i}"),
-                            picker
-                            (
-                                set::name("plans[$product->id][]"),
-                                set::items($plans),
-                                set::value(implode(',', $product->plans)),
-                                set::multiple(true)
-                            )
-                        ),
-                        $isStage && $project->stageBy == 'project' ? null : div
-                        (
-                            setClass('pl-2 flex self-center text-gray line-btn'),
-                            btn
-                            (
-                                setClass('btn btn-link text-gray addLine'),
-                                icon('plus')
-                            ),
-                            btn
-                            (
-                                setClass('btn btn-link text-gray removeLine'),
-                                setClass($i == 0 ? 'hidden' : ''),
-                                icon('trash')
-                            )
-                        )
-                    )
-                );
-
-            $i ++;
-        }
-    }
-    elseif(!empty($project) && empty($project->hasProduct))
-    {
-        $planProductID = current(array_keys($linkedProducts));
-        $productsBox[] = formRow(
-            formGroup
-            (
-                set::width('1/2'),
-                set::label($lang->execution->linkPlan),
-                set('id', 'plansBox'),
-                set::className('planBox'),
-                picker
-                (
-                    set::name("plans[{$planProductID}][]"),
-                    set::items(isset($productPlans[$planProductID]) ? $productPlans[$planProductID] : array()),
-                    set::value(isset($linkedProducts[$planProductID]) ? $linkedProducts[$planProductID]->plans : ''),
-                    set::multiple(true),
-                    formHidden('products[0]', $planProductID),
-                    formHidden('branch[0][0]', 0)
-                )
-            )
-        );
-    }
-    else
-    {
-        $productsBox[] = formRow
-            (
-                set::hidden($hidden),
-                set::className('productsBox'),
-                formGroup
-                (
-                    set::width('1/2'),
-                    setClass('linkProduct'),
-                    set::label($lang->project->manageProducts),
-                    picker
-                    (
-                        set::id('products0'),
-                        set::name('products[0]'),
-                        set::items($allProducts)
-                    )
-                ),
-                formGroup
-                (
-                    set::width('1/4'),
-                    setClass('hidden ml-px'),
-                    inputGroup
-                    (
-                        $lang->product->branchName['branch'],
-                        picker
-                        (
-                            set::id('branch0'),
-                            set::name('branch[0][]'),
-                            set::multiple(true),
-                            set::items(array()),
-                            on::change('branchChange')
-                        )
-                    )
-                ),
-                formGroup
-                (
-                    set::width('1/2'),
-                    set::label($lang->project->associatePlan),
-                    set::className('planBox'),
-                    inputGroup
-                    (
-                        set::id("plan0"),
-                        picker
-                        (
-                            set::name('plans[0][]'),
-                            set::items(array()),
-                            set::multiple(true)
-                        )
-                    ),
-                    $isStage && $project->stageBy == 'product' ? null : div
-                    (
-                        setClass('pl-2 flex self-center line-btn'),
-                        btn
-                        (
-                            setClass('btn btn-link text-gray addLine'),
-                            icon('plus')
-                        ),
-                        btn
-                        (
-                            setClass('btn btn-link text-gray removeLine'),
-                            setClass('hidden'),
-                            icon('trash')
-                        )
-                    )
-                ),
-            );
-    }
-}
-elseif(!empty($project) && !empty($project->hasProduct))
-{
-    $i = 0;
-    foreach($linkedProducts as $product)
-    {
-        $hasBranch = $product->type != 'normal' and isset($branchGroups[$product->id]);
-        $branches  = isset($branchGroups[$product->id]) ? $branchGroups[$product->id] : array();
-        $plans     = isset($productPlans[$product->id]) ? $productPlans[$product->id] : array();
-        $productsBox[] = formRow
-            (
-                set::className('productsBox'),
-                formGroup
-                (
-                    set::width($hasBranch ? '1/4' : '1/2'),
-                    setClass('linkProduct'),
-                    set::required(in_array($project->model, array('waterfall', 'waterfallplus'))),
-                    $i == 0 ? set::label($lang->project->manageProducts) : set::label(''),
-                    inputGroup
-                    (
-                        div
-                        (
-                            setClass('grow'),
-                            picker
-                            (
-                                set::id("products{$i}"),
-                                set::name("products[$i]"),
-                                set::items($allProducts),
-                                set::value($product->id),
-                                set::last($product->id),
-                                $hasBranch && $product->branches ? set::lastBranch(implode(',', $product->branches)) : null,
-                                set::disabled(in_array($project->model, array('waterfall', 'waterfallplus'))),
-                                set::required(in_array($project->model, array('waterfall', 'waterfallplus')))
-                            )
-                        )
-                    )
-                ),
-                formGroup
-                (
-                    set::width('1/4'),
-                    setClass('ml-px'),
-                    $hasBranch ? null : setClass('hidden'),
-                    inputGroup
-                    (
-                        $lang->product->branchName['branch'],
-                        picker
-                        (
-                            set::id("branch{$i}"),
-                            set::name("branch[$i][]"),
-                            set::items($branches),
-                            set::value(isset($product->branches) ? implode(',', $product->branches) : ''),
-                            set::disabled($project->model == 'waterfall' || $project->model == 'waterfallplus'),
-                            set::multiple(true),
-                            on::change('branchChange')
-                        )
-                    )
-                ),
-                formGroup
-                (
-                    set::width('1/2'),
-                    set::label($lang->project->associatePlan),
-                    set::className('planBox'),
-                    inputGroup
-                    (
-                        set::id("plan{$i}"),
-                        picker
-                        (
-                            set::name("plans[$product->id][]"),
-                            set::items($plans),
-                            set::value(isset($product->plans) ? implode(',', $product->plans) : ''),
-                            set::multiple(true)
-                        )
-                    )
-                )
-            );
-
-        $i ++;
-    }
-
-    if(empty($linkedProducts))
-    {
-        $productsBox[] = formHidden('products[0]', array());
-        $productsBox[] = picker
-            (
-                set::hidden(true),
-                set::name("branch[][]"),
-                set::items(array()),
-                set::value(''),
-                set::multiple(true)
-            );
-    }
-}
-else
-{
-    $productsBox[] = formHidden('products[0]', key($linkedProducts));
-    $productsBox[] = picker
-        (
-            set::name("branch[][]"),
-            set::hidden(true),
-            set::items(isset($linkedBranches[key($linkedProducts)]) ? $linkedBranches[key($linkedProducts)] : array()),
-            set::value(isset($linkedBranches[key($linkedProducts)]) ? implode(',', $linkedBranches[key($linkedProducts)]) : ''),
-            set::multiple(true)
-        );
-}
-
-if(helper::isAjaxRequest('modal')) modalHeader(set::title($lang->execution->edit));
-formPanel
+formGridPanel
 (
-    set::className('editPanel'),
-    to::heading(div
-    (
-        setClass('panel-title text-lg'),
-        $lang->execution->edit,
-    )),
-    on::click('.addLine', 'addNewLine'),
-    on::click('.removeLine', 'removeLine'),
     on::change('[name^=products]', 'productChange'),
-    $projectBox,
-    formGroup
-    (
-        set::width('1/2'),
-        set::name('name'),
-        set::label($lang->execution->name),
-        set::value($execution->name)
-    ),
-    isset($config->setCode) && $config->setCode == 1 ? formGroup
-    (
-        set::width('1/2'),
-        set::name('code'),
-        set::label($lang->execution->code),
-        set::value($execution->code)
-    ) : null,
-    formRow
-    (
-        formGroup
-        (
-            set::width('1/2'),
-            set::label($lang->execution->dateRange),
-            set::required(true),
-            inputGroup
-            (
-                datePicker
-                (
-                    set::name('begin'),
-                    set('id', 'begin'),
-                    set::value($execution->begin),
-                    set::placeholder($lang->execution->begin),
-                    on::change('computeWorkDays(NaN)')
-                ),
-                $lang->project->to,
-                datePicker
-                (
-                    set::name('end'),
-                    set('id', 'end'),
-                    set::value($execution->end),
-                    set::placeholder($lang->execution->end),
-                    on::change('computeWorkDays(NaN)')
-                )
-            )
-        ),
-        formGroup
-        (
-            radioList
-            (
-                set::name('delta'),
-                set::inline(true),
-                set::items($lang->execution->endList),
-                set::value((strtotime($execution->end) - strtotime($execution->begin)) / 3600 / 24 + 1),
-                on::change('computeEndDate')
-            )
-        )
-    ),
-    formGroup
-    (
-        set::label($lang->execution->days),
-        set::width('1/2'),
-        set::required(strpos(",{$this->config->execution->edit->requiredFields},", ",days,") !== false),
-        inputGroup
-        (
-            setClass('has-suffix'),
-            input
-            (
-                set::name('days'),
-                set::value($execution->days)
-            ),
-            div
-            (
-                setClass('input-control-suffix z-50'),
-                $lang->execution->day
-            )
-        )
-    ),
-    $typeBox,
-    $execution->type == 'stage' && isset($config->setPercent) && $config->setPercent == 1 ? formGroup
-    (
-        set::width('1/2'),
-        set::name('percent'),
-        set::label($lang->stage->percent),
-        set::value($execution->percent),
-        set::required(true)
-    ) : null,
-    $project->model != 'ipd' ? formGroup
-    (
-        set::width('1/2'),
-        set::label($lang->execution->status),
-        picker
-        (
-            set::name('status'),
-            set::items($lang->execution->statusList),
-            set::value($execution->status),
-            set::required(true)
-        )
-    ) : null,
-    $productsBox,
-    formRowGroup(set::title($lang->execution->teamSetting)),
-    formGroup
-    (
-        set::width('1/2'),
-        set::name('team'),
-        set::label($lang->execution->teamName),
-        set::value($execution->team)
-    ),
-    formRow
-    (
-        formGroup
-        (
-            set::width('1/4'),
-            set::label($lang->execution->PM),
-            set::control('picker'),
-            set::name('PM'),
-            set::items($pmUsers),
-            set::value($execution->PM)
-        ),
-        formGroup
-        (
-            set::width('1/4'),
-            set::label($lang->execution->PO),
-            set::control('picker'),
-            set::name('PO'),
-            set::items($poUsers),
-            set::value($execution->PO)
-        ),
-        formGroup
-        (
-            set::width('1/4'),
-            set::label($lang->execution->QD),
-            set::control('picker'),
-            set::name('QD'),
-            set::items($qdUsers),
-            set::value($execution->QD)
-        ),
-        formGroup
-        (
-            set::width('1/4'),
-            set::label($lang->execution->RD),
-            set::control('picker'),
-            set::name('RD'),
-            set::items($rdUsers),
-            set::value($execution->RD)
-        )
-    ),
-    formGroup
-    (
-        set::label($lang->execution->team),
-        picker
-        (
-            set::name('teamMembers[]'),
-            set::items($users),
-            set::value(array_keys($teamMembers)),
-            set::multiple(true)
-        )
-    ),
-    h::hr(),
-    formGroup
-    (
-        set::label($lang->execution->desc),
-        editor
-        (
-            set::name('desc'),
-            html($execution->desc)
-        )
-    ),
-    formRow
-    (
-        set::id('aclList'),
-        formGroup
-        (
-            set::width('1/2'),
-            set::name('acl'),
-            set::label($lang->execution->acl),
-            set::control('radioList'),
-            set::items($lang->execution->aclList),
-            set::value($execution->acl),
-            set::disabled($execution->grade == 2),
-            on::change('setWhite(this.value)')
-        )
-    ),
-    formGroup
-    (
-        set::label($lang->whitelist),
-        set::id('whitelistBox'),
-        set::className($execution->acl == 'open' ? 'hidden' : ''),
-        whitelist(set::items($users), set::value($execution->whitelist))
-    )
+    on::change('[name^=project]', 'changeProject'),
+    on::change('[name=begin]', 'computeWorkDays(NaN)'),
+    on::change('[name=end]', 'computeWorkDays(NaN)'),
+    set::fullModeOrders('project', !empty($config->setCode) ? 'type,name,code' : 'method,name,type', 'planDate,days,products,branch,plans,PO,QD,PM,RD,teamMembers,desc,acl'),
+    set::title($lang->execution->edit),
+    set::modeSwitcher(false),
+    set::defaultMode('full'),
+    set::fields($fields)
 );
-
-/* ====== Render page ====== */
-render();