Merge remote-tracking branch 'origin/master'

src/router/routes_xm.js

@@ -99,6 +99,7 @@ export default {
       },
       // leaf: true,//只有一个节点
       children: [ 
+        { path: 'xmProduct/XmProductAllMng', component: _import('xm/core/xmProduct/XmProductAllMng'), name: 'XmProductAllMng', meta: { title: '产品总览' }}, 
 
          { path: 'xmProduct/XmProductMng', component: _import('xm/core/xmProduct/XmProductMng'), name: 'XmProductMng', meta: { title: '产品管理' }}, 
 

src/views/xm/core/xmIteration/XmIterationMng.vue

@@ -70,12 +70,6 @@
 						<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-popover>
  		</el-row>
@@ -101,7 +95,6 @@
 				<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>
 					</template>
 				</el-table-column>

src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue

@@ -10,7 +10,9 @@
         <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,6 +90,7 @@
        <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>
+      <xm-iteration-menu-mng v-if="showPanelName=='iterationMenuMng'" :xm-iteration="xmIteration"></xm-iteration-menu-mng>
    </section>
 </template>
 
@@ -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"]),
   },

src/views/xm/core/xmProduct/XmProductAllMng.vue

@@ -0,0 +1,47 @@
+<template>
+	<section> 
+		 <xm-product-mng :data-scope="'all'"></xm-product-mng>
+	</section>
+</template>
+
+<script>
+	import util from '@/common/js/util';//全局公共库
+	//import Sticky from '@/components/Sticky' // 粘性header组件 
+	import { mapGetters } from 'vuex'
+ import XmProductMng from './XmProductMng.vue';
+	
+export default { 
+	computed: {
+		...mapGetters([
+			'userInfo','roles'
+		]), 
+	},
+	watch: {
+			
+	},
+	data() {
+		return {
+				
+			/**end 自定义属性请在上面加 请加备注**/
+		}
+	},//end data
+	methods: {
+			
+		/**end 自定义函数请在上面加**/
+		
+	},//end methods
+	components: {  
+		XmProductMng,
+		//在下面添加其它组件
+	},
+	mounted() { 
+		this.$nextTick(() => {
+				
+		}); 
+	}
+}
+
+</script>
+
+<style scoped> 
+</style>

src/views/xm/core/xmProduct/XmProductMng.vue

@@ -28,7 +28,6 @@
 					<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-popover
 				placement="top-start"
@@ -97,18 +96,12 @@
 						<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-row>
-		<el-row  class="page-main page-height-80"> 
+		<el-row  class="page-main page-height-80"  v-show="showType">
 			<!--列表 XmProject xm_project-->
-			<el-row v-show="showType" v-loading="load.list">
+			<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">
 					<el-card @click.native="intoInfo(p,i)" class="project-card" shadow="always">
 						<div class="project-name" title="这是产品名称">{{p.productName}}</div>
@@ -142,12 +135,12 @@
 				</el-col>
 			</el-row>
 		</el-row>
-		<el-row  class="padding-top"> 
+		<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">
 					<template slot-scope="scope">
-						<span><el-link type="primary" @click="showEdit(scope.row)">{{scope.row.productName}}</el-link></span>
+						<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>
 
@@ -161,7 +154,6 @@
 				<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>
 						<el-popover
 							placement="top-start"
 							title=""
@@ -192,8 +184,8 @@
 					</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-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">
@@ -311,7 +303,7 @@ import XmProductSelect from './XmProductSelect.vue';
 				pickerOptions:  util.pickerOptions('datarange'),
 				projectVisible:false,
 				productSelectVisible:false,
-				showType:true,
+				showType:false,
 				/**begin 自定义属性请在下面加 请加备注**/
 
 				/**end 自定义属性请在上面加 请加备注**/