From b05dc91231a780243e775d200e48c747debdacae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 19 Jun 2022 10:11:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmTask/XmPhase.vue   | 56 +++++++++++++++++++++-----
 src/views/xm/core/xmTask/XmTaskMng.vue |  3 +-
 2 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue
index 19919bff..cb947076 100644
--- a/src/views/xm/core/xmTask/XmPhase.vue
+++ b/src/views/xm/core/xmTask/XmPhase.vue
@@ -23,12 +23,10 @@
                 <div    class="icon" :style="{backgroundColor:   '#E6A23C'}">
                   <i :class=" 'el-icon-odometer' " ></i>
                 </div>  
-                <el-button
-                  v-if="isTaskCenter != '1' && isMy != '1'"
-                  @click="showEpicFeaturesForCreateTask"
-                  type="primary"
+                <el-button 
+                  @click="showEpicFeaturesForCreateTask" 
                   icon="el-icon-plus"
-                  >由用户故事快速创建计划 (推荐)</el-button
+                  >由史诗特性快速创建计划 (推荐)</el-button
                 >
               </el-col>
               <el-col :span="24" style="padding-top: 5px">
@@ -36,8 +34,7 @@
                 <div    class="icon" :style="{backgroundColor:   '#E6A23C'}">
                   <i :class=" 'el-icon-odometer' " ></i>
                 </div>  
-                <el-button
-                  v-if="isTaskCenter != '1' && isMy != '1'"
+                <el-button 
                   @click="showTaskTemplate"
                   icon="el-icon-plus"
                   >从模板快速导入计划 </el-button
@@ -48,8 +45,7 @@
                 <div    class="icon" :style="{backgroundColor:   '#E6A23C'}">
                   <i :class=" 'el-icon-odometer' " ></i>
                 </div>  
-                <el-button
-                  v-if="isTaskCenter != '1' && isMy != '1'"
+                <el-button 
                   @click="showAdd('1')"
                   icon="el-icon-plus"
                   >直接创建计划</el-button
@@ -61,7 +57,7 @@
               type="primary"
               round
               icon="el-icon-plus"
-              title="新建计划、任务"
+              title="新建计划"
             ></el-button>
           </el-popover>
           <el-button
@@ -192,7 +188,45 @@
                   </el-link>  
 									<div class="tool-bar">
                     <span class="u-btn">
-                         <el-button   :style="{backgroundColor:  '#E6A23C'}"  @click.stop="showSubAdd( scope.row,scope.$index,'1')" icon="el-icon-plus" title="新建计划" circle plain size="mini"> </el-button>   
+                        <el-popover
+                          placement="top-start"
+                          title="选择创建计划/任务的方式"
+                          width="300"
+                          trigger="hover"
+                        >
+                          <el-row>
+                            <el-col :span="24" style="padding-top: 5px">
+                              
+                              <div    class="icon" :style="{backgroundColor:   '#E6A23C'}">
+                                <i :class=" 'el-icon-odometer' " ></i>
+                              </div>  
+                              <el-button 
+                                @click="showEpicFeaturesForCreateSubTask(scope.row)" 
+                                icon="el-icon-plus"
+                                >由史诗特性快速创建子计划 (推荐)</el-button
+                              >
+                            </el-col>
+                            <el-col :span="24" style="padding-top: 5px">
+                              
+                              <div    class="icon" :style="{backgroundColor:   '#E6A23C'}">
+                                <i :class=" 'el-icon-odometer' " ></i>
+                              </div>  
+                              <el-button 
+                                @click="showTaskTemplate"
+                                icon="el-icon-plus"
+                                >从模板快速导入子计划 </el-button
+                              >
+                            </el-col>
+                            <el-col :span="24" style="padding-top: 5px">
+                              
+                              <div    class="icon" :style="{backgroundColor:   '#E6A23C'}">
+                                <i :class=" 'el-icon-odometer' " ></i>
+                              </div>  
+                              <el-button   @click.stop="showSubAdd( scope.row,scope.$index,'1')" icon="el-icon-plus" title="新建子计划">直接创建子计划 </el-button>   
+                            </el-col> 
+                          </el-row> 
+                           <el-button   slot="reference"  :style="{backgroundColor:  '#E6A23C'}"   icon="el-icon-plus" title="新建子计划" circle plain size="mini"> </el-button>   
+                        </el-popover> 
                         <el-button      @click.stop="showEdit( scope.row,scope.$index)" icon="el-icon-edit" title="编辑" circle plain size="mini"> </el-button>     
                      </span>
 									</div>
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 1d39b4e9..d3d133b2 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -225,8 +225,7 @@
                 </div>  
                 <el-button
                   v-if="isTaskCenter != '1' && isMy != '1'"
-                  @click="showMenu"
-                  type="primary"
+                  @click="showMenu" 
                   icon="el-icon-plus"
                   >由用户故事快速创建任务(推荐)</el-button
                 >