diff --git a/module/project/control.php b/module/project/control.php
index 291e43deb7..50dd26bc59 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -386,8 +386,6 @@ class project extends control
      */
     public function create($model = 'scrum', $programID = 0, $copyProjectID = 0, $extra = '')
     {
-
-        echo 2222;exit;
         $this->loadModel('execution');
         $this->loadModel('product');
 
@@ -542,48 +540,6 @@ class project extends control
         $this->display();
     }
 
-    public function copyProject($model = 'scrum', $programID = 0, $copyProjectID = 0)
-    {
-        $this->loadModel('project');
-        // $this->project->getCopyProjectInfo($copyProjectID);
-        // 基础信息：所属项目集、项目名称、项目代号、项目描述、所属产品、所属计划。
-        $copyProject = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($copyProjectID)->fetch();
-       
-        $programID   = $copyProject->parent;//项目集
-        $name        = $copyProject->name;  //名称
-        $code        = $copyProject->code;  //代号
-        $desc        = $copyProject->desc;  //描述
-        $products    = $this->product->getProducts($copyProjectID);//产品
-        $model       = $copyProject->model;
-
-        //计划
-        foreach($products as $product)
-        {
-            foreach($product->branches as $branch)
-            {
-                $productPlans[$product->id][$branch] = $this->loadModel('productplan')->getPairs($product->id, $branch, 'noclosed', true);
-            }
-        }
-
-        // 迭代：所属项目、执行名称、执行代号、执行类型（scrum）
-        
-        // 阶段：所属项目、阶段名称、工作量占比、阶段类型、访问控制、里程牌、输出
-
-        // 任务：模块、所属执行、任务类型、所属模块、任务名称、优先级、预计故事点、任务描述。
-
-        // 文档（文档目录）。
-
-        //过程（过程裁剪）。
-
-        //QA（质量保证计划）：所属过程、所属执行、检查对象。
-
-        //团队、权限、人员安排清空。
-
-
-
-        $this->fetch('project', 'create', "model=$model&programID=$programID&copyProjectID=$copyProjectID");
-    }
-
     /**
      * Edit a project.
      *
diff --git a/module/project/js/create.js b/module/project/js/create.js
index bcadb00653..3b4a07d3ea 100644
--- a/module/project/js/create.js
+++ b/module/project/js/create.js
@@ -82,6 +82,33 @@ $(function()
     });
 
     $(document).on('change', "select[id^='branch']", disableSelectedBranch);
+
+    $("#copypart").click(function() 
+    {
+        $("#copytype").val(1);
+    });
+
+    $("#copyall").click(function() 
+    {
+        $("#copytype").val(2);
+    });
+
+    $("#copyTypeConfirm").click(function() 
+    {
+        console.log(model)
+        console.log(programID)
+        console.log($("#copyProjectID").val())
+        if($("#copytype").val() == 1)
+        {
+            location.href = createLink('project', 'create', 'model=' + model + '&programID=' + programID + '&copyProjectID=' + $("#copyProjectID").val());
+        }
+        else
+        {
+            location.href = createLink('project', 'copyproject', 'model=' + model + '&programID=' + programID + '&copyProjectID=' + $("#copyProjectID").val());
+        }
+    });
+
+    
 });
 
 /**
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index 7a926190c6..7fd879b29c 100755
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -28,19 +28,6 @@
 <?php js::set('manageProducts', $lang->project->manageProducts);?>
 <?php $requiredFields = $config->project->create->requiredFields;?>
 <?php js::set('requiredFields', $requiredFields);?>
-<?php js::set('test1', ['aaa'=>['bbbb'=>2],'vvvv','vcccc']);?>
-<?php js::set('test2', ['aaa', 'vvvv','vcccc']);?>
-<script> 
-
-sessionStorage.setItem("testkey",JSON.stringify(test1))
-// for(i in testkey){
-//   console.log(i);           //获得属性
-//   console.log(testkey[i]);  //获得属性值
-
-// }
-console.log(sessionStorage.getItem("testkey"));
-
-</script>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
@@ -242,6 +229,7 @@ console.log(sessionStorage.getItem("testkey"));
         <a href='javascript:;' data-id='<?php echo $id;?>' class='nobr <?php echo $active;?>'><?php echo html::icon($lang->icons['project'], 'text-muted') . ' ' . $name;?></a>
         <?php else: ?>
         <a data-id='<?php echo $id;?>' class='nobr <?php echo $active;?>' data-toggle='modal' data-target='#copyProjectConfirmModal'><?php echo html::icon($lang->icons['project'], 'text-muted') . ' ' . $name;?></a>
+        <?php echo html::hidden('copyProjectID', 0); ?>
         <?php endif; ?>
         </div>
       <?php endforeach;?>
@@ -252,7 +240,7 @@ console.log(sessionStorage.getItem("testkey"));
 </div>
 
 <div class='modal fade modal-scroll-inside' id='copyProjectConfirmModal'>
-  <div class='modal-dialog mw-900px'>
+  <div class='modal-dialog mw-900px' style="height: 400px">
     <div class='modal-header'>
       <button type='button' class='close' data-dismiss='modal'><i class="icon icon-close"></i></button>
       <h2 class='text-center'>
@@ -263,19 +251,42 @@ console.log(sessionStorage.getItem("testkey"));
       </h4>
     </div>
     <div class='modal-body'>
-      <?php if(empty($copyProjects)):?>
-      <div class='alert with-icon'>
-        <i class='icon-exclamation-sign'></i>
-        <div class='content'><?php echo $lang->project->copyNoProject;?></div>
-      </div>
-      <?php else:?>
-      <div id='copyProjects' class='row'>
-      <?php foreach ($copyProjects as $id => $name):?>
-        <?php $active = ($copyProjectID == $id) ? ' active' : '';?>
-        <div class='col-md-4 col-sm-6'><a href='javascript:;' data-id='<?php echo $id;?>' class='nobr <?php echo $active;?>'><?php echo html::icon($lang->icons['project'], 'text-muted') . ' ' . $name;?></a></div>
-      <?php endforeach;?>
-      </div>
-      <?php endif;?>
+        <div class='col-md-4' style="border-style: solid; height: 150px;" id="copypart">
+          <div class='col-sm-6'>
+          <h2>部分信息</h2> 
+            <i class="icon icon-check">基本信息</i>
+          </div>
+        </div>
+        <div class='col-md-8' style="border-style: solid; height: 150px;" id="copyall">
+          <div class='col-md-12' style="height: 80px;">
+            <h2>全部信息</h2>
+            <div class='col-md-4'>
+              <i class="icon icon-check"></i>基本信息
+            </div>
+            <div class='col-md-4'>
+              <i class="icon icon-check"></i>阶段/迭代
+            </div>
+            <div class='col-md-4'>
+              <i class="icon icon-check"></i>文档（文档目录）
+            </div>
+          </div>
+          <div class='col-md-12' style="height: 70px;">
+            <div class='col-md-4'>
+              <i class="icon icon-check"></i>任务
+            </div>
+            <div class='col-md-4'>
+              <i class="icon icon-check"></i>QA（质量保证计划）
+            </div>
+            <div class='col-md-4'>
+              <i class="icon icon-check"></i>过程（过程裁剪）
+            </div>
+          </div>
+        </div>
+        <div class='col-md-12 text-center'> 
+        <?php echo html::hidden('copytype', 1); ?>
+        <?php echo html::commonButton($lang->save, 'id="copyTypeConfirm"', 'btn btn-wide btn-primary'); ?>
+        
+        </div>
     </div>
   </div>
 </div>