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

---
 src/views/xm/core/xmMenu/XmMenuMng.vue | 22 ++++++++++++----------
 src/views/xm/core/xmTask/XmTaskMng.vue |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 08e965e7..25cc76a7 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -124,10 +124,11 @@
 							</el-table-column> 
 							<el-table-column   label="操作"  width="260" show-overflow-tooltip> 
 								<template slot-scope="scope">   
-										<el-popover style="padding-left:10px;" 
-											v-if="disabledMng!=false"
+									<el-row v-if="disabledMng!=false">
+										<el-popover style="padding-left:10px;"  
 											placement="top-start"
 											width="250"
+											v-if="scope.row.ntype=='1'"
 											trigger="click" > 
 											<el-row> 
 												<el-col :span="24" style="padding-top:5px;">
@@ -137,14 +138,15 @@
 													<el-button  @click="showImportFromMenuTemplate(scope.row)" icon="el-icon-upload2">由模板快速导入子需求</el-button> 
 												</el-col> 
 											</el-row>   
-											<el-button type="primary" :disabled="scope.row.ntype!='1'"  slot="reference" icon="el-icon-plus"></el-button>
-										</el-popover>  
-
-										<el-button v-if="!selProject" :disabled="scope.row.ntype=='1'"  type="text"  @click="showTaskListForMenu(scope.row,scope.$index)"  icon="el-icon-s-operation">任务</el-button>
-										<el-button v-if="selProject" :disabled="scope.row.ntype=='1'" type="text"  @click="showTasks(scope.row,scope.$index)"  icon="el-icon-s-operation">任务</el-button> 
-										<el-button  type="text" :disabled="scope.row.ntype=='1'" @click="toIterationList(scope.row,scope.$index)"  icon="el-icon-document-copy">迭代</el-button>
-										<el-button type="text" v-if="disabledMng!=false" :disabled="scope.row.childrenCnt>0" @click="handleDel(scope.row)" icon="el-icon-delete">删除</el-button>   
- 
+											<el-button type="text"    slot="reference" icon="el-icon-plus">添加子需求</el-button>
+										</el-popover>   
+										<font v-else>
+											<el-button v-if="!selProject"    type="text"  @click="showTaskListForMenu(scope.row,scope.$index)"  icon="el-icon-s-operation">任务</el-button>
+											<el-button v-if="selProject"   type="text"  @click="showTasks(scope.row,scope.$index)"  icon="el-icon-s-operation">任务</el-button> 
+											<el-button  type="text"   @click="toIterationList(scope.row,scope.$index)"  icon="el-icon-document-copy">迭代</el-button> 
+										</font>
+										<el-button type="text"  :disabled="scope.row.childrenCnt>0" @click="handleDel(scope.row)" icon="el-icon-delete">删除</el-button>   
+									</el-row>
 								</template>
 							</el-table-column>   
 							
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 2409d28f..90178f25 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -490,7 +490,7 @@
                 <template slot-scope="scope">
                   <el-dropdown
                     @command="handleCommand"
-                    v-if="isTaskCenter != '1' && isMy != '1'"
+                    v-if="isTaskCenter != '1' && isMy != '1' && scope.row.ntype=='1'"
                     :disabled="scope.row.ntype!='1'"
                   >
                     <span class="el-dropdown-link">