From 7929f20a3e194baad0e96661d2be0ee76583a8bb Mon Sep 17 00:00:00 2001 From: sunguangming Date: Mon, 30 Jun 2025 07:55:18 +0000 Subject: [PATCH 1/2] * [bug#145815,done,0.2h] fix bug. --- module/project/ui/common.field.php | 16 ++++++++++++++-- module/project/ui/create.field.php | 1 + 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/module/project/ui/common.field.php b/module/project/ui/common.field.php index 0850f765ae..ff355add40 100644 --- a/module/project/ui/common.field.php +++ b/module/project/ui/common.field.php @@ -46,6 +46,18 @@ $fields->field('PM')->control('picker')->items(data('PMUsers')); unset($lang->project->endList[999]); $isLongTime = data('project.end') == LONG_TIME; +$copyProject = data('copyProject'); +if($copyProject) +{ + $beginValue = $copyProject->begin; + $endValue = $copyProject->end == LONG_TIME ? '' : $copyProject->end; +} +else +{ + $beginValue = data('project.begin') ? data('project.begin') : date('Y-m-d'); + $endValue = data('project.end') == LONG_TIME ? '' : data('project.end'); +} + $fields->field('begin') ->label($lang->project->planDate) ->required() @@ -54,10 +66,10 @@ $fields->field('begin') ->control('dateRangePicker') ->beginName('begin') ->beginPlaceholder($lang->project->begin) - ->beginValue(data('project.begin') ? data('project.begin') : date('Y-m-d')) + ->beginValue($beginValue) ->endName('end') ->endPlaceholder($lang->project->end) - ->endValue(data('project.end') == LONG_TIME ? '' : data('project.end')) + ->endValue($endValue) ->endDisabled($isLongTime) ->endList($lang->project->endList) ->itemEnd() diff --git a/module/project/ui/create.field.php b/module/project/ui/create.field.php index d4617538ca..0c01915beb 100644 --- a/module/project/ui/create.field.php +++ b/module/project/ui/create.field.php @@ -47,6 +47,7 @@ $fields->field('days') ->control('input', array('className' => $copyProject ? 'has-warning' : '')) ->className($copyProject ? 'has-warning' : '') ->tip($copyProject ? $lang->project->copyProject->daysTips : null) + ->value($copyProject ? data('copyProject.days') : '') ->tipClass($copyProject ? 'text-warning' : null); $fields->field('productsBox')->hidden(data('copyProject') && data('copyProject.hasProduct') == 0); From 5c8f89ac78aab6260bb3cc844b940de0fc22dc52 Mon Sep 17 00:00:00 2001 From: sunguangming Date: Mon, 30 Jun 2025 08:48:09 +0000 Subject: [PATCH 2/2] * [bug#145819,done,0.2h] fix bug. --- module/project/ui/common.field.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/project/ui/common.field.php b/module/project/ui/common.field.php index ff355add40..69ebd09d5e 100644 --- a/module/project/ui/common.field.php +++ b/module/project/ui/common.field.php @@ -9,7 +9,7 @@ $fields = defineFieldList('project'); $model = data('model'); $hasCode = !empty($config->setCode); $currency = data('parentProgram') ? data('parentProgram.budgetUnit') : $config->project->defaultCurrency; -$disableStageBy = !empty(data('executions')) || data('app.rawMethod') == 'edit' ? true : false; +$disableStageBy = !empty(data('executions')) || data('app.rawMethod') == 'edit' || !empty(data('copyProject')); $fields->field('parent') ->control('picker', array('required' => true))