diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue
index 0491758d..60305388 100644
--- a/src/views/xm/core/xmIteration/XmIterationMng.vue
+++ b/src/views/xm/core/xmIteration/XmIterationMng.vue
@@ -1,15 +1,15 @@
 <template>
 	<section class="page-container page-full-height padding border">
 		<el-row>
-      		<el-checkbox v-model="gstcVisible"  class="hidden-md-and-down">甘特图</el-checkbox>  
-			  
+      		<el-checkbox v-model="gstcVisible"  class="hidden-md-and-down">甘特图</el-checkbox>
+
 			<el-select  v-model="filters.queryScope"  placeholder="迭代查询范围">
 				<el-option :label="userInfo.branchName+'机构下所有的迭代'" value="branchId"></el-option>
 				<el-option label="我相关的迭代" value="compete"></el-option>
 				<el-option label="按迭代编号精确查找" value="iterationId"></el-option>
 				<el-option label="后台智能匹配" value=""></el-option>
 			</el-select>
-			<el-input v-if="filters.queryScope=='iterationId'"  v-model="filters.id" style="width:20%;"  placeholder="输入迭代编号" @keyup.enter.native="searchXmProducts"> </el-input> 
+			<el-input v-if="filters.queryScope=='iterationId'"  v-model="filters.id" style="width:20%;"  placeholder="输入迭代编号" @keyup.enter.native="searchXmProducts"> </el-input>
 			<el-date-picker v-if="filters.queryScope!='iterationId'" v-model="dateRangerOnline" type="daterange" align="right" unlink-panels range-separator="至"
 				start-placeholder="上线日期" end-placeholder="上线日期" value-format="yyyy-MM-dd"
 				class="hidden-md-and-down"
@@ -20,15 +20,15 @@
 						<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmIterations" icon="el-icon-search"></el-button>
 					</template>
 				</el-input>
-			<el-button type="primary" @click="showAdd" icon="el-icon-plus">迭代计划</el-button> 
+			<el-button type="primary" @click="showAdd" icon="el-icon-plus">迭代计划</el-button>
 			<el-popover
 				placement="top-start"
 				title=""
 				width="400"
 				trigger="click" >
 				<el-divider content-position="left"><strong>查询条件</strong></el-divider>
-				<el-row> 
-					
+				<el-row>
+
 					<el-col :span="24" style="padding-top:5px;">
 						<font class="more-label-font">
 							迭代查询范围：
@@ -40,9 +40,9 @@
 							<el-option label="后台智能匹配" value=""></el-option>
 						</el-select>
 					</el-col>
-					<el-col  :span="24"  style="padding-top:5px;"> 
-						<el-input  v-if="filters.queryScope=='iterationId'" size="mini" v-model="filters.id" style="width:100%;"  placeholder="输入产品编号" @keyup.enter.native="searchXmProducts">  
-						</el-input> 
+					<el-col  :span="24"  style="padding-top:5px;">
+						<el-input  v-if="filters.queryScope=='iterationId'" size="mini" v-model="filters.id" style="width:100%;"  placeholder="输入产品编号" @keyup.enter.native="searchXmProducts">
+						</el-input>
 					</el-col>
 					<el-col v-if="filters.queryScope!='iterationId'" :span="24"  style="padding-top:5px;">
 						<font class="more-label-font">上线时间:</font>
@@ -67,16 +67,10 @@
 					</el-col>
 					<el-col :span="24" style="padding-top:5px;">
 						<el-button size="mini" type="primary" icon="el-icon-search" @click="getXmIterations">查询</el-button>
-						<el-checkbox v-model="gstcVisible">甘特图</el-checkbox>  
+						<el-checkbox v-model="gstcVisible">甘特图</el-checkbox>
 					</el-col>
 				</el-row>
-				<el-divider content-position="left"><strong>更多操作</strong></el-divider>
-				<el-row> 
-					<el-col :span="24" style="padding-top:5px;">
-						<el-button v-if="xmProduct" size="mini"  icon="el-icon-plus" @click="iterationSelectVisible=true">将更多迭代加入产品<strong>{{xmProduct.productName}}</strong></el-button>
- 					</el-col>	
-				</el-row>
-				<el-button  slot="reference" icon="el-icon-more" circle></el-button>
+ 				<el-button  slot="reference" icon="el-icon-more" circle></el-button>
 			</el-popover>
  		</el-row>
 		<el-row  class="page-main">
@@ -101,8 +95,7 @@
 				<el-table-column prop="actWorkload" label="实际工作量" min-width="80" show-overflow-tooltip></el-table-column>
 				<el-table-column label="操作" width="400" fixed="right">
 					<template slot-scope="scope">
-						<el-tooltip v-if="xmProduct" :content="'将迭代与'+ xmProduct.productName + '脱钩'"><el-button   @click="doDelXmIterationProductLink( scope.row,scope.$index)" icon="el-icon-remove-outline">与产品脱钩</el-button></el-tooltip>
-						<el-button type="danger" @click="handleDel(scope.row,scope.$index)" icon="el-icon-delete"></el-button> 
+ 						<el-button type="danger" @click="handleDel(scope.row,scope.$index)" icon="el-icon-delete"></el-button>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -123,11 +116,11 @@
 			<el-drawer title="迭代报告" :visible.sync="iterationStateVisible" fullscreen  append-to-body  :close-on-click-modal="false">
 				<xm-iteration-state-mng :xm-iteration="editForm"   :visible="iterationStateVisible" @cancel="iterationStateVisible=false"></xm-iteration-state-mng>
 			</el-drawer>
-			
+
 			<el-drawer title="迭代报告" :visible.sync="iterationSelectVisible" fullscreen  append-to-body  :close-on-click-modal="false">
 				<xm-iteration-select @row-click="onXmIterationSelect"></xm-iteration-select>
 			</el-drawer>
-		</el-row> 
+		</el-row>
 	</section>
 </template>
 
@@ -173,8 +166,8 @@ import XmIterationSelect from './XmIterationSelect.vue';
 		data() {
 			const beginDate = new Date();
 			const endDate = new Date();
-			beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 3 ); 
-			endDate.setTime(endDate.getTime() + 3600 * 1000 * 24 * 7 * 4 * 3 ); 
+			beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 3 );
+			endDate.setTime(endDate.getTime() + 3600 * 1000 * 24 * 7 * 4 * 3 );
 			return {
 				filters: {
 					key: '',
@@ -272,7 +265,7 @@ import XmIterationSelect from './XmIterationSelect.vue';
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
 					count:this.pageInfo.count
-				}; 
+				};
 				if(!this.dateRangerOnline || this.dateRangerOnline.length==0){
 					this.$message({showClose: true, message: "上线日期范围不能为空", type: 'error' });
 					return;
@@ -295,16 +288,16 @@ import XmIterationSelect from './XmIterationSelect.vue';
 				}
 				if(this.menuId){
 					params.menuId=this.menuId
-				} 
+				}
 				if( !this.menuId && !this.xmProduct && !this.selProject){
-					params.queryScope=this.filters.queryScope 
+					params.queryScope=this.filters.queryScope
 					if(this.filters.queryScope=='iterationId'){
 						if(!this.filters.id){
 							this.$message({showClose: true, message:"您选择了按迭代编号精确查找模式，请输入迭代编号", type: 'error' });
 							return;
 						}
 						params.id=this.filters.id
-						
+
 					}
 					if(this.filters.queryScope=="branchId"){
 						params.branchId=this.userInfo.branchId
@@ -313,7 +306,7 @@ import XmIterationSelect from './XmIterationSelect.vue';
 						params.onlineTimeStart=this.dateRangerOnline[0]+" 00:00:00"
 						params.onlineTimeEnd=this.dateRangerOnline[1]+" 23:59:59"
 					}
-					
+
 				}
 				this.load.list = true;
 				listXmIterationWithState(params).then((res) => {
@@ -354,14 +347,14 @@ import XmIterationSelect from './XmIterationSelect.vue';
 				this.pageInfo.count=true;
 				if(this.xmProduct){//如果是产品试图界面添加的迭代，直接添加产品与迭代的关联关系
 					this.onXmIterationSelect(xmIteration);
-				}else{ 
+				}else{
 					this.getXmIterations();
-				} 
+				}
 			},
 			afterEditSubmit(){
 				this.editFormVisible=false;
 			},
-			
+
 			//进入info界面
 			intoInfo(row) {
 				this.editForm = row;
@@ -506,14 +499,14 @@ import XmIterationSelect from './XmIterationSelect.vue';
 				}).then(()=>{
 					addXmIterationProductLink({iterationId:xmIteration.id,productId:xmProduct.id}).then(res=>{
 						var tips =res.data.tips;
-						if(tips.isOk){ 
+						if(tips.isOk){
 							this.getXmIterations();
 						}
 						this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'});
 					})
 				})
 			},
-			doDelXmIterationProductLink(row){ 
+			doDelXmIterationProductLink(row){
 				var xmIteration=row;
 				var xmProduct=this.xmProduct;
 				this.$confirm('确认将产品【'+xmProduct.productName+'】与迭代【'+xmIteration.iterationName+'】进行脱钩吗？脱钩后，产品与迭代互相查看不到对方信息。', '提示', {
diff --git a/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue b/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue
index 61ce8f6d..1234f385 100644
--- a/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue
+++ b/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue
@@ -9,8 +9,10 @@
         </el-menu-item>
         <el-menu-item index="iterationProductLink">
           <span slot="title">配置可见产品</span>
+        </el-menu-item> 
+        <el-menu-item index="iterationMenuMng">
+          <span slot="title">配置可见故事</span>
         </el-menu-item>
-
         <el-submenu index="project-change">
           <template slot="title">
             <span slot="title">项目变更</span>
@@ -88,7 +90,8 @@
        <xm-iteration-overview  v-if="showPanelName=='overview'" :xm-iteration="xmIteration"></xm-iteration-overview>
         <xm-iteration-edit v-if="showPanelName=='detail'" :xm-iteration="xmIteration"></xm-iteration-edit>
       <xm-iteration-product-link-mng  v-if="showPanelName=='iterationProductLink'" :xm-iteration="xmIteration"></xm-iteration-product-link-mng>
-  </section>
+      <xm-iteration-menu-mng v-if="showPanelName=='iterationMenuMng'" :xm-iteration="xmIteration"></xm-iteration-menu-mng>
+   </section>
 </template>
 
 <script>
@@ -98,10 +101,11 @@ import { mapGetters } from "vuex";
  import XmIterationOverview from './XmIterationOverview.vue';
 import XmIterationEdit from './XmIterationEdit.vue';
  import XmIterationProductLinkMng from '../xmIterationProductLink/XmIterationProductLinkMng.vue';
+import XmIterationMenuMng from '../xmIterationMenu/XmIterationMenuMng.vue';
 
 
 export default {
-  components: {XmIterationOverview,XmIterationEdit, XmIterationProductLinkMng },
+  components: {XmIterationOverview,XmIterationEdit, XmIterationProductLinkMng, XmIterationMenuMng },
   computed: {
     ...mapGetters(["userInfo"]),
   },
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index 01db4ce7..0f706f42 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -1,18 +1,18 @@
 <template>
 	<section class="page-container padding">
-    <el-row> 
+    <el-row>
 			<el-select   v-model="filters.queryScope"    placeholder="产品查询范围">
 				<el-option :label="userInfo.branchName+'机构下所有的产品'" value="branchId"></el-option>
 				<el-option label="我相关的产品" value="compete"></el-option>
 				<el-option label="按产品编号精确查找" value="productId"></el-option>
-			</el-select> 
-			<el-input v-if="filters.queryScope=='productId'" style="width:20%;"  v-model="filters.id"  placeholder="输入产品编号" @keyup.enter.native="searchXmProducts">  
-			</el-input>  
-			
+			</el-select>
+			<el-input v-if="filters.queryScope=='productId'" style="width:20%;"  v-model="filters.id"  placeholder="输入产品编号" @keyup.enter.native="searchXmProducts">
+			</el-input>
+
 			<el-date-picker  v-show="!selProject&&filters.queryScope!='productId'"
-				v-model="dateRanger" 
+				v-model="dateRanger"
 				type="daterange"
-				align="right" 
+				align="right"
 				class="hidden-md-and-down"
 				unlink-panels
 				range-separator="至"
@@ -21,41 +21,40 @@
 				value-format="yyyy-MM-dd"
 				:default-time="['00:00:00','23:59:59']"
 				:picker-options="pickerOptions"
-			></el-date-picker>    
+			></el-date-picker>
 			<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 v-if="xmIteration"   icon="el-icon-plus" @click="productSelectVisible=true">将更多产品加入迭代<strong>{{xmIteration.iterationName}}</strong></el-button>
-			<el-button type="primary" @click="showAdd" icon="el-icon-plus" v-if="!xmIteration">产品</el-button>  
+			</el-input>
+ 			<el-button type="primary" @click="showAdd" icon="el-icon-plus" v-if="!xmIteration">产品</el-button>
 			<el-popover
 				placement="top-start"
 				title=""
 				width="500"
 				trigger="click" >
-				<el-divider content-position="left"><strong>查询条件</strong></el-divider> 
+				<el-divider content-position="left"><strong>查询条件</strong></el-divider>
 				<el-row>
 					<el-col :span="24" style="padding-top:5px;">
-						
+
 						<font class="more-label-font">
 							产品查询范围：
 						</font>
 						<el-select size="mini" v-model="filters.queryScope" style="width:100%;"   placeholder="产品查询范围">
 							<el-option :label="userInfo.branchName+'机构下的产品'" value="branchId"></el-option>
 							<el-option label="我相关的产品" value="compete"></el-option>
-							<el-option label="按产品编号精确查找" value="productId"></el-option> 
+							<el-option label="按产品编号精确查找" value="productId"></el-option>
 						</el-select>
 					</el-col>
-					<el-col  :span="24"  style="padding-top:5px;"> 
-						<el-input v-if="filters.queryScope=='productId'" size="mini" v-model="filters.id" style="width:100%;"  placeholder="输入产品编号" @keyup.enter.native="searchXmProducts">  
-						</el-input> 
+					<el-col  :span="24"  style="padding-top:5px;">
+						<el-input v-if="filters.queryScope=='productId'" size="mini" v-model="filters.id" style="width:100%;"  placeholder="输入产品编号" @keyup.enter.native="searchXmProducts">
+						</el-input>
 					</el-col>
 					<el-col v-show="!selProject&&filters.queryScope!='productId'" :span="24"  style="padding-top:5px;">
-						<font class="more-label-font">创建时间:</font>  
+						<font class="more-label-font">创建时间:</font>
 						<el-date-picker
-							v-model="dateRanger" 
+							v-model="dateRanger"
 							type="daterange"
 							align="right"
 							unlink-panels
@@ -65,48 +64,42 @@
 							value-format="yyyy-MM-dd"
 							:default-time="['00:00:00','23:59:59']"
 							:picker-options="pickerOptions"
-						></el-date-picker>   
-					</el-col>  
+						></el-date-picker>
+					</el-col>
 					<el-col  :span="24"  style="padding-top:5px;">
 						<font class="more-label-font">
 							产品名称:
-						</font> 
-						<el-input  size="mini" v-model="filters.key" style="width:100%;"  placeholder="输入产品名字关键字">  
-						</el-input> 
+						</font>
+						<el-input  size="mini" v-model="filters.key" style="width:100%;"  placeholder="输入产品名字关键字">
+						</el-input>
 					</el-col>
 					<el-col  :span="24"  style="padding-top:5px;">
 						<font class="more-label-font">
 							产品经理:
-						</font>  
-						<el-tag v-if="filters.pmUser" closable @click="selectFiltersPmUser" @close="clearFiltersPmUser()">{{filters.pmUser.username}}</el-tag> 
+						</font>
+						<el-tag v-if="filters.pmUser" closable @click="selectFiltersPmUser" @close="clearFiltersPmUser()">{{filters.pmUser.username}}</el-tag>
 						<el-button size="mini"  v-else @click="selectFiltersPmUser()">选责任人</el-button>
 						<el-button size="mini"   @click="setFiltersPmUserAsMySelf()">我的</el-button>
 					</el-col>
-					
+
 					<el-col v-if="selProject" :span="24"  style="padding-top:5px;">
 						<font class="more-label-font">
 							项目  <el-tag v-if="selProject">{{selProject?selProject.name:''}}</el-tag>
-						</font>  
-					</el-col> 
+						</font>
+					</el-col>
 					<el-col  v-if="xmIteration"  :span="24"  style="padding-top:5px;">
 						<font class="more-label-font">
 						    迭代 <el-tag v-if="xmIteration">{{xmIteration.iterationName}}</el-tag>
-						</font>  
+						</font>
 					</el-col>
 					<el-col  :span="24"  style="padding-top:10px;">
 						<el-button type="primary" size="mini" @click="searchXmProducts" >查询</el-button>
 					</el-col>
-				</el-row> 
-				<el-divider content-position="left"><strong>更多操作</strong></el-divider> 
-				<el-row> 
-					<el-col :span="24" style="padding-top:5px;">
-						<el-button v-if="xmIteration" size="mini"  icon="el-icon-plus" @click="productSelectVisible=true">将更多产品加入迭代<strong>{{xmIteration.iterationName}}</strong></el-button>
- 					</el-col>	
 				</el-row>
 				<el-button  slot="reference"   icon="el-icon-more" circle></el-button>
-			</el-popover> 
+			</el-popover>
 		</el-row>
-		<el-row  class="page-main page-height-80"  v-show="showType"> 
+		<el-row  class="page-main page-height-80"  v-show="showType">
 			<!--列表 XmProject xm_project-->
 			<el-row v-loading="load.list">
 				<el-col  v-cloak v-for="(p,i) in xmProducts" :key="i" :xl="4" :lg="6" :md="8" :sm="12">
@@ -142,26 +135,25 @@
 				</el-col>
 			</el-row>
 		</el-row>
-		<el-row  class="padding-top" v-show="!showType"> 
+		<el-row  class="padding-top" v-show="!showType">
 			<!--列表 XmProduct 产品表-->
 			<el-table ref="table"  :height="tableHeight" :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 prop="productName" label="产品名称" min-width="300"> 
+  				<el-table-column prop="productName" label="产品名称" min-width="300">
 					<template slot-scope="scope">
 						<span><el-link type="primary" @click="intoInfo(p)">{{scope.row.productName}}</el-link></span>
-						
+
 						<font class="align-right"><el-tag :type="scope.row.finishRate>=100?'success':'warning'">{{scope.row.finishRate}}%</el-tag>
-						
+
 						<el-tooltip content="产品经理"><el-tag v-if="scope.row.pmUsername">{{scope.row.pmUsername}}</el-tag></el-tooltip>
 						<el-tooltip content="点击统计进度，由任务汇总"><el-button size="mini" icon="el-icon-video-play" @click.stop="loadTasksToXmProductState( scope.row)"></el-button></el-tooltip>
 
 						</font>
 					</template>
-				</el-table-column> 
+				</el-table-column>
 				<el-table-column prop="planWorkload" label="预计工作量.人时" width="150"  show-overflow-tooltip></el-table-column>
-				<el-table-column prop="actWorkload" label="实际工作量.人时" width="150"  show-overflow-tooltip></el-table-column> 
+				<el-table-column prop="actWorkload" label="实际工作量.人时" width="150"  show-overflow-tooltip></el-table-column>
  				<el-table-column  label="操作" width="200" fixed="right">
-					<template slot-scope="scope"> 
-						<el-tooltip v-if="xmIteration" :content="'将产品与迭代【'+ xmIteration.iterationName + '】脱钩'"><el-button   @click="doDelXmIterationProductLink( scope.row,scope.$index)" icon="el-icon-remove-outline">与迭代脱钩</el-button></el-tooltip>
+					<template slot-scope="scope">
 						<el-popover
 							placement="top-start"
 							title=""
@@ -172,57 +164,57 @@
 									<el-button  type="warning" @click="loadTasksToXmProductState(scope.row)" icon="el-icon-s-data">从任务汇总统计进度</el-button>
 								</el-col>
 								<el-col :span="24" style="padding-top:12px;">
-									<el-button  type="warning" @click="showProductState(scope.row)" icon="el-icon-s-data">产品报告</el-button> 
+									<el-button  type="warning" @click="showProductState(scope.row)" icon="el-icon-s-data">产品报告</el-button>
 								</el-col>
 								<el-col :span="24" style="padding-top:12px;">
-									<el-button  type="primary" @click="toIterationList(scope.row)" icon="el-icon-document">关联迭代计划查询</el-button>  
-								</el-col> 
+									<el-button  type="primary" @click="toIterationList(scope.row)" icon="el-icon-document">关联迭代计划查询</el-button>
+								</el-col>
 								<el-col :span="24"  style="padding-top:12px;">
-									<el-button type="success" @click="toProjectList(scope.row)"  icon="el-icon-document">关联项目查询</el-button> 
-								</el-col>  
+									<el-button type="success" @click="toProjectList(scope.row)"  icon="el-icon-document">关联项目查询</el-button>
+								</el-col>
 								<el-col :span="24"  style="padding-top:12px;">
 									<el-button  type="success" @click="toTaskList(scope.row)"  icon="el-icon-tickets">关联任务查询</el-button>
-								</el-col>  
+								</el-col>
 								<el-col :span="24" style="padding-top:12px;">
-									<el-button  type="danger" v-loading="load.del" @click="handleDel(scope.row)" :disabled="load.del==true" icon="el-icon-delete">删除</el-button>  					
-								</el-col>	 
+									<el-button  type="danger" v-loading="load.del" @click="handleDel(scope.row)" :disabled="load.del==true" icon="el-icon-delete">删除</el-button>
+								</el-col>
 							</el-row>
 							<el-button  slot="reference" icon="el-icon-more" circle></el-button>
-						</el-popover>  
+						</el-popover>
 					</template>
 				</el-table-column>
 			</el-table>
 			</el-row>
-		 	<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-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>
+
 					<!--编辑 XmProduct 产品表界面-->
 			<el-drawer title="编辑产品" :visible.sync="editFormVisible"  size="50%" :with-header="false"  append-to-body   :close-on-click-modal="false">
 				  <xm-product-edit :xm-product="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-product-edit>
 			</el-drawer>
-	
+
 			<!--新增 XmProduct 产品表界面-->
 			<el-drawer title="新增产品" :visible.sync="addFormVisible"  size="50%" :with-header="false" append-to-body  :close-on-click-modal="false">
 				<xm-product-add :xm-product="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-product-add>
-			</el-drawer> 
+			</el-drawer>
 			<el-drawer title="产品状态数据" :visible.sync="productStateVisible"  width="100%"  append-to-body  :close-on-click-modal="false">
 				<xm-product-state-mng :xm-product="editForm" :visible="productStateVisible" @cancel="productStateVisible=false"></xm-product-state-mng>
-			</el-drawer> 
+			</el-drawer>
 			<el-drawer
 				append-to-body
 				title="产品关联的迭代查询"
-				:visible.sync="iterationVisible"  
+				:visible.sync="iterationVisible"
 				 >
 					<xm-iteration-mng :simple="true" :visible="iterationVisible" :product-id="editForm.id" ></xm-iteration-mng>
 			</el-drawer>
-			
+
 			<el-drawer title="选择员工" :visible.sync="selectFiltersPmUserVisible" size="60%" append-to-body>
 				<users-select  @confirm="onFiltersPmUserSelected" ref="usersSelect"></users-select>
-			</el-drawer> 
+			</el-drawer>
 			<el-drawer title="选择项目" :visible.sync="projectVisible" size="60%" append-to-body>
 				<xm-project-list  @select="onProjectSelected"></xm-project-list>
 			</el-drawer>
-			
-			<el-drawer title="选择产品" :visible.sync="productSelectVisible" size="60%" append-to-body> 
+
+			<el-drawer title="选择产品" :visible.sync="productSelectVisible" size="60%" append-to-body>
 				<xm-product-select  @row-click="onXmProductSelect"></xm-product-select>
 			</el-drawer>
 			<el-drawer title="迭代报告" :visible.sync="iterationSelectVisible" fullscreen  append-to-body  :close-on-click-modal="false">
@@ -237,19 +229,19 @@
 	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
 	import { listXmProduct,listXmProductWithState, delXmProduct, batchDelXmProduct } from '@/api/xm/core/xmProduct';
 	import { addXmIterationProductLink,delXmIterationProductLink } from '@/api/xm/core/xmIterationProductLink';
-	import { loadTasksToXmProductState } from '@/api/xm/core/xmProductState'; 
+	import { loadTasksToXmProductState } from '@/api/xm/core/xmProductState';
 	import  XmProductAdd from './XmProductAdd';//新增界面
 	import  XmProductEdit from './XmProductEdit';//修改界面
 	import { mapGetters } from 'vuex'
 	import  XmIterationMng from '../xmIteration/XmIterationSelect';//修改界面
 	import  XmProductStateMng from '../xmProductState/XmProductStateMng';//修改界面
 
-	import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; 
+	import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
 	import XmProjectList from '../xmProject/XmProjectList.vue';
 	import XmIterationSelect from '../xmIteration/XmIterationSelect.vue';
 import XmProductSelect from './XmProductSelect.vue';
 
-	export default { 
+	export default {
 		props:['selProject','xmIteration'],
 		computed: {
 		    ...mapGetters([
@@ -258,10 +250,10 @@ import XmProductSelect from './XmProductSelect.vue';
 		},
 		watch:{
 			selProject:function(){
-				this.getXmProducts(); 
+				this.getXmProducts();
 			},
-			xmIteration:function(){ 
-				this.getXmProducts(); 
+			xmIteration:function(){
+				this.getXmProducts();
 			}
 		},
 		data() {
@@ -272,7 +264,7 @@ import XmProductSelect from './XmProductSelect.vue';
 				filters: {
 					key: '',
 					queryScope:'compete',//compete/branchId/''/productId
-					id:'',//产品编号 
+					id:'',//产品编号
 					pmUser:null,//产品经理
 				},
 				xmProducts: [],//查询结果
@@ -286,14 +278,14 @@ import XmProductSelect from './XmProductSelect.vue';
 				},
 				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'}]} 
-				
+				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: {
@@ -307,19 +299,19 @@ import XmProductSelect from './XmProductSelect.vue';
 				dateRanger: [
 					util.formatDate.format(beginDate, "yyyy-MM-dd"),
 					util.formatDate.format(endDate, "yyyy-MM-dd")
-				],  
+				],
 				pickerOptions:  util.pickerOptions('datarange'),
 				projectVisible:false,
 				productSelectVisible:false,
 				showType:false,
 				/**begin 自定义属性请在下面加 请加备注**/
-					
+
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
-		methods: { 
-			handleSizeChange(pageSize) { 
-				this.pageInfo.pageSize=pageSize; 
+		methods: {
+			handleSizeChange(pageSize) {
+				this.pageInfo.pageSize=pageSize;
 				this.getXmProducts();
 			},
 			handleCurrentChange(pageNum) {
@@ -341,26 +333,26 @@ import XmProductSelect from './XmProductSelect.vue';
 				this.getXmProducts();
 			},
 			searchXmProducts(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.count=true;
 				 this.getXmProducts();
 			},
 			showProductState(row){
 				this.editForm=row
 				this.productStateVisible=true;
 			},
-			loadTasksToXmProductState: function (row) {  
+			loadTasksToXmProductState: function (row) {
 				this.load.edit=true;
-				 
+
 				let params = { productId: row.id };
 				loadTasksToXmProductState(params).then((res) => {
 					this.load.edit=false;
 					var tips=res.data.tips;
-					if(tips.isOk){ 
+					if(tips.isOk){
 						this.pageInfo.count=true;
 						this.getXmProducts();
 					}
-					this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
-				}).catch( err  => this.load.edit=false ); 
+					this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
+				}).catch( err  => this.load.edit=false );
 			},
 			//获取列表 XmProduct 产品表
 			getXmProducts() {
@@ -372,11 +364,11 @@ import XmProductSelect from './XmProductSelect.vue';
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
-					for(var i=0;i<this.pageInfo.orderFields.length;i++){ 
+					for(var i=0;i<this.pageInfo.orderFields.length;i++){
 						orderBys.push(this.pageInfo.orderFields[i]+" "+this.pageInfo.orderDirs[i])
-					}  
+					}
 					params.orderBy= orderBys.join(",")
-				} 
+				}
 				params.queryScope=this.filters.queryScope
 				if(this.filters.queryScope=='productId'){
 					if(!this.filters.id){
@@ -384,41 +376,41 @@ import XmProductSelect from './XmProductSelect.vue';
 						return;
 					}
 					params.id=this.filters.id
-					
+
 				}
 				if(this.filters.queryScope=="branchId"){
-					params.branchId=this.userInfo.branchId 
+					params.branchId=this.userInfo.branchId
 				}
 				if(!this.selProject && !this.xmIteration && this.filters.queryScope!='productId' && this.filters.queryScope!='compete'){
 					if(!this.dateRanger || this.dateRanger.length==0){
 						this.$message({showClose: true, message: "创建日期范围不能为空", type: 'error' });
 						return;
-					} 
+					}
 					params.ctimeStart=this.dateRanger[0]+" 00:00:00"
 					params.ctimeEnd=this.dateRanger[1]+" 23:59:59"
-				}  
+				}
 				if(this.xmIteration){
 					 params.iterationId=this.xmIteration.id
-				} 
+				}
 				if(this.filters.key!==""){
 					params.key="%"+this.filters.key+"%"
 				}
 				if(this.selProject){
 					params.projectId=this.selProject.id
-				} 
+				}
 				if(this.filters.pmUser){
 					params.pmUserid=this.filters.pmUser.userid
 				}
 				this.load.list = true;
 				listXmProductWithState(params).then((res) => {
 					var tips=res.data.tips;
-					if(tips.isOk){ 
+					if(tips.isOk){
 						this.pageInfo.total = res.data.total;
 						this.pageInfo.count=false;
 						this.xmProducts = res.data.data;
 					}else{
 						this.$message({showClose: true, message: tips.msg, type: 'error' });
-					} 
+					}
 					this.load.list = false;
 				}).catch( err => this.load.list = false );
 			},
@@ -431,7 +423,7 @@ import XmProductSelect from './XmProductSelect.vue';
 			//显示新增界面 XmProduct 产品表
 			showAdd: function () {
 				if(!this.roles.some(i=>i.roleid=='productAdmin')){
-					this.$message({showClose: true, message: "只有产品经理能够创建产品", type: 'error'}); 
+					this.$message({showClose: true, message: "只有产品经理能够创建产品", type: 'error'});
 					return false;
 				}
 				this.addFormVisible = true;
@@ -442,7 +434,7 @@ import XmProductSelect from './XmProductSelect.vue';
 				this.pageInfo.count=true;
 				if(this.xmIteration){//如果是迭代试图进入的迭代界面，创建了产品直接添加产品与迭代的关系
 					this.onXmProductSelect(xmProduct);
-				}else{ 
+				}else{
 					this.getXmProducts();
 				}
 			},
@@ -450,7 +442,7 @@ import XmProductSelect from './XmProductSelect.vue';
 				this.editFormVisible=false;
 				this.getXmProducts()
 			},
-			
+
 			//进入info界面
 			intoInfo(row) {
 				this.editForm = row;
@@ -460,50 +452,50 @@ import XmProductSelect from './XmProductSelect.vue';
 			//选择行xmProduct
 			selsChange: function (sels) {
 				this.sels = sels;
-			}, 
+			},
 			//删除xmProduct
-			handleDel: function (row,index) { 
+			handleDel: function (row,index) {
 				if(!this.roles.some(i=>i.roleid=='productAdmin')){
-					this.$message({showClose: true, message: "只有产品经理能够删除产品", type: 'error'}); 
+					this.$message({showClose: true, message: "只有产品经理能够删除产品", type: 'error'});
 					return false;
 				}
 				this.$confirm('确认删除该记录吗?', '提示', {
 					type: 'warning'
-				}).then(() => { 
+				}).then(() => {
 					this.load.del=true;
 					let params = { id: row.id };
 					delXmProduct(params).then((res) => {
 						this.load.del=false;
 						var tips=res.data.tips;
-						if(tips.isOk){ 
+						if(tips.isOk){
 							this.pageInfo.count=true;
 							this.getXmProducts();
 						}
-						this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
+						this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
 					}).catch( err  => this.load.del=false );
 				});
 			},
 			//批量删除xmProduct
 			batchDel: function () {
 				if(!this.roles.some(i=>i.roleid=='productAdmin')){
-					this.$message({showClose: true, message: "只有产品经理能够删除产品", type: 'error'}); 
+					this.$message({showClose: true, message: "只有产品经理能够删除产品", type: 'error'});
 					return false;
 				}
 				var mmSels=this.sels.filter(i=>i.pmUserid!=this.userInfo.userid)
 				if(mmSels.length>0){
-					this.$message({showClose: true, message: "只能删除你负责的产品", type: 'error'}); 
+					this.$message({showClose: true, message: "只能删除你负责的产品", type: 'error'});
 					return false;
 				}
 				this.$confirm('确认删除选中记录吗？', '提示', {
 					type: 'warning'
-				}).then(() => { 
+				}).then(() => {
 					this.load.del=true;
 					batchDelXmProduct(this.sels).then((res) => {
 						this.load.del=false;
 						var tips=res.data.tips;
-						if( tips.isOk ){ 
+						if( tips.isOk ){
 							this.pageInfo.count=true;
-							this.getXmProducts(); 
+							this.getXmProducts();
 						}
 						this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'});
 					}).catch( err  => this.load.del=false );
@@ -522,7 +514,7 @@ import XmProductSelect from './XmProductSelect.vue';
 				 this.editForm=product
 				 this.iterationVisible=true;
 
-			}, 
+			},
 			toTaskList:function(product){
 				this.$router.push({name:'XmTaskCenterForProduct',params:{productId:product.id,productName:product.productName}})
 
@@ -531,11 +523,11 @@ import XmProductSelect from './XmProductSelect.vue';
 			clearFiltersPmUser:function(){
 				 this.filters.pmUser=null;
 				  this.searchXmProducts();
-			},			
+			},
 			selectFiltersPmUser(){
 				this.selectFiltersPmUserVisible=true;
 			},
-			onFiltersPmUserSelected(users){ 
+			onFiltersPmUserSelected(users){
 				 if(users && users.length>0){
 					 this.filters.pmUser=users[0]
 				 }else{
@@ -547,7 +539,7 @@ import XmProductSelect from './XmProductSelect.vue';
 			setFiltersPmUserAsMySelf(){
 				this.filters.pmUser=this.userInfo;
 				this.searchXmProducts();
-			},	 
+			},
 			onProjectSelected(projects){
 
 			},
@@ -570,7 +562,7 @@ import XmProductSelect from './XmProductSelect.vue';
 					})
 				})
 			},
-			doDelXmIterationProductLink(row){ 
+			doDelXmIterationProductLink(row){
 				var xmIteration=this.xmIteration;
 				var xmProduct=row;
 				this.$confirm('确认将产品【'+xmProduct.productName+'】与迭代【'+xmIteration.iterationName+'】进行脱钩吗？脱钩后，产品下的所有故事将从本迭代计划一并移出。', '提示', {
@@ -586,9 +578,9 @@ import XmProductSelect from './XmProductSelect.vue';
 				})
 			}
 			/**end 自定义函数请在上面加**/
-			
+
 		},//end methods
-		components: { 
+		components: {
 		    'xm-product-add':XmProductAdd,
 		    'xm-product-edit':XmProductEdit,
 			XmIterationMng,
@@ -599,13 +591,13 @@ import XmProductSelect from './XmProductSelect.vue';
 			XmProductSelect,
 		    //在下面添加其它组件
 		},
-		mounted() { 
+		mounted() {
 			this.$nextTick(() => {
 				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				var subHeight=70/1000 * window.innerHeight;
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
 				this.getXmProducts();
-        	}); 
+        	});
 		}
 	}
 
@@ -621,12 +613,12 @@ import XmProductSelect from './XmProductSelect.vue';
 }
 
 .align-right{
-	float: right; 
+	float: right;
 }
 </style>
 
 <style scoped>
- 
+
 .project-card{
 	font-size: 12px;
 	color: #999;
@@ -700,7 +692,7 @@ import XmProductSelect from './XmProductSelect.vue';
 }
 .project-period{
 	text-align: right;
-} 
+}
 @media only screen and (max-height: 2400px) {
 	.project-box{
 		max-height: 1600x;
@@ -726,4 +718,4 @@ import XmProductSelect from './XmProductSelect.vue';
 	}
 }
 
-</style>
\ No newline at end of file
+</style>