diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 3d2a899c..6af240cf 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -7,82 +7,26 @@
 								 
 						<xm-it-select v-if="!xmIteration || !xmIteration.id" style="display:inline;"  :product-id="filters.product?filters.product.id:null" :link-project-id="selProject?selProject.id:null"   placeholder="迭代"  @row-click="onIterationSelected" @clear="onIterationClearSelect">
 					    </xm-it-select> 
-						<el-select   v-model="filters.iterationFilterType" placeholder="加入过迭代？" clearable   >
-							<el-option   value="not-join-any-iteration"  label="未加入过迭代"></el-option>  
-							<el-option   value="join-any-iteration"  label="已加入过迭代"></el-option>  
-							<el-option   value="not-join-curr-iteration"  :label="'未加入迭代【'+filters.iteration.iterationName+'】'"  v-if="filters.iteration && filters.iteration.id"></el-option>  
-							<el-option   value="join-curr-iteration"  :label="'已加入本迭代【'+filters.iteration.iterationName+'】'" v-if="filters.iteration && filters.iteration.id"></el-option>  
-						</el-select>  
-						<el-select  v-model="filters.taskFilterType" placeholder="已分配任务的需求？" clearable >
+						
+						<el-select  v-model="filters.taskFilterType" placeholder="已分配任务的需求？" clearable v-if="selProject &&selProject.id">
 							<el-option   value="not-join-any-project"  label="未分配过任务的需求"></el-option>  
 							<el-option   value="join-any-project"  label="已分配过任务的需求"></el-option>  
 							<el-option   value="not-join-curr-project"  :label="'未分配任务到项目【'+selProject.name+'】'" v-if="selProject && selProject.id"></el-option>  
 							<el-option   value="join-curr-project"  :label="'已分配任务到项目【'+selProject.name+'】'"  v-if="selProject && selProject.id"></el-option>  
-						</el-select>   
-						<span style="float:right;">
-						<el-popover style="padding-left:10px;"  
-							placement="top-start"
-							width="250" 
-							trigger="click" > 
-							<el-row> 
-								<el-col :span="24" style="padding-top:5px;">
-									<div   class="icon" style="background-color:  rgb(255, 153, 51);">
- 										<i class="el-icon-s-promotion"></i>
-									</div>
-									<el-button   @click="showAdd('1')">新建史诗</el-button> 
-								</el-col>  
-								<el-col :span="24" style="padding-top:5px;"> 
-									<div  class="icon" style="background-color:  rgb(0, 153, 51);">
-									<i class="el-icon-s-flag"></i>
-									</div>
-									<el-button   @click="showAdd('2')">新建特性</el-button> 
-								</el-col>  
-								<el-col :span="24" style="padding-top:5px;">
-									
-									<div  class="icon" style="background-color:  rgb(79, 140, 255);">
-									<i class="el-icon-document"></i>
-									</div> 
-									<el-button   @click="showAdd('3')"  >新建用户故事</el-button> 
-								</el-col>  
-
-
-								<el-col :span="24" style="padding-top:5px;">
-									<el-button  @click="showImportFromMenuTemplate()" icon="el-icon-upload2">由模板快速导入需求</el-button> 
-								</el-col> 
-							</el-row>   
-							<el-button type="primary"  round  slot="reference" icon="el-icon-plus"></el-button>
-						</el-popover>
-						 
-						<el-button  @click="showParentMenu" icon="el-icon-top" title="更换上级"></el-button>
- 						<el-button  v-if="disabledMng!=false"  type="danger" @click="batchDel" icon="el-icon-delete" title="删除"></el-button>  
-						<el-button class="hidden-md-and-down"  v-if=" batchEditVisible==false&&disabledMng!=false "       @click="loadTasksToXmMenuState" icon="el-icon-s-marketing" title="汇总进度"></el-button>  
-						
-						<xm-table-config ref="tableConfig" style="display:inline;" :table="$refs.table"></xm-table-config>   
-						
-						</span>
-					</el-row>
-					<el-row>   
-						
-						<el-select   v-model="filters.dtype" clearable placeholder="需求类型" style="width: 120px;">
-							<el-option v-for="i in this.dicts.demandType" :label="i.name" :key="i.id" :value="i.id"></el-option>
-						</el-select>    
-						<el-select class="hidden-md-and-down"  v-model="filters.source" placeholder="需求来源"  clearable style="width: 120px;">
-							<el-option v-for="i in this.dicts.demandSource" :label="i.name" :key="i.id" :value="i.id"></el-option>
-						</el-select>     
-						<el-select class="hidden-md-and-down" v-model="filters.dlvl" placeholder="需求层次"  clearable style="width: 120px;">
-							<el-option v-for="i in this.dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
-						</el-select>    
+						</el-select>  
+						<el-select v-if=" !selProject || !selProject.id"  v-model="filters.iterationFilterType" placeholder="加入过迭代？" clearable>
+							<el-option   value="not-join-any-iteration"  label="未加入过迭代"></el-option>  
+							<el-option   value="join-any-iteration"  label="已加入过迭代"></el-option>  
+							<el-option   value="not-join-curr-iteration"  :label="'未加入迭代【'+filters.iteration.iterationName+'】'"  v-if="filters.iteration && filters.iteration.id"></el-option>  
+							<el-option   value="join-curr-iteration"  :label="'已加入本迭代【'+filters.iteration.iterationName+'】'" v-if="filters.iteration && filters.iteration.id"></el-option>  
+						</el-select>          
 						
 						<el-select   v-model="filters.priority" placeholder="优先级"  clearable style="width: 100px;">
 								<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option> 
 						</el-select>      
 						<el-select class="hidden-md-and-down" v-model="filters.status" placeholder="需求状态" clearable style="width: 100px;">
 							<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.menuStatus" :key="index"></el-option> 
-						</el-select> 
-						
-						<el-button class="hidden-md-and-down" v-if="!filters.tags||filters.tags.length==0" @click.native="tagSelectVisible=true">标签条件</el-button>
-						<el-tag class="hidden-md-and-down" v-else @click="tagSelectVisible=true"   closable @close="clearFiltersTag(filters.tags[0])">{{filters.tags[0].tagName.substr(0,5)}}等({{filters.tags.length}})个</el-tag>
-    
+						</el-select>  
 						<el-input v-model="filters.key" style="width: 220px;" placeholder="需求名称查询" clearable> 
 						</el-input> 
 						<el-button   type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmMenus" icon="el-icon-search"></el-button>
@@ -122,7 +66,30 @@
 									<el-button   v-else @click="selectFiltersMmUser()">选责任人</el-button>
 									<el-button    @click="setFiltersMmUserAsMySelf()">我的</el-button>
 								</el-col> 
-								<el-col  :span="24"  style="padding-top:5px;" class="hidden-lg-and-up">
+								
+								<el-col  :span="24"  style="padding-top:5px;">
+									<font class="more-label-font">
+										需求是否已加入迭代:
+									</font>  
+									<el-select   v-model="filters.iterationFilterType" placeholder="加入过迭代？" clearable   >
+										<el-option   value="not-join-any-iteration"  label="未加入过迭代"></el-option>  
+										<el-option   value="join-any-iteration"  label="已加入过迭代"></el-option>  
+										<el-option   value="not-join-curr-iteration"  :label="'未加入迭代【'+filters.iteration.iterationName+'】'"  v-if="filters.iteration && filters.iteration.id"></el-option>  
+										<el-option   value="join-curr-iteration"  :label="'已加入本迭代【'+filters.iteration.iterationName+'】'" v-if="filters.iteration && filters.iteration.id"></el-option>  
+									</el-select>    
+								</el-col>
+								<el-col  :span="24"  style="padding-top:5px;" >
+									<font class="more-label-font">
+										需求是否已分配了任务:
+									</font>  
+									<el-select  v-model="filters.taskFilterType" placeholder="已分配任务的需求？" clearable >
+										<el-option   value="not-join-any-project"  label="未分配过任务的需求"></el-option>  
+										<el-option   value="join-any-project"  label="已分配过任务的需求"></el-option>  
+										<el-option   value="not-join-curr-project"  :label="'未分配任务到项目【'+selProject.name+'】'" v-if="selProject && selProject.id"></el-option>  
+										<el-option   value="join-curr-project"  :label="'已分配任务到项目【'+selProject.name+'】'"  v-if="selProject && selProject.id"></el-option>  
+									</el-select>    
+								</el-col>
+								<el-col  :span="24"  style="padding-top:5px;" >
 									<font class="more-label-font">
 										需求类型:
 									</font>  
@@ -130,7 +97,7 @@
 										<el-option v-for="i in this.dicts.demandType" :label="i.name" :key="i.id" :value="i.id"></el-option>
 									</el-select>   
 								</el-col>
-								<el-col  :span="24"  style="padding-top:5px;" class="hidden-xl-only">
+								<el-col  :span="24"  style="padding-top:5px;" >
 									<font class="more-label-font">
 										需求来源:
 									</font>  
@@ -138,7 +105,7 @@
 										<el-option v-for="i in this.dicts.demandSource" :label="i.name" :key="i.id" :value="i.id"></el-option>
 									</el-select>     
 								</el-col>
-								<el-col  :span="24"  style="padding-top:5px;" class="hidden-xl-only">
+								<el-col  :span="24"  style="padding-top:5px;" >
 									<font class="more-label-font">
 										需求层次:
 									</font>  
@@ -146,7 +113,7 @@
 										<el-option v-for="i in this.dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
 									</el-select>    
 								</el-col>
-								<el-col  :span="24"  style="padding-top:5px;" class="hidden-xl-only">
+								<el-col  :span="24"  style="padding-top:5px;">
 									<font class="more-label-font">
 										优先级:
 									</font>  
@@ -154,7 +121,7 @@
 											<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option> 
 									</el-select>   
 								</el-col> 
-								<el-col  :span="24"  style="padding-top:5px;" class="hidden-lg-and-up">
+								<el-col  :span="24"  style="padding-top:5px;" >
 									<font class="more-label-font">
 										需求状态:
 									</font>   
@@ -162,14 +129,6 @@
 										<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.menuStatus" :key="index"></el-option> 
 									</el-select> 
 								</el-col> 
-						 
-						
-
-								<el-button class="hidden-lg-and-down" v-if="!filters.tags||filters.tags.length==0" @click.native="tagSelectVisible=true">标签条件</el-button>
-								<el-tag class="hidden-lg-and-down" v-else @click="tagSelectVisible=true"   closable @close="clearFiltersTag(filters.tags[0])">{{filters.tags[0].tagName.substr(0,5)}}等({{filters.tags.length}})个</el-tag>
-			
-
-
 								<el-col  :span="24"  style="padding-top:5px;">
 									<el-button type="primary"  @click="searchXmMenus" icon="el-icon-search">查询</el-button>
  								</el-col> 
@@ -181,6 +140,47 @@
 							</el-row>  
 								<el-button  slot="reference" icon="el-icon-more"></el-button> 
 						</el-popover>   
+						<span style="float:right;">
+						<el-popover style="padding-left:10px;"  
+							placement="top-start"
+							width="250" 
+							trigger="click" > 
+							<el-row> 
+								<el-col :span="24" style="padding-top:5px;">
+									<div   class="icon" style="background-color:  rgb(255, 153, 51);">
+ 										<i class="el-icon-s-promotion"></i>
+									</div>
+									<el-button   @click="showAdd('1')">新建史诗</el-button> 
+								</el-col>  
+								<el-col :span="24" style="padding-top:5px;"> 
+									<div  class="icon" style="background-color:  rgb(0, 153, 51);">
+									<i class="el-icon-s-flag"></i>
+									</div>
+									<el-button   @click="showAdd('2')">新建特性</el-button> 
+								</el-col>  
+								<el-col :span="24" style="padding-top:5px;">
+									
+									<div  class="icon" style="background-color:  rgb(79, 140, 255);">
+									<i class="el-icon-document"></i>
+									</div> 
+									<el-button   @click="showAdd('3')"  >新建用户故事</el-button> 
+								</el-col>  
+
+
+								<el-col :span="24" style="padding-top:5px;">
+									<el-button  @click="showImportFromMenuTemplate()" icon="el-icon-upload2">由模板快速导入需求</el-button> 
+								</el-col> 
+							</el-row>   
+							<el-button type="primary"  round  slot="reference" icon="el-icon-plus"></el-button>
+						</el-popover>
+						 
+						<el-button  @click="showParentMenu" icon="el-icon-top" title="更换上级"></el-button>
+ 						<el-button  v-if="disabledMng!=false"  type="danger" @click="batchDel" icon="el-icon-delete" title="删除"></el-button>  
+						<el-button class="hidden-md-and-down"  v-if=" batchEditVisible==false&&disabledMng!=false "       @click="loadTasksToXmMenuState" icon="el-icon-s-marketing" title="汇总进度"></el-button>  
+						
+						<xm-table-config ref="tableConfig" style="display:inline;" :table="$refs.table"></xm-table-config>   
+						
+						</span> 
 					 </el-row>  
 					<el-row class="padding-top">  
 						<el-table :cell-style="cellStyleCalc" :header-cell-style="cellStyleCalc" :row-style="{height:'60px'}" lazy :load="loadXmMenusLazy" stripe fit border ref="table" :height="maxTableHeight" :data="xmMenusTreeData" current-row-key="menuId" row-key="menuId" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick">
diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index c18f6d14..0f99048c 100644
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@@ -6,34 +6,8 @@
 						<xm-product-select v-if="!xmProduct&&!xmIteration" :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected" ref="xmProductMng" :iteration-id="xmIteration?xmIteration.id:null"  @clear-select="onProductClearSelect" @close="productVisible=false"></xm-product-select>
  
 						<xm-iteration-select v-if="!xmIteration" :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="onIterationSelected" ref="xmIterationMng" :product-id="xmProduct?xmProduct.id:null"  @clear-select="onIterationClearSelect" @close="iterationVisible=false"></xm-iteration-select>
-							 
-					<el-select  v-model="filters.taskFilterType" placeholder="已分配任务的需求？" clearable style="width: 160px;">
-						<el-option   value="not-join-any-project"  label="未分配过任务的需求"></el-option>  
-						<el-option   value="join-any-project"  label="已分配过任务的需求"></el-option>  
-						<el-option   value="not-join-curr-project"  :label="'未分配任务到项目【'+selProject.name+'】'" v-if="selProject && selProject.id"></el-option>  
-						<el-option   value="join-curr-project"  :label="'已分配任务到项目【'+selProject.name+'】'"  v-if="selProject && selProject.id"></el-option>  
-					</el-select>   
-					<el-select   v-model="filters.iterationFilterType" placeholder="加入过迭代？" clearable  style="width: 160px;">
-						<el-option   value="not-join-any-iteration"  label="未加入过迭代"></el-option>  
-						<el-option   value="join-any-iteration"  label="已加入过迭代"></el-option>  
-						<el-option   value="not-join-curr-iteration"  :label="'未加入迭代【'+filters.iteration.iterationName+'】'"  v-if="filters.iteration && filters.iteration.id"></el-option>  
-						<el-option   value="join-curr-iteration"  :label="'已加入本迭代【'+filters.iteration.iterationName+'】'" v-if="filters.iteration && filters.iteration.id"></el-option>  
-					</el-select> 
-
-					<el-select v-model="filters.dtype" clearable placeholder="需求类型" style="width: 100px;">
-						<el-option v-for="i in this.dicts.demandType" :label="i.name" :key="i.id" :value="i.id"></el-option>
-					</el-select>    
-					<el-select v-model="filters.source" placeholder="需求来源"  clearable style="width: 100px;">
-						<el-option v-for="i in this.dicts.demandSource" :label="i.name" :key="i.id" :value="i.id"></el-option>
-					</el-select>     
-					<el-select v-model="filters.dlvl" placeholder="需求层次"  clearable class="hidden-md-and-down" style="width: 100px;">
-						<el-option v-for="i in this.dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
-					</el-select>     
-				</el-row>
-				<el-row>     
-					<el-button class="hidden-md-and-down" v-if="!filters.tags||filters.tags.length==0" @click.native="tagSelectVisible=true">标签条件</el-button>
-					<el-tag class="hidden-md-and-down" v-else @click="tagSelectVisible=true"   closable @close="clearFiltersTag(filters.tags[0])">{{filters.tags[0].tagName.substr(0,5)}}等({{filters.tags.length}})个</el-tag>
-					<el-select v-model="filters.priority" placeholder="优先级"  clearable style="width: 100px;">
+							    
+					 <el-select v-model="filters.priority" placeholder="优先级"  clearable style="width: 100px;">
 							<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option> 
 					</el-select>      
 					<el-select  v-model="filters.status" placeholder="需求状态" clearable style="width: 100px;">
@@ -78,6 +52,62 @@
 								<el-button   v-else @click="selectFiltersMmUser()">选责任人</el-button>
 								<el-button    @click="setFiltersMmUserAsMySelf()">我的</el-button>
 							</el-col>
+							<el-col  :span="24"  style="padding-top:5px;" class="hidden-log-and-up">
+								<font class="more-label-font">
+									需求是否加入了迭代:
+								</font>  
+								<el-select   v-model="filters.iterationFilterType" placeholder="加入过迭代？" clearable >
+									<el-option   value="not-join-any-iteration"  label="未加入过迭代"></el-option>  
+									<el-option   value="join-any-iteration"  label="已加入过迭代"></el-option>  
+									<el-option   value="not-join-curr-iteration"  :label="'未加入迭代【'+filters.iteration.iterationName+'】'"  v-if="filters.iteration && filters.iteration.id"></el-option>  
+									<el-option   value="join-curr-iteration"  :label="'已加入本迭代【'+filters.iteration.iterationName+'】'" v-if="filters.iteration && filters.iteration.id"></el-option>  
+								</el-select>  
+							</el-col>
+							
+							<el-col  :span="24"  style="padding-top:5px;" class="hidden-log-and-up">
+								<font class="more-label-font">
+									需求是否分配了任务:
+								</font>   
+								<el-select  v-model="filters.taskFilterType" placeholder="已分配任务的需求？" clearable >
+									<el-option   value="not-join-any-project"  label="未分配过任务的需求"></el-option>  
+									<el-option   value="join-any-project"  label="已分配过任务的需求"></el-option>  
+									<el-option   value="not-join-curr-project"  :label="'未分配任务到项目【'+selProject.name+'】'" v-if="selProject && selProject.id"></el-option>  
+									<el-option   value="join-curr-project"  :label="'已分配任务到项目【'+selProject.name+'】'"  v-if="selProject && selProject.id"></el-option>  
+								</el-select>   
+							</el-col>
+							<el-col  :span="24"  style="padding-top:5px;" class="hidden-log-and-up">
+								<font class="more-label-font">
+									需求层次:
+								</font>  
+								<el-select v-model="filters.dlvl" placeholder="需求层次"  clearable>
+									<el-option v-for="i in this.dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
+								</el-select>  
+							</el-col>
+							<el-col  :span="24"  style="padding-top:5px;" class="hidden-log-and-up">
+								<font class="more-label-font">
+									需求类型:
+								</font>  
+								<el-select v-model="filters.dtype" clearable placeholder="需求类型" style="width: 100px;">
+									<el-option v-for="i in this.dicts.demandType" :label="i.name" :key="i.id" :value="i.id"></el-option>
+								</el-select>   
+							</el-col>
+							<el-col  :span="24"  style="padding-top:5px;" class="hidden-log-and-up">
+								<font class="more-label-font">
+									需求来源:
+								</font>  
+ 
+								<el-select v-model="filters.source" placeholder="需求来源"  clearable style="width: 100px;">
+									<el-option v-for="i in this.dicts.demandSource" :label="i.name" :key="i.id" :value="i.id"></el-option>
+								</el-select>     
+							</el-col>
+							<el-col  :span="24"  style="padding-top:5px;" class="hidden-log-and-up">
+								<font class="more-label-font">
+									需求层次:
+								</font>  
+								<el-select v-model="filters.dlvl" placeholder="需求层次"  clearable class="hidden-md-and-down" style="width: 100px;">
+									<el-option v-for="i in this.dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
+								</el-select>    
+							</el-col>
 							<el-col  :span="24"  style="padding-top:5px;" class="hidden-log-and-up">
 								<font class="more-label-font">
 									需求层次: