diff --git a/module/project/control.php b/module/project/control.php index 50dd26bc59..d08049c667 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -536,8 +536,9 @@ class project extends control $this->view->URSRPairs = $this->loadModel('custom')->getURSRPairs(); $this->view->availableBudget = $this->program->getBudgetLeft($parentProgram); $this->view->budgetUnitList = $this->project->getBudgetUnitList(); + $this->view->copyType = isset($output['copytype']) ? $output['copytype'] : 0; - $this->display(); + $this->display('project', 'create'); } /** diff --git a/module/project/css/create.css b/module/project/css/create.css index 0232e1b8fa..9accdc3b06 100644 --- a/module/project/css/create.css +++ b/module/project/css/create.css @@ -21,3 +21,11 @@ #productsBox .input-group-addon > div {display: inline-block !important;} #plansBox .row {display: inline-table; width: 102%;} #plansBox .col-sm-4 {float: none; display: inline-block; padding-right: 5px;} +.change-blue {color: #0061F4; font-weight: bold;} +.change-gray {color: #C4C4C4; font-weight: bold;} +#copypart .icon-check{padding-right: 5px;} +#copyall .icon-check{padding-right: 5px;} +.modal-flex{display:flex; justify-content:space-around;} +.modal-flex .col-md-4{padding-right: 5px; padding-left: 5px;} +.change-background-gray{background-color: #F8F8F8;} +.change-background-blue{background-color: #F5F9FF;} \ No newline at end of file diff --git a/module/project/js/create.js b/module/project/js/create.js index 3b4a07d3ea..110436d899 100644 --- a/module/project/js/create.js +++ b/module/project/js/create.js @@ -85,26 +85,46 @@ $(function() $("#copypart").click(function() { + $("#copypart .icon-check").removeClass('change-gray'); + $("#copypart .icon-check").addClass('change-blue'); + $("#copypart h3").addClass('change-blue'); + $("#copyall .icon-check").removeClass('change-blue'); + $("#copyall .icon-check").addClass('change-gray'); + $("#copyall h3 span").removeClass('change-blue'); + $("#copyall").removeClass('change-background-blue'); + $("#copyall").addClass('change-background-gray'); + $("#copypart").removeClass('change-background-gray'); + $("#copypart").addClass('change-background-blue'); + $("#copytype").val(1); }); $("#copyall").click(function() { + $("#copyall .icon-check").removeClass('change-gray'); + $("#copyall .icon-check").addClass('change-blue'); + $("#copyall h3 span").addClass('change-blue'); + $("#copypart .icon-check").removeClass('change-blue'); + $("#copypart .icon-check").addClass('change-gray'); + $("#copypart h3").removeClass('change-blue'); + $("#copyall").removeClass('change-background-gray'); + $("#copyall").addClass('change-background-blue'); + $("#copypart").removeClass('change-background-blue'); + $("#copypart").addClass('change-background-gray'); + $("#copytype").val(2); }); $("#copyTypeConfirm").click(function() { - console.log(model) - console.log(programID) - console.log($("#copyProjectID").val()) - if($("#copytype").val() == 1) + var copytype = $("#copytype").val(); + if(copytype == 1) { - location.href = createLink('project', 'create', 'model=' + model + '&programID=' + programID + '©ProjectID=' + $("#copyProjectID").val()); + location.href = createLink('project', 'create', 'model=' + model + '&programID=' + programID + '©ProjectID=' + $("#copyProjectID").val() + '&extra=copytype=' + copytype); } else { - location.href = createLink('project', 'copyproject', 'model=' + model + '&programID=' + programID + '©ProjectID=' + $("#copyProjectID").val()); + location.href = createLink('project', 'copyproject', 'model=' + model + '&programID=' + programID + '©ProjectID=' + $("#copyProjectID").val() + '&extra=copytype=' + copytype); } }); diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 2a4bc0aeb5..6df34e8172 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -328,3 +328,15 @@ $lang->project->confirmUnlinkMember = "您确定从该项目中移除该用户 $lang->project->action = new stdclass(); $lang->project->action->managed = '$date, 由 $actor 维护。$extra' . "\n"; + +$lang->project->copyproject = new stdClass(); +$lang->project->copyproject->all = '全部信息'; +$lang->project->copyproject->allextra = '(团队成员与时间不复制)'; +$lang->project->copyproject->allMessageList['base'] = '基本信息'; +$lang->project->copyproject->allMessageList['execution'] = '阶段/迭代'; +$lang->project->copyproject->allMessageList['doc'] = '文档(文档目录)'; +$lang->project->copyproject->allMessageList['task'] = '任务'; +$lang->project->copyproject->allMessageList['qa'] = 'QA(质量保证计划)'; +$lang->project->copyproject->allMessageList['process'] = '过程(过程裁剪)'; +$lang->project->copyproject->part = '部分信息'; +$lang->project->copyproject->partMessageList['base'] = '基本信息'; \ No newline at end of file diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 7fd879b29c..5b31feb2b9 100755 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -196,7 +196,14 @@