diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index 9a5eeb83..63a00787 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -4,16 +4,9 @@
 			<el-tabs>
 				<el-tab-pane  label="需求详情">
 					<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
-						<el-row class="padding-bottom">
+						<el-row class="padding-bottom"> 
 						<el-steps :active="parseInt(editForm.status)" simple finish-status="success" align-center>
-							<el-step @click.native="on_click(0)" title="初始"></el-step>
-							<el-step @click.native="on_click(1)" title="设计中"></el-step>
-							<el-step @click.native="on_click(2)" title="开发中"></el-step>
-							<el-step @click.native="on_click(3)" title="测试中"></el-step>
-							<el-step @click.native="on_click(4)" title="uat测试"></el-step>
-							<el-step @click.native="on_click(5)" title="已上线"></el-step>
-							<el-step @click.native="on_click(6)" title="已下线"></el-step>
-							<el-step @click.native="on_click(7)" title="已删除"></el-step>
+							<el-step v-for="(item,index) in dicts.menuStatus" @click.native="on_click(item.id)" :title="item.name" :key="index"></el-step> 
 						</el-steps>
 						</el-row>
 						
@@ -114,6 +107,21 @@ import XmMenuOverview from './XmMenuOverview.vue';
 						menuId:'',menuName:'',pmenuId:'',productId:'',remark:'',status:'',online:'',demandUrl:'',codeUrl:'',designUrl:'',docUrl:'',helpUrl:'',operDocUrl:'',seqNo:'1',mmUserid:'',mmUsername:'',ntype:'0',childrenCnt:0,sinceVersion:''
 				},
 				userSelectVisible:false,
+				dicts:{
+					menuStatus:[
+						
+							{id:"0", name:"初始"},
+							{id:"1", name:"待评审"},
+							{id:"2", name:"待设计"},
+							{id:"3", name:"待开发"},
+							{id:"4", name:"待SIT"},
+							{id:"5", name:"待UAT"},
+							{id:"6", name:"待上线"},
+							{id:"7", name:"运行中"},
+							{id:"8", name:"已下线"},
+							{id:"9", name:"已删除"}, 
+					]
+				},
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 
 				/**end 在上面加自定义属性**/
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 3087e193..faa6f9fd 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -6,18 +6,21 @@
 			</el-col>
 			<el-col :span="xmProduct?24:19" class="padding-left">
 					<el-row>  
+						<el-select  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-select  v-model="filters.taskFilterType" placeholder="是否分配了任务？" clearable >
 							<el-option   value="not-join"  label="未分配任何任务的需求"></el-option>  
 							<el-option   value="join"  label="已分配任务的需求"></el-option>  
 						</el-select>  
-						<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询" clearable> 
+						
+						<el-input v-model="filters.key" style="width: 15%;" 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>
 						
-						<el-button  v-if="!selProject&&!xmIteration&&disabledMng!=false"  type="primary" @click="showAdd" icon="el-icon-plus">需求</el-button>
-						<el-button  v-if="!selProject&&!xmIteration&&disabledMng!=false"    @click="toBatchEdit" icon="el-icon-edit">修改</el-button>   
+						<el-button  v-if="!selProject&&!xmIteration&&disabledMng!=false"  type="primary" @click="showAdd" icon="el-icon-plus">需求</el-button> 
 						
-						<el-button   v-if=" batchEditVisible==false&&disabledMng!=false "       @click="loadTasksToXmMenuState" icon="el-icon-s-marketing">进度</el-button>  
+						<el-button   v-if=" batchEditVisible==false&&disabledMng!=false "       @click="loadTasksToXmMenuState" icon="el-icon-s-marketing">汇总进度</el-button>  
 						<el-popover
 							placement="top-start"
 							title=""
@@ -77,12 +80,7 @@
 							</el-row> 
 							<el-button  slot="reference" icon="el-icon-more"></el-button>
 						</el-popover>  
- 					</el-row> 
-					<el-row v-if="filters.parentMenuList && filters.parentMenuList.length>0" class="padding-top padding-left">
-						<el-breadcrumb separator-class="el-icon-arrow-right">
-							<el-breadcrumb-item v-for="(item ,index) in filters.parentMenuList" :key="index"   ><el-tag :type="filters.parentMenu.menuId==item.menuId?'success':'info'"  @close="clearParentMenu(item,index)" closable @click="onParentMenuClick(item,index)">{{item.menuName}}</el-tag></el-breadcrumb-item> 
-						</el-breadcrumb> 
-					</el-row> 
+					 </el-row>  
 					<el-row class="padding-top">  
 						<el-table lazy :load="loadMenusLazy"   stripe fit border ref="table" :max-height="tableHeight" :data="xmMenusTreeData"  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">
 							<el-table-column sortable type="selection" width="40"></el-table-column> 
@@ -101,7 +99,12 @@
 										</el-popover> 
 									</font>
 								</template>
-							</el-table-column>   
+							</el-table-column>  
+							<el-table-column prop="status" label="状态"  width="80" show-overflow-tooltip> 
+								<template slot-scope="scope"> 
+									{{dicts.menuStatus.some(i=>i.id==scope.row.status)?dicts.menuStatus.find(i=>scope.row.status==i.id).name:''}}
+								</template>
+							</el-table-column>  
 							<el-table-column prop="finishRate" label="进度"  width="80" show-overflow-tooltip> 
 								<template slot-scope="scope"> 
 										<span v-if="scope.row.finishRate"><el-tag :type="scope.row.finishRate>=100?'success':'warning'">{{scope.row.finishRate}}%</el-tag></span>
@@ -304,7 +307,21 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{
+					menuStatus:[
+						
+							{id:"0", name:"初始"},
+							{id:"1", name:"待评审"},
+							{id:"2", name:"待设计"},
+							{id:"3", name:"待开发"},
+							{id:"4", name:"待SIT"},
+							{id:"5", name:"待UAT"},
+							{id:"6", name:"待上线"},
+							{id:"7", name:"运行中"},
+							{id:"8", name:"已下线"},
+							{id:"9", name:"已删除"}, 
+					]
+				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
 				addFormVisible: false,//新增xmMenu界面是否显示
 				//新增xmMenu界面初始化数据
@@ -332,6 +349,7 @@
 				dateRanger: [ ],  
 				pickerOptions:  util.pickerOptions('datarange'),
 				productVisible:false,
+				tagSelectVisible:false,
  				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index 1c1c24fb..cdafee18 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -1,22 +1,25 @@
 <template>
 	<section class="padding">
 			<el-row>
-			  	<el-select v-model="filters.bugStatus" placeholder="请选择状态"   clearable @change="changeBugStatus">
+			  	<el-select v-model="filters.bugStatus" placeholder="状态" style="width:100px;"  clearable @change="changeBugStatus">
 					<el-option v-for="(b,index) in options['bugStatus']" :value="b.optionValue"  :key="index" :label="b.optionName">{{b.optionName}}
 					</el-option>
 				</el-select>
-				<el-select class="hidden-md-and-down" v-model="filters.priority" placeholder="紧急程度"   clearable @change="changePriority">
+				<el-select class="hidden-md-and-down" v-model="filters.priority" placeholder="紧急程度"  style="width:120px;"  clearable @change="changePriority">
 					<el-option v-for="(b,index) in options['urgencyLevel']" :value="b.optionValue" :key="index" :label="b.optionName">{{b.optionName}}
 					</el-option>
 				</el-select>
-				<el-select class="hidden-md-and-down" v-model="filters.bugSeverity" placeholder="请选择严重程度" clearable @change="changeBugSeverity">
+				<el-select class="hidden-md-and-down" v-model="filters.bugSeverity" placeholder="严重程度"  style="width:120px;" clearable @change="changeBugSeverity">
 					<el-option v-for="(b,index) in options['bugSeverity']" :value="b.optionValue" :key="index" :label="b.optionName">{{b.optionName}}
 					</el-option>
 				</el-select>
-				
 				<el-input style="width:200px;" v-model="filters.key" placeholder="缺陷名称" clearable> 
 				</el-input>
 				<el-button @click="searchXmQuestions" type="primary" icon="el-icon-search"></el-button>
+				
+				<el-button v-if="!filters.tags||filters.tags.length==0" @click.native="tagSelectVisible=true">标签</el-button>
+				<el-tag v-else @click="tagSelectVisible=true"   closable @close="clearFiltersTag(filters.tags[0])">{{filters.tags[0].tagName.substr(0,5)}}等({{filters.tags.length}})个</el-tag>
+ 
 				<el-button type="primary" icon="el-icon-plus" @click="showAdd">
 				</el-button>
 				<el-popover
@@ -118,21 +121,7 @@
 					</el-row>
 					<el-button  slot="reference" icon="el-icon-more"></el-button>
 				</el-popover> 
-			 </el-row>
-			 <el-row>
-				 <el-tag  @click="showProductVisible"  v-if="  filters.product "  closable    @close="clearProduct">{{this.filters.product.productName}}</el-tag>
-				<el-button v-else    @click="showProductVisible" type="plian">产品</el-button> 
-				<el-tag v-if="filters.selProject && !selProject" closable @close="clearProject" @click="showProjectList(true)">{{ filters.selProject.name }}</el-tag>
-				<el-button v-else @click="showProjectList(true)" >选择项目</el-button>
-				<el-button v-if="!filters.tags||filters.tags.length==0" @click.native="tagSelectVisible=true">标签</el-button>
-				<el-tag v-else @click="tagSelectVisible=true"   closable @close="clearFiltersTag(filters.tags[0])">{{filters.tags[0].tagName.substr(0,5)}}等({{filters.tags.length}})个</el-tag>
-			 	<el-button v-if=" !filters.menus || filters.menus.length==0" @click="showMenu"> 需求</el-button>
-				<el-tag v-else  @click="showMenu"  closable @close="clearFiltersMenu(filters.menus[0])">{{filters.menus[0].menuName.substr(0,5)}}等({{filters.menus.length}})个</el-tag>
-			 	 
-				<el-button v-if="!filters.handlerUsername" @click="showGroupUsers('handlerUser')">选择被指派人</el-button>
-				<el-tag v-else closable @close="clearHandler"  @click="showGroupUsers('handlerUser')">指派给{{filters.handlerUsername}}的</el-tag>
-				<el-button v-if="filters.handlerUserid!=userInfo.userid" @click="setFiltersHandlerAsMySelf">指派给我的</el-button>
-			 </el-row>
+			 </el-row> 
 			 <el-row class="padding-top">
 				<!--列表 XmQuestion xm_question-->
 				<el-table  ref="table" :height="tableHeight" :data="xmQuestions" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">