From 66a4b0611f3129fd15d5b02ea4c3eb373c4bdf02 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, 20 Mar 2022 22:13:21 +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

---
 .../xm/core/xmIterationMenu/XmIterationMenuMng.vue     |  2 +-
 src/views/xm/core/xmMenu/XmMenuMng.vue                 | 10 ++++++++++
 src/views/xm/core/xmMenu/XmMenuSelect.vue              |  4 ++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
index 7bbcc83e..bc5c4843 100644
--- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
+++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
@@ -40,7 +40,7 @@
 				</el-row>
 			</el-col> 
 			<el-drawer append-to-body title="需求选择" :visible.sync="menuVisible"  size="70%"   :close-on-click-modal="false">
-				<xm-menu-select :xm-iteration="xmIteration" :visible="menuVisible" :is-select-menu="true" :multi="true"   @menus-selected="onSelectedMenus" ></xm-menu-select>
+				<xm-menu-select  :xm-iteration="xmIteration" :visible="menuVisible" :is-select-menu="true" :multi="true"   @menus-selected="onSelectedMenus" ></xm-menu-select>
 			</el-drawer>
 		</el-row>
 	</section>
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 27eaa92b..94212608 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -293,6 +293,7 @@
 		<xm-menu-select
 			:visible="parentMenuVisible"
 			:is-select-menu="true" 
+			check-scope="1"
 			@selected="onParentMenuSelected" 
 			:xm-product="filters.product"
 		></xm-menu-select>
@@ -1009,6 +1010,11 @@
 				}
 			},
 			doBatchDelXmIterationMenu(){
+				
+				if(!this.filters.iteration||!this.filters.iteration.id){
+					this.$notify({showClose:true,message:"请选择一个迭代进行操作",type:'warning'})
+					return;
+				}
 				if(this.sels.length==0){
 					this.$notify({showClose:true,message:"请选择一个或者多个需求进行操作",type:'warning'})
 					return;
@@ -1026,6 +1032,10 @@
 				})
 			},
 			doBatchAddXmIterationMenu(){
+				if(!this.filters.iteration||!this.filters.iteration.id){
+					this.$notify({showClose:true,message:"请选择一个迭代进行操作",type:'warning'})
+					return;
+				}
 				if(this.sels.length==0){
 					this.$notify({showClose:true,message:"请选择一个或者多个需求进行操作",type:'warning'})
 					return;
diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index 7bf5cc96..cb18eff8 100644
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@@ -125,7 +125,7 @@
 						</el-table-column> 
 						<el-table-column label="操作"    width="100" fixed="right"  >
 							<template slot-scope="scope"> 
-								<el-button  :disabled="scope.row.ntype=='1'"  type="primary" @click="selectedMenu( scope.row,scope.$index)">选择</el-button> 
+								<el-button  :disabled="checkScope && checkScope!==scope.row.ntype"  type="primary" @click="selectedMenu( scope.row,scope.$index)">选择</el-button> 
 							</template>
 						</el-table-column>
 					</el-table>
@@ -167,7 +167,7 @@
 	import { mapGetters } from 'vuex'
 	
 	export default { 
-		props:['isSelectMenu','multi','visible','xmIteration','xmProduct','selProject'],
+		props:['isSelectMenu','multi','visible','xmIteration','xmProduct','selProject','checkScope'/**0-需求，1-需求池 */],
 		computed: {
 		    ...mapGetters([
 		      'userInfo','roles'