From b585990abeb51f3fc1117ef584034f36694f6fa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 16 Jun 2021 12:55:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E6=A0=B9=E6=8D=AE=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E4=BA=86=E8=BF=AD=E4=BB=A3=E3=80=81=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=88=86=E9=85=8D=E4=BA=86=E4=BB=BB=E5=8A=A1=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E8=BF=87=E6=BB=A4=E6=95=85=E4=BA=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmMenu/XmMenuSelect.vue | 35 ++++++++++++++++++-----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index 6e71e1b1..6298b530 100644
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@@ -8,7 +8,14 @@
 			</el-col>
 			<el-col :span="18"  style="padding-left:12px;" >
 				<el-row  >  
-					<el-checkbox class="hidden-md-and-down" v-if="excludeIterationId" v-model="filters.excludeIterationAll" true-label="1" false-label="">排除已加入其它迭代的故事</el-checkbox>
+ 					<el-select class="hidden-md-and-down" v-if="excludeIterationId" v-model="filters.itertaionFilterType" placeholder="是否加入过迭代？" clearable  >
+						<el-option   value="not-join"  label="未加入任何迭代的故事"></el-option>  
+						<el-option   value="join"  label="已加入迭代的故事"></el-option>  
+					</el-select>
+					<el-select class="hidden-md-and-down" v-else v-model="filters.taskFilterType" placeholder="是否分配了任务？" clearable  >
+						<el-option   value="not-join"  label="未分配任何任务的故事"></el-option>  
+						<el-option   value="join"  label="已分配任务的故事"></el-option>  
+					</el-select> 
 					<el-date-picker
 						v-model="dateRanger" 
 						type="daterange"
@@ -32,8 +39,17 @@
 						width="400"
 						trigger="click" >
 						<el-row> 
-							<el-col  :span="24"  style="padding-top:5px;">
-								<el-checkbox v-if="excludeIterationId" v-model="filters.excludeIterationAll" true-label="1" false-label="">排除已加入其它迭代的故事</el-checkbox>
+							<el-col  :span="24"  style="padding-top:5px;"  v-if="excludeIterationId">
+								<el-select class="hidden-md-and-down" v-if="excludeIterationId" v-model="filters.itertaionFilterType" placeholder="是否加入过迭代？" clearable  >
+									<el-option   value="not-join"  label="未加入任何迭代的故事"></el-option>  
+									<el-option   value="join"  label="已加入迭代的故事"></el-option>  
+								</el-select>
+							</el-col>
+							<el-col  :span="24"  style="padding-top:5px;" v-else> 
+								<el-select class="hidden-md-and-down" v-model="filters.taskFilterType" placeholder="是否分配了任务？" clearable >
+									<el-option   value="not-join"  label="未分配任何任务的故事"></el-option>  
+									<el-option   value="join"  label="已分配任务的故事"></el-option>  
+								</el-select> 
 							</el-col>
 							<el-col :span="24"  style="padding-top:5px;">
 								<font class="more-label-font">创建时间:</font>  
@@ -144,8 +160,9 @@
 				filters: {
 					key: '',
 					product:null,
-					excludeIterationAll:'1',
+					itertaionFilterType:'not-join',////join,not-join,''
 					mmUser:null,
+					taskFilterType:'',//join,not-join,''
 				},
 				xmMenus: [],//查询结果
 				pageInfo:{//分页数据
@@ -249,10 +266,14 @@
 				}
 				if(this.excludeIterationId ){
 					params.excludeIterationId=this.excludeIterationId
-					if(this.filters.excludeIterationAll){
-						params.excludeIterationAll=this.filters.excludeIterationAll
+					if(this.filters.itertaionFilterType){
+						params.itertaionFilterType=this.filters.itertaionFilterType
 					}
-				} 
+				}else{
+					if(this.filters.taskFilterType){
+					params.taskFilterType=this.filters.taskFilterType
+				}
+				}
 				
 				this.load.list = true;
 				listXmMenu(params).then((res) => {