From f112f3db6e682c17c5e15f78bff6074aad22fe1e 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, 17 Mar 2022 17:21:09 +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        |  8 +++---
 src/views/xm/core/xmMenu/XmMenuMngBatch.vue   |  8 +++---
 .../xmProduct/XmProductForProjectComplex.vue  |  2 +-
 src/views/xm/core/xmProject/XmProjectInfo.vue |  2 +-
 src/views/xm/core/xmTask/XmTaskList.vue       | 27 +++++++++++++------
 5 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 568c986f..2c9c7c00 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -1,6 +1,6 @@
 <template>
 	<section class="padding">
-		<el-row v-if=" !batchEditVisible">  
+		<el-row v-show=" !batchEditVisible">  
 			<el-col :span="24" class="padding-left">
 					<el-row>   
 						
@@ -196,8 +196,8 @@
 											<el-button type="text"    slot="reference" icon="el-icon-plus">{{scope.row.ntype=='1'?'子需求':''}}</el-button>
 										</el-popover>   
 										<font>
-											<el-button  v-if="scope.row.ntype!='1'"  type="text"  @click="showTaskListForMenu(scope.row,scope.$index)"  icon="el-icon-s-operation">查任务</el-button>
-											<el-button  v-if="scope.row.ntype!='1'"  type="text"  @click="showTaskList(scope.row,scope.$index)"  icon="el-icon-s-operation">关联任务</el-button> 
+											<el-button  v-if="scope.row.ntype!=='1'"  type="text"  @click="showTaskListForMenu(scope.row,scope.$index)"  icon="el-icon-s-operation">查任务</el-button>
+											<el-button  v-if="scope.row.ntype!=='1'"  type="text"  @click="showTaskList(scope.row,scope.$index)"  icon="el-icon-s-operation">关联任务</el-button> 
 										</font>
 									</el-row>
 								</template>
@@ -228,7 +228,7 @@
 					<xm-product-select :sel-project="selProject" @row-click="onProductSelected" ref="xmProductMng" :simple="true"></xm-product-select>
 				</el-drawer> 
 				<el-drawer title="选中任务" :visible.sync="selectTaskVisible"   size="80%"  append-to-body   :close-on-click-modal="false">
-					<xm-task-list :xm-product="filters.product" :sel-project="selProject" :is-multi-select="true"  @tasks-selected="onSelectedTasks"></xm-task-list>
+					<xm-task-list :xm-product="filters.product" :sel-project="selProject" :query-scope="planTask" :check-scope="task"  :is-multi-select="true"  @tasks-selected="onSelectedTasks"></xm-task-list>
 				</el-drawer> 
 				<el-drawer title="查看任务" :visible.sync="taskListForMenuVisible" :with-header="false"  size="80%"  append-to-body   :close-on-click-modal="false">
 					<xm-task-list-for-menu  :xm-product="filters.product"  :is-multi-select="true" :menu-id="editForm.menuId"></xm-task-list-for-menu>
diff --git a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
index c9f67cef..15569975 100644
--- a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
@@ -32,16 +32,16 @@
 					
 					<el-table-column  label="需求属性" width="500" >  
 						<template slot-scope="scope"> 
-							 <el-select v-model="scope.row.dtype" title="需求类型" clearable placeholder="需求类型">
+							 <el-select v-model="scope.row.dtype" title="需求类型" clearable placeholder="需求类型" @change="fieldChange(scope.row,'dtype')">
 								<el-option v-for="i in dicts.demandType" :label="i.name" :key="i.id" :value="i.id"></el-option>
 							</el-select>    
-							<el-select v-model="scope.row.source"  title="需求来源" placeholder="需求来源"  clearable>
+							<el-select v-model="scope.row.source"  title="需求来源" placeholder="需求来源"  clearable @change="fieldChange(scope.row,'dtype')">
 								<el-option v-for="i in dicts.demandSource" :label="i.name" :key="i.id" :value="i.id"></el-option>
 							</el-select>     
-							<el-select v-model="scope.row.dlvl"  title="需求层次" placeholder="需求层次"  clearable class="hidden-md-and-down">
+							<el-select v-model="scope.row.dlvl"  title="需求层次" placeholder="需求层次"  clearable class="hidden-md-and-down" @change="fieldChange(scope.row,'dtype')">
 								<el-option v-for="i in dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
 							</el-select>    
-							<el-select v-model="scope.row.priority"  title="优先级" placeholder="优先级"  clearable>
+							<el-select v-model="scope.row.priority"  title="优先级" placeholder="优先级"  clearable @change="fieldChange(scope.row,'dtype')">
 									<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option> 
 							</el-select>  
 						</template>
diff --git a/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue b/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue
index 7f0309c6..e1887bc1 100644
--- a/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue
+++ b/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue
@@ -37,7 +37,7 @@
 						<xm-product-project-for-link v-if="xmProduct && showPanel=='projects'"  :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-product-project-for-link>
 					</el-tab-pane>
 					<el-tab-pane label="需求" lazy name="menus" v-if="xmProduct && xmProduct.id">
-						<xm-menu-mng v-if="xmProduct && showPanel=='menus'"   :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"  :disabled-mng="false"></xm-menu-mng>
+						<xm-menu-mng v-if="xmProduct && showPanel=='menus'"   :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"  :disabled-mng="true"></xm-menu-mng>
 					</el-tab-pane>
 					<el-tab-pane label="任务" lazy name="tasks"  v-if="xmProduct && xmProduct.id">
 						<xm-task-mng v-if="xmProduct && showPanel=='tasks'" queryScope="task" ptype="0" :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-task-mng>
diff --git a/src/views/xm/core/xmProject/XmProjectInfo.vue b/src/views/xm/core/xmProject/XmProjectInfo.vue
index 3d73993b..73dfeadf 100644
--- a/src/views/xm/core/xmProject/XmProjectInfo.vue
+++ b/src/views/xm/core/xmProject/XmProjectInfo.vue
@@ -134,7 +134,7 @@
 		  	<xm-project-overview-complex v-if="infotype=='项目概览'" :sel-project="selProject" @submit="afterEditSubmit"></xm-project-overview-complex>  
 			 <xm-iteration-for-project-complex  v-if="infotype=='迭代'" ref="xmIterationMng" :sel-project="selProject"></xm-iteration-for-project-complex>
  			 <xm-product-for-project-complex  v-if="infotype=='产品'" ref="xmProductComplex" :sel-project="selProject"></xm-product-for-project-complex>
-			 <xm-menu-mng v-if="infotype=='需求'" :sel-project="selProject" :disabled-mng="false"></xm-menu-mng>
+			 <xm-menu-mng v-if="infotype=='需求'" :sel-project="selProject"></xm-menu-mng>
 			 <xm-task-mng v-if="infotype=='任务'" ref="xmTaskMng" :sel-project="selProject" ptype="0" queryScope="task" key="task"></xm-task-mng>
 			  <xm-question v-if="infotype=='缺陷'" :qtype="'bug'" :sel-project='selProject' ref="xmQuestion"></xm-question>
 			  <xm-group-mng v-if="infotype=='团队'" :sel-project="selProject"></xm-group-mng>
diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue
index cd4ee6e8..e436d766 100644
--- a/src/views/xm/core/xmTask/XmTaskList.vue
+++ b/src/views/xm/core/xmTask/XmTaskList.vue
@@ -7,8 +7,8 @@
 							placement="right"
 							width="400"
 							trigger="click"> 
-							<xm-project-select v-if="ptype==='0' && (!selProject||!selProject.id)" :auto-select="true"  :xm-iteration="xmIteration" :xm-product="xmProduct"  @row-click="onProjectRowClick"></xm-project-select>
-								<el-link type="warning" slot="reference" v-if="ptype==='0' && (!selProject||!selProject.id)"  icon="el-icon-search"><font style="font-size:14px;">{{filters.selProject?filters.selProject.name:'选择项目'}}</font></el-link> 
+							<xm-project-select v-if="ptype!=='1' && (!selProject||!selProject.id)" :auto-select="true"  :xm-iteration="xmIteration" :xm-product="xmProduct"  @row-click="onProjectRowClick" @clear-select="onProjectClear"></xm-project-select>
+								<el-link type="warning" slot="reference" v-if="ptype!=='1' && (!selProject||!selProject.id)"  icon="el-icon-search"><font style="font-size:14px;">{{filters.selProject?filters.selProject.name:'选择项目'}}</font></el-link> 
 						</el-popover> 
 						
 						<el-select v-model="filters.taskType" placeholder="请选择任务类型" clearable @change="changeTaskType">
@@ -254,6 +254,17 @@
 				if(this.ptype){ 
 					params.ptype=this.ptype
 				}
+				if(params.ptype!=='1'){
+					if(!params.projectId){
+						this.$notify({showClose:true,message:'请选择一个项目',type:'warning'})
+						return;
+					}
+				}else{
+					if(!params.productId){
+						this.$notify({showClose:true,message:'请选择一个产品',type:'warning'})
+						return;
+					}
+				}
 				getTask(params).then((res) => {
 					var tips=res.data.tips;
 					if(tips.isOk){ 
@@ -303,12 +314,7 @@
 				if (this.filters.selProject) {
 					params.projectId = this.filters.selProject.id;
 				}
-				params.workexec = "true";
-				if (this.projectPhase) {
-					{
-					params.phaseId = this.projectPhase.id;
-					}
-				}
+				params.workexec = "true"; 
 				if (this.isMy == "1") {
 					params.userid = this.userInfo.userid;
 					params.isMy = "1";
@@ -500,6 +506,11 @@
 				this.filters.selProject=project 
 				this.getXmTasks();
 			},  
+			onProjectClear(){
+				this.filters.selProject=null;
+				this.xmTasks=[];
+				this.searchXmTasks();
+			}
 		},//end methods
 		components: {   
 			 XmProjectSelect