From 12f1cee2f6fe04998b72c26c8b5416256d5e1759 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 3 Mar 2022 17:54:06 +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          | 4 ++--
 src/views/xm/core/xmMenu/XmMenuSelect.vue       | 2 +-
 src/views/xm/core/xmMenu/XmMenuWithPlan.vue     | 8 ++++----
 src/views/xm/core/xmQuestion/XmQuestionEdit.vue | 8 ++++++++
 src/views/xm/core/xmTask/XmTaskList.vue         | 2 +-
 src/views/xm/core/xmTask/XmTaskListForMenu.vue  | 2 +-
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 3c914547..badffbcf 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -144,8 +144,8 @@
 											<el-button type="text"    slot="reference" icon="el-icon-plus">添加子需求</el-button>
 										</el-popover>   
 										<font v-else>
-											<el-button     type="text"  @click="showTaskListForMenu(scope.row,scope.$index)"  icon="el-icon-s-operation">查任务</el-button>
-											<el-button    type="text"  @click="showTaskList(scope.row,scope.$index)"  icon="el-icon-s-operation">关联任务</el-button> 
+											<el-button  :disabled="scope.row.ntype=='1'"   type="text"  @click="showTaskListForMenu(scope.row,scope.$index)"  icon="el-icon-s-operation">查任务</el-button>
+											<el-button  :disabled="scope.row.ntype=='1'"  type="text"  @click="showTaskList(scope.row,scope.$index)"  icon="el-icon-s-operation">关联任务</el-button> 
 										</font>
 									</el-row>
 								</template>
diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index 6a674c35..475f4392 100644
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@@ -90,7 +90,7 @@
 						</el-table-column> 
 						<el-table-column label="操作"    width="100" fixed="right"  >
 							<template slot-scope="scope"> 
-								<el-button    type="primary" @click="selectedMenu( scope.row,scope.$index)">选择</el-button> 
+								<el-button  :disabled="scope.row.ntype=='1'"  type="primary" @click="selectedMenu( scope.row,scope.$index)">选择</el-button> 
 							</template>
 						</el-table-column>
 					</el-table>
diff --git a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
index e6c020d7..45f8aeff 100644
--- a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
+++ b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
@@ -84,8 +84,8 @@
 					</el-table-column>
 					<el-table-column label="操作" width="100" fixed="right"  >
 						<template slot-scope="scope">
-							<el-button v-if="scope.row.projectId" type="text" @click="showTasks(scope.row)"  icon="el-icon-tickets">查看任务</el-button>
-							<el-tag v-else type="warning">未关联任务</el-tag>
+							<el-button :disabled="scope.row.ntype=='1'" v-if="scope.row.projectId" type="text" @click="showTasks(scope.row)"  icon="el-icon-tickets">查看任务</el-button>
+							<el-tag  v-else type="warning">{{scope.row.ntype=='1'?'无需关联任务':'未关联任务'}}</el-tag>
 						</template>
 					</el-table-column>
 				</el-table>
@@ -133,8 +133,8 @@
 					</el-table-column> 
 					<el-table-column label="操作" width="100" fixed="right"  >
 						<template slot-scope="scope">
-							<el-button v-if="scope.row.projectId" type="text" @click="showTasks(scope.row)"  icon="el-icon-tickets">查看任务</el-button>
-							<el-tag v-else type="warning">未关联任务</el-tag>
+							<el-button :disabled="scope.row.ntype=='1'" v-if="scope.row.projectId" type="text" @click="showTasks(scope.row)"  icon="el-icon-tickets">查看任务</el-button>
+							<el-tag v-else type="warning">{{scope.row.ntype=='1'?'无需关联任务':'未关联任务'}}</el-tag>
 						</template>
 					</el-table-column>
  				</el-table>
diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index 595a9723..491f64f8 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -355,6 +355,10 @@
 				this.selectTaskVisible=true;
 			},
 			onSelectedTask(task){
+				if(task.ntype=='1'){
+					this.$notify({showClose: true, message: "您选择的【"+task.name+"】属于任务集，请重新选择。建议选择树中叶子节点", type: 'error' });
+					return;
+				}
 				this.editForm.taskId=task.id
 				this.editForm.taskName=task.name
 				if(!this.editForm.menuId){
@@ -388,6 +392,10 @@
 				this.selectMenuVisible=true;
 			},
 			onSelectedMenu(menu){
+				if(menu.ntype=='1'){
+					this.$notify({showClose: true, message: "您选择的【"+menu.menuName+"】属于需求集，请重新选择。建议选择树中叶子节点", type: 'error' });
+					return;
+				}
 				this.editForm.menuId=menu.menuId
 				this.editForm.menuName=menu.menuName
 				this.editForm.productId=menu.productId
diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue
index c8053a75..ef5ef875 100644
--- a/src/views/xm/core/xmTask/XmTaskList.vue
+++ b/src/views/xm/core/xmTask/XmTaskList.vue
@@ -70,7 +70,7 @@
 							
 							<el-table-column   v-if="!isMultiSelect"  header-align="center" label="操作" fixed="right" width="100">
 								<template slot-scope="scope">
-									<el-button    type="primary" @click.stop="selectedTask(scope.row)" >选择</el-button> 	
+									<el-button  :disabled="scope.row.ntype=='1'"  type="primary" @click.stop="selectedTask(scope.row)" >选择</el-button> 	
 								</template>
 							</el-table-column>
 						</el-table>
diff --git a/src/views/xm/core/xmTask/XmTaskListForMenu.vue b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
index e8431491..f8c18dab 100644
--- a/src/views/xm/core/xmTask/XmTaskListForMenu.vue
+++ b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
@@ -74,7 +74,7 @@
 						</el-table-column>
 						<el-table-column   v-if="isMultiSelect==false"  header-align="center" label="操作" fixed="right" width="100">
 							<template slot-scope="scope">
-								<el-button    type="primary" @click.stop="selectedTask(scope.row)" >选择</el-button> 	
+								<el-button  :disabled="scope.row.ntype=='1'"  type="primary" @click.stop="selectedTask(scope.row)" >选择</el-button> 	
 							</template>
 						</el-table-column>
 					</el-table>