diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 0d0b6c45..f294b343 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -26,7 +26,7 @@
 						<el-button v-if=" batchEditVisible==true && isPmUser " type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> 
 					</el-row>
 					<el-row v-show="batchEditVisible" class="app-container">
-						
+						<div>123456789</div>
 						<el-table :data="xmMenusTreeData" class="drag-table" default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 							<el-table-column sortable type="selection" width="45"></el-table-column>
 							<el-table-column sortable prop="seqNo"  label="序号" min-width="100">
@@ -76,7 +76,7 @@
 							<el-table-column sortable type="selection" width="40"></el-table-column> 
 							<el-table-column prop="menuName" label="故事名称" min-width="140" > 
 								<template slot-scope="scope">
-									<el-link type="primary"  @click="showMenuExchange(scope.row)">{{scope.row.seqNo}}&nbsp;&nbsp;{{scope.row.menuName}}</el-link>
+									{{scope.row.seqNo}}&nbsp;&nbsp;<el-link type="primary"  @click="showMenuExchange(scope.row)">{{scope.row.menuName}}</el-link>
 								</template>
 							</el-table-column> 
 							<el-table-column prop="mmUsername" label="负责人" min-width="80" >  
@@ -96,7 +96,7 @@
 										trigger="click" >
 										<div v-html="scope.row.remark">
 										</div> 
-										<el-button slot="reference">{{scope.row.remark?scope.row.remark.substr(0,20)+"...":""}}</el-button>
+										<div slot="reference">{{scope.row.remark?scope.row.remark.substr(0,20)+"...":""}}</div>
 									</el-popover> 
 									<div v-else v-html="scope.row.remark"> 
 									</div>
@@ -185,7 +185,7 @@
 	
 	import  XmMenuAdd from './XmMenuAdd';//新增界面
 	import  XmMenuEdit from './XmMenuEdit';//修改界面
-	import  XmProductMng from '../xmProduct/XmProductMng';//新增界面
+	import  XmProductMng from '../xmProduct/XmProductSelect';//新增界面
 	import  XmMenuTemplateMng from '../xmMenuTemplate/XmMenuTemplateMng';//新增界面
 	import XmMenuRichDetail from './XmMenuRichDetail';
 	import XmTaskList from '../xmTask/XmTaskList';
diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index eb10e976..a1641014 100644
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@@ -1,48 +1,52 @@
 <template>
 	<section>
-		<el-row class="app-container">  
-			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
-			<el-button   type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmMenus">查询</el-button>
-			<el-button   type="warning" v-if="multi"  v-on:click="multiSelectedConfirm">确认选择</el-button>
-
- 		</el-row>
 		
-		<el-row class="app-container">  
-			<el-col  :span="6">
+		
+		<el-row>  
+			<el-col  :span="6"  class="app-container">
 				<xm-product-mng @row-click="onProductSelected" ref="xmProductMng" :simple="true"></xm-product-mng>
 			</el-col>
-			<el-col :span="18">
-				<el-table :data="xmMenusTreeData" default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
-					 <el-table-column v-if="multi" type="selection" width="50"></el-table-column>  
-					 <el-table-column prop="menuName" label="故事名称" min-width="140" > 
-						<template slot-scope="scope">
- 							<el-link @click="toMenu(scope.row)">{{scope.row.seqNo}}&nbsp;&nbsp;{{scope.row.menuName}}</el-link> 
+			<el-col :span="18" >
+				<el-row  class="app-container">  
+					<el-input v-model="filters.key" style="width: 30%;" placeholder="模糊查询">
+						<template slot="append">
+							<el-button   type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmMenus" icon="el-icon-search"></el-button>
 						</template>
-					</el-table-column> 
-					 <el-table-column prop="mmUsername" label="负责人" min-width="100" > </el-table-column>
-					<el-table-column prop="remark" label="描述" min-width="140" > 
-						<template slot-scope="scope">
-							  <el-popover
-							  	v-if="scope.row.remark && scope.row.remark.length>20"
-								placement="top-start"
-								title="故事备注"
-								width="400"
-								trigger="click"
-								:content="scope.row.remark">
-								<el-button slot="reference">{{scope.row.remark?scope.row.remark.substr(0,20)+"...":""}}</el-button>
-							</el-popover> 
-							<div v-else v-html="scope.row.remark"></div>
-						</template>
-					</el-table-column> 
-					<el-table-column label="操作"  v-if="!multi" width="200" fixed="right"  >
-						<template slot-scope="scope">
- 							<el-button    type="primary" @click="selectedMenu( scope.row,scope.$index)">选择</el-button>
-
-						</template>
-					</el-table-column>
-				</el-table>
-				<el-pagination  layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination> 
-				
+					</el-input>  
+					<el-button   type="warning" v-if="multi"  v-on:click="multiSelectedConfirm">确认选择</el-button>
+				</el-row>
+				<el-row class="app-container">
+					<el-table :data="xmMenusTreeData" default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+						<el-table-column v-if="multi" type="selection" width="50"></el-table-column>  
+						<el-table-column prop="menuName" label="故事名称" min-width="140" > 
+							<template slot-scope="scope">
+								{{scope.row.seqNo}}&nbsp;&nbsp;<el-link @click="toMenu(scope.row)">{{scope.row.menuName}}</el-link> 
+							</template>
+						</el-table-column> 
+						<el-table-column prop="mmUsername" label="负责人" min-width="100" > </el-table-column>
+						<el-table-column prop="remark" label="描述" min-width="140" > 
+							<template slot-scope="scope">
+								<el-popover
+									v-if="scope.row.remark && scope.row.remark.length>20"
+									placement="top-start"
+									title="故事备注"
+									width="400"
+									trigger="click"
+									:content="scope.row.remark">
+									<div slot="reference">{{scope.row.remark?scope.row.remark.substr(0,20)+"...":""}}</div>
+								</el-popover> 
+								<div v-else v-html="scope.row.remark"></div>
+							</template>
+						</el-table-column> 
+						<el-table-column label="操作"  v-if="!multi" width="200" fixed="right"  >
+							<template slot-scope="scope"> 
+								<el-button    type="primary" @click="selectedMenu( scope.row,scope.$index)">选择</el-button> 
+							</template>
+						</el-table-column>
+					</el-table>
+					<el-pagination  layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination> 
+					
+				</el-row>
 			</el-col>  
 			
 			<el-dialog title="故事谈论" :visible.sync=" menuDetailVisible"  width="80%"  append-to-body   :close-on-click-modal="false">
@@ -57,7 +61,7 @@
 	//import Sticky from '@/components/Sticky' // 粘性header组件
 	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
 	import { listXmMenu  } from '@/api/xm/core/xmMenu';
- 	import  XmProductMng from '../xmProduct/XmProductMng';//新增界面
+ 	import  XmProductMng from '../xmProduct/XmProductSelect';//新增界面
  	import XmMenuRichDetail from './XmMenuRichDetail';
 
 	import {sn} from '@/common/js/sequence'
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index c9444829..d6c9105b 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -1,20 +1,24 @@
 <template>
 	<section>
-		<el-row v-if="simple!=true" class="app-container">
-			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
-			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProducts">查询</el-button>
-			<el-button type="primary" @click="showAdd">+产品</el-button>
+		<el-row  class="app-container">
+			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
+				<template slot="append">
+					
+					<el-button v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProducts" icon="el-icon-search"></el-button>
+				</template>
+			</el-input> 
+			<el-button type="primary" @click="showAdd" icon="el-icon-plus"></el-button>
 
-			<el-button v-if="isSelectProduct!=true" type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> 
+			<el-button  type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true" icon="el-icon-delete"></el-button> 
 		</el-row>
-		<el-row  v-show="simple!=true" class="app-container"> 
+		<el-row  class="app-container"> 
 			<!--列表 XmProduct 产品表-->
-			<el-table   :data="xmProducts" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table  max-height="750" :data="xmProducts" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column   sortable type="selection" width="40"></el-table-column>
 				<el-table-column sortable type="index" width="40"></el-table-column>
  				<el-table-column prop="productName" label="产品名称" min-width="150" > 
 					<template slot-scope="scope">
-						<el-link type="primary" @click="showEdit(scope.row)">{{scope.row.id}}-{{scope.row.productName}}</el-link>
+						{{scope.row.id}}&nbsp;&nbsp;<el-link type="primary" @click="showEdit(scope.row)">{{scope.row.productName}}</el-link>
 					</template>
 				</el-table-column>
 				<el-table-column  prop="finishRate" label="进度" min-width="80" >
@@ -27,33 +31,17 @@
 				<el-table-column prop="actWorkload" label="实际工作量.人时" min-width="80" ></el-table-column> 
  				<el-table-column  label="操作" width="460" fixed="right">
 					<template slot-scope="scope"> 
-						<el-button v-if="isSelectProduct!=true" type="warning" @click="loadTasksToXmProductState(scope.row)">刷新</el-button>
-						<el-button v-if="isSelectProduct!=true" type="warning" @click="showProductState(scope.row)">报告</el-button> 
-						<el-button v-if="isSelectProduct!=true" type="success" @click="toIterationList(scope.row)">迭代</el-button>  
- 						<el-button v-if="isSelectProduct==true"  @click="selectedProduct( scope.row,scope.$index)">选择</el-button> 
-						<el-button v-if="isSelectProduct!=true" type="success" @click="toProjectList(scope.row)">项目</el-button> 
-						<el-button v-if="isSelectProduct!=true" type="success" @click="toTaskList(scope.row)">任务</el-button>
-					</template>
-				</el-table-column>
-			</el-table>
-			<el-pagination  layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination>  
-		</el-row>
-		
-		<el-row  v-show="simple==true" > 
-			<!--列表 XmProduct 产品表-->
-			<el-table   :data="xmProducts" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
- 				<el-table-column sortable type="index" width="40"></el-table-column>
-				<el-table-column  prop="id" label="产品编号" min-width="80" ></el-table-column>
-				<el-table-column prop="productName" label="产品名称" min-width="80" ></el-table-column> 
-				
-				<el-table-column v-if="isSelectProduct==true"  label="操作" width="160" fixed="right"  >
-					<template slot-scope="scope"> 
-						<el-button  @click="selectedProduct( scope.row,scope.$index)">选择</el-button> 
+						<el-button  type="warning" @click="loadTasksToXmProductState(scope.row)">刷新</el-button>
+						<el-button  type="warning" @click="showProductState(scope.row)">报告</el-button> 
+						<el-button  type="success" @click="toIterationList(scope.row)">迭代</el-button>   
+						<el-button type="success" @click="toProjectList(scope.row)">项目</el-button> 
+						<el-button  type="success" @click="toTaskList(scope.row)">任务</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
 			<el-pagination  layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination>  
 		</el-row>
+		 
 					<!--编辑 XmProduct 产品表界面-->
 			<el-dialog title="编辑产品" :visible.sync="editFormVisible"  width="50%"  append-to-body   :close-on-click-modal="false">
 				  <xm-product-edit :xm-product="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-product-edit>
@@ -90,7 +78,7 @@
 
 	
 	export default { 
-		props:['simple','isSelectProduct','selProject'],
+		props:['selProject'],
 		computed: {
 		    ...mapGetters([
 		      'userInfo','roles'
diff --git a/src/views/xm/core/xmProduct/XmProductSelect.vue b/src/views/xm/core/xmProduct/XmProductSelect.vue
new file mode 100644
index 00000000..04712652
--- /dev/null
+++ b/src/views/xm/core/xmProduct/XmProductSelect.vue
@@ -0,0 +1,167 @@
+<template>
+	<section>  
+		<el-row > 
+			<!--列表 XmProduct 产品表-->
+			<el-table   :data="xmProducts" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+ 				<el-table-column sortable type="index" width="55"></el-table-column>				
+				 <el-table-column prop="productName"  label="产品名称" min-width="150" > 
+					<template slot-scope="scope">
+						{{scope.row.id}}&nbsp;&nbsp;<el-link type="primary">{{scope.row.productName}}</el-link>
+					</template>
+				</el-table-column>
+				<el-table-column v-if="isSelectProduct==true"  label="操作" width="100" fixed="right"  >
+					<template slot-scope="scope"> 
+						<el-button  @click="selectedProduct( scope.row,scope.$index)">选择</el-button> 
+					</template>
+				</el-table-column>
+			</el-table>
+			<el-pagination  layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination>  
+		</el-row> 
+	</section>
+</template>
+
+<script>
+	import util from '@/common/js/util';//全局公共库
+	//import Sticky from '@/components/Sticky' // 粘性header组件
+	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { listXmProductWithState } from '@/api/xm/core/xmProduct';  
+	import { mapGetters } from 'vuex' 
+
+	
+	export default { 
+		props:['isSelectProduct','selProject'],
+		computed: {
+		    ...mapGetters([
+		      'userInfo','roles'
+		    ])
+		},
+		data() {
+			return {
+				filters: {
+					key: ''
+				},
+				xmProducts: [],//查询结果
+				pageInfo:{//分页数据
+					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
+					pageSize:10,//每页数据
+					count:false,//是否需要重新计算总记录数
+					pageNum:1,//当前页码、从1开始计算
+					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
+					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
+				},
+				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'}]} 
+				
+				addFormVisible: false,//新增xmProduct界面是否显示
+				//新增xmProduct界面初始化数据
+				addForm: {
+					id:'',productName:'',branchId:'',remark:''
+				},
+				
+				editFormVisible: false,//编辑界面是否显示
+				//编辑xmProduct界面初始化数据
+				editForm: {
+					id:'',productName:'',branchId:'',remark:''
+				},
+				iterationVisible:false,
+				productStateVisible:false,
+				/**begin 自定义属性请在下面加 请加备注**/
+					
+				/**end 自定义属性请在上面加 请加备注**/
+			}
+		},//end data
+		methods: { 
+			handleSizeChange(pageSize) { 
+				this.pageInfo.pageSize=pageSize; 
+				this.getXmProducts();
+			},
+			handleCurrentChange(pageNum) {
+				this.pageInfo.pageNum = pageNum;
+				this.getXmProducts();
+			},
+			// 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名
+			sortChange( obj ){
+				var dir='asc';
+				if(obj.order=='ascending'){
+					dir='asc'
+				}else{
+					dir='desc';
+				}
+				if(obj.prop=='xxx'){
+					this.pageInfo.orderFields=['xxx'];
+					this.pageInfo.orderDirs=[dir];
+				}
+				this.getXmProducts();
+			},
+			searchXmProducts(){
+				 this.pageInfo.count=true; 
+				 this.getXmProducts();
+			}, 
+			//获取列表 XmProduct 产品表
+			getXmProducts() {
+				let params = {
+					pageSize: this.pageInfo.pageSize,
+					pageNum: this.pageInfo.pageNum,
+					total: this.pageInfo.total,
+					count:this.pageInfo.count
+				};
+				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
+					let orderBys=[];
+					for(var i=0;i<this.pageInfo.orderFields.length;i++){ 
+						orderBys.push(this.pageInfo.orderFields[i]+" "+this.pageInfo.orderDirs[i])
+					}  
+					params.orderBy= orderBys.join(",")
+				}
+				if(this.filters.key!==""){
+					//params.xxx=this.filters.key
+				}else{
+					//params.xxx=xxxxx
+				}
+				if(this.selProject){
+					params.projectId=this.selProject.id
+				}
+				params.branchId=this.userInfo.branchId
+				this.load.list = true;
+				listXmProductWithState(params).then((res) => {
+					var tips=res.data.tips;
+					if(tips.isOk){ 
+						this.pageInfo.total = res.data.total;
+						this.pageInfo.count=false;
+						this.xmProducts = res.data.data;
+					}else{
+						this.$message({ message: tips.msg, type: 'error' });
+					} 
+					this.load.list = false;
+				}).catch( err => this.load.list = false );
+			},
+ 
+			//选择行xmProduct
+			selsChange: function (sels) {
+				this.sels = sels;
+			}, 
+			 
+			rowClick: function(row, event, column){
+				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
+			},
+			selectedProduct:function(row){
+				this.$emit('selected',row);
+			},
+			  
+			
+		},//end methods
+		components: {  
+		    //在下面添加其它组件
+		},
+		mounted() { 
+			this.$nextTick(() => {
+				this.getXmProducts();
+        	}); 
+		}
+	}
+
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue
index 5474512f..72a7f939 100644
--- a/src/views/xm/core/xmTask/XmTaskList.vue
+++ b/src/views/xm/core/xmTask/XmTaskList.vue
@@ -1,65 +1,66 @@
 <template>
 	<section>
 		<el-row class="xm-task"> 
-			<el-menu  active-text-color="#00abfc" :default-active="filters.taskType" @select="changeTaskType" class="el-menu-demo" mode="horizontal">
-				<el-menu-item index="all">全部任务类型</el-menu-item>
-				<el-menu-item v-for="(i,index) in options.taskType" :index="i.optionValue" :key="index">{{i.optionName}}</el-menu-item>
-				<el-tag>{{filters.selProject?filters.selProject.name:'未选择项目'}}</el-tag><el-button type="success" v-if="!selProject" @click="selectProjectVisible=true">选择项目</el-button>
-				<el-button v-if="isMultiSelect" @click="selectedTasks" type="primary">确认选择</el-button>
-			</el-menu> 
-			<el-row>
-				已选择：<el-tag v-for="(item,index) in sels" :key="index" closable @close="clearSelectTask(item)">{{item.sortLevel}}&nbsp;{{item.name}}</el-tag>
-			</el-row>
 			<el-row>
 				<el-col :span="4" v-if=" filters.selProject">
 					<xm-project-phase-mng   :sel-project="filters.selProject" :simple="true" @row-click="projectPhaseRowClick"></xm-project-phase-mng>
 				</el-col>
 				<el-col :span=" filters.selProject?20:24">
-					<el-table
-						ref="taskTable"
-						show-summary
-						:data="tasksTreeData"
-						@sort-change="sortChange"
-						v-loading="load.list"
-						@row-click="rowClick"
-						@selection-change="selsChange" 
-						highlight-current-row
-						stripe
-						fit
-						default-expand-all 
-						:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-						row-key="id"
-						>
- 						<el-table-column v-show="isMultiSelect" reserve-selection sortable width="50" type="selection"></el-table-column>
-						<el-table-column prop="name" label="任务名称"  min-width="260" >
-							<template slot-scope="scope">
-								{{scope.row.sortLevel}}&nbsp;{{scope.row.name}}
-							</template>
-						</el-table-column> 
-						<el-table-column prop="menuName" min-width="150" label="故事"></el-table-column>
-						<el-table-column   prop="startTime" label="任务起止时间" min-width="260">
-							<template slot-scope="scope">
-								 
-								<div  style="display:flex;align-items:center;">
-									<div>
-										<div>{{getDateString(scope.row.startTime)}}~{{getDateString(scope.row.endTime)}}</div> 
-									</div>
-									<div style="margin-left: 5px;color: #d92b2f !important;color:#bb6f2a;">
-										{{calcTaskStateByTime(scope.row.startTime,scope.row.endTime)}}
+					<el-row>
+						<el-menu  active-text-color="#00abfc" :default-active="filters.taskType" @select="changeTaskType" class="el-menu-demo" mode="horizontal">
+							<el-menu-item index="all">全部任务类型</el-menu-item>
+							<el-menu-item v-for="(i,index) in options.taskType" :index="i.optionValue" :key="index">{{i.optionName}}</el-menu-item>
+							<el-tag>{{filters.selProject?filters.selProject.name:'未选择项目'}}</el-tag><el-button type="success" v-if="!selProject" @click="selectProjectVisible=true">选择项目</el-button>
+							<el-button v-if="isMultiSelect" @click="selectedTasks" type="primary">确认选择</el-button>
+						</el-menu>  
+					</el-row>
+					<el-row>
+						<el-table
+							ref="taskTable"
+							show-summary
+							:data="tasksTreeData"
+							@sort-change="sortChange"
+							v-loading="load.list"
+							@row-click="rowClick"
+							@selection-change="selsChange" 
+							highlight-current-row
+							stripe
+							fit
+							default-expand-all 
+							:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+							row-key="id"
+							>
+							<el-table-column v-show="isMultiSelect" reserve-selection sortable width="50" type="selection"></el-table-column>
+							<el-table-column prop="name" label="任务名称"  min-width="260" >
+								<template slot-scope="scope">
+									{{scope.row.sortLevel}}&nbsp;{{scope.row.name}}
+								</template>
+							</el-table-column> 
+							<el-table-column prop="menuName" min-width="150" label="故事"></el-table-column>
+							<el-table-column   prop="startTime" label="任务起止时间" min-width="260">
+								<template slot-scope="scope">
+									
+									<div  style="display:flex;align-items:center;">
+										<div>
+											<div>{{getDateString(scope.row.startTime)}}~{{getDateString(scope.row.endTime)}}</div> 
+										</div>
+										<div style="margin-left: 5px;color: #d92b2f !important;color:#bb6f2a;">
+											{{calcTaskStateByTime(scope.row.startTime,scope.row.endTime)}}
+										</div>
 									</div>
-								</div>
 
-							</template>
-						</el-table-column>
-						 
-						<el-table-column   v-if="!isMultiSelect"  header-align="center" label="操作" fixed="right" width="200">
-							<template slot-scope="scope">
-								<el-button   size="mini" type="primary" @click.stop="selectedTask(scope.row)" >选择</el-button> 	
-							</template>
-						</el-table-column>
-					</el-table>
-					<el-pagination layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination> 
-					
+								</template>
+							</el-table-column>
+							
+							<el-table-column   v-if="!isMultiSelect"  header-align="center" label="操作" fixed="right" width="200">
+								<template slot-scope="scope">
+									<el-button   size="mini" type="primary" @click.stop="selectedTask(scope.row)" >选择</el-button> 	
+								</template>
+							</el-table-column>
+						</el-table>
+						<el-pagination layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination> 
+						
+					</el-row>
 				</el-col>
 			</el-row> 
 		</el-row>
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
index a7f66210..ca1fa8b3 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
@@ -2,15 +2,18 @@
 	<section>
 		<el-row class="app-container">
 			
- 			<el-button type="success" v-if="!multiSelect" @click="showAdd">+测试用例</el-button>
-			<el-button type="warning" v-if="multiSelect" @click="selected">确认选中</el-button> 
-			<el-button v-if="!multiSelect " type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> 
-		</el-row>
-		<el-row class="app-container">
+
 			<div>
 				已选故事：<el-tag v-if=" !filters.menus || filters.menus.length==0" @click="showMenu"> 未选,点我</el-tag><el-tag @click="showMenu" v-for="(item,index) in filters.menus" :key="index" closable @close="clearFiltersMneu(item)">{{item.menuName}}</el-tag>
-				<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
-				<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmTestCases">查询</el-button>
+				<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
+					<template slot="append"> 
+						<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmTestCases" icon="el-icon-search"></el-button>
+					</template>
+				</el-input> 
+				<el-button type="success" v-if="!multiSelect" circle icon="el-icon-plus" @click="showAdd"></el-button>
+				<el-button type="warning" v-if="multiSelect" @click="selected">确认选中</el-button> 
+				<el-button v-if="!multiSelect " type="danger" icon="el-icon-delete" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> 
+
 			</div>
 		</el-row>
 		<el-row class="app-container"> 
diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
index 1ab0e247..88a64d79 100644
--- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
+++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
@@ -1,29 +1,41 @@
 <template>
 	<section>
 		<el-row class="app-container"> 
-  			<el-button v-if="!batchEditVisible" type="primary" @click="showCase">由用例创建执行计划</el-button>
-			<el-button v-if="!batchEditVisible" type="primary" @click="showBatchEdit">批量修改</el-button>  
-			<el-button v-if="!batchEditVisible" type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> 
-			<el-button v-if="batchEditVisible" type="warning" @click="batchEditXmTestCaseExec">批量保存</el-button>  
-			<el-button v-if="batchEditVisible" type="success" @click="noBatchEdit">返回</el-button>   
+  			
 		</el-row> 
 		<el-row class="app-container" v-if="!batchEditVisible">
 			<div >
-        <el-checkbox v-model="gstcVisible"  >甘特图</el-checkbox>
+        		<el-checkbox v-model="gstcVisible"  >甘特图</el-checkbox>
 				{{selProject?"":"已选项目："}}<el-tag type="success" v-if="this.filters.selProject && !selProject " closable @close="clearProject"  @click="showProjectList">{{ this.filters.selProject.name }}</el-tag>
 				<el-tag type="success" v-if="!this.filters.selProject" @click="showProjectList">未选，点我</el-tag>
 				已选故事：<el-tag v-if=" !filters.menus || filters.menus.length==0" @click="showMenu">未选,点我</el-tag><el-tag v-for="(item,index) in filters.menus" @click="showMenu" :key="index" closable @close="clearFiltersMneu(item)">{{item.menuName}}</el-tag>
-				<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
-				<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmTestCaseExecs">查询</el-button>  
-			</div>
+				<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
+					<template slot="append">
+						<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmTestCaseExecs" icon="el-icon-search"></el-button>  
+					</template>
+				</el-input> 
+				<el-button  type="primary" @click="showCase" icon="el-icon-plus">由用例创建执行计划</el-button>
+				<el-button  type="primary" @click="showBatchEdit" icon="el-icon-edit">批量修改</el-button>  
+				<el-button   type="danger" v-loading="load.del" @click="batchDel" icon="el-icon-delete" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> 
+				
+			</div> 
+		</el-row>
+		<el-row class="app-container" v-if="batchEditVisible"> 
+				<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
+					<template slot="append">
+						<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmTestCaseExecs" icon="el-icon-search"></el-button>  
+					</template>
+				</el-input>  
+				<el-button v-if="batchEditVisible" type="warning" @click="batchEditXmTestCaseExec">批量保存</el-button>  
+				<el-button v-if="batchEditVisible" type="success" @click="noBatchEdit" icon="el-icon-back">返回</el-button>  
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmTestCaseExec xm_test_case_exec-->
-			<el-table v-if="!gstcVisible" :data="xmTestCaseExecs" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table max-height="650" v-if="!gstcVisible" :data="xmTestCaseExecs" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column  type="selection" width="45"></el-table-column>
 				<el-table-column sortable type="index" width="45"></el-table-column>
  				<el-table-column prop="projectName" label="项目名称" min-width="100" >
-					<template slot="header" slot-scope="scope">
+					<template slot="header">
 						项目<el-button @click="showProjectList"  icon="el-icon-search" circle size="mini"></el-button>
  					</template>
 				</el-table-column> 
@@ -40,14 +52,14 @@
 				</el-table-column>
 				
 				<el-table-column prop="taskName" label="任务" min-width="100" >
-					<template slot-scope="scope"> 
-						<el-tag>{{scope.row.taskName?scope.row.taskName:'未关联任务'}}</el-tag>
+					<template slot-scope="scope">  
+						{{scope.row.taskName?scope.row.taskName:'未关联任务'}}
 						<el-button  v-if=" batchEditVisible==true "   type="warning"   @click="showSelectTask(scope.row)">选任务</el-button>  
 					</template>
 				</el-table-column> 
 				<el-table-column prop="execUsername" label="执行人姓名" min-width="100" >
-					<template slot-scope="scope"> 
-						<el-tag>{{scope.row.execUsername?scope.row.execUsername:'未设置'}}</el-tag>
+					<template slot-scope="scope">  
+						{{scope.row.execUsername?scope.row.execUsername:'未设置'}}
 						<el-button  v-if=" batchEditVisible==true "   type="warning"   @click="showGroupUsers(scope.row)">选人</el-button>  
 					</template>
 				</el-table-column>