diff --git a/src/views/xm/core/xmGroup/XmGroupMng.vue b/src/views/xm/core/xmGroup/XmGroupMng.vue
index ef4da34e..57dd14bc 100644
--- a/src/views/xm/core/xmGroup/XmGroupMng.vue
+++ b/src/views/xm/core/xmGroup/XmGroupMng.vue
@@ -2,17 +2,13 @@
 	<section class="page-container border padding" >
 		<el-row> 
 			 
-			<el-popover v-if="filters.pgClass==='0' && (!selProject  || !selProject.id)"
+			<el-popover v-if="pgClass==='0' && (!selProject  || !selProject.id)"
 				placement="right"
 				width="400"
 				trigger="click"> 
 				<xm-project-select :auto-select="true"   :xm-iteration="xmIteration" :xm-product="xmProduct"  @row-click="onProjectRowClick" @clear-select="onProjectClearSelect"></xm-project-select>
 					<el-link type="warning" slot="reference" icon="el-icon-search"><font style="font-size:14px;">{{filters.selProject?filters.selProject.name:'选择项目'}}</font></el-link> 
-			</el-popover>
-			<span v-if="xmProduct && xmProduct.id && (!selProject || !selProject.id)">
-			<el-radio v-model="filters.pgClass" label="1">产品组</el-radio>
-			<el-radio v-model="filters.pgClass" label="0">项目组</el-radio>
-			</span>
+			</el-popover> 
 			<el-input v-model="filters.key" style="width:15%;" clearable placeholder="名称过滤"></el-input>   
 			<el-button  type="primary" @click="searchXmGroups" icon="el-icon-search">刷新</el-button> 
 			<el-button  type="plain" @click="showGroupState" icon="el-icon-s-data">小组进度</el-button> 
@@ -237,7 +233,7 @@
 		    XmGroupEdit,VueOkrTree,UsersSelect,XmGroupStateMng,XmGroupUserMng,XmProjectList,
 XmProductSelect,XmProjectSelect,
 		},
-		props:["visible","selProject" ,"isSelectSingleUser","isSelectMultiUser",'xmProduct','xmIteration'],
+		props:["visible","selProject" ,"isSelectSingleUser","isSelectMultiUser",'xmProduct','xmIteration','pgClass'],
 		computed: {
 		    ...mapGetters(['userInfo']),
 			expandedKeys(){  
@@ -322,14 +318,7 @@ XmProductSelect,XmProjectSelect,
 			},
 			"filters.key":function(val) {
 				this.$refs.tree.filter(val);
-			},
-			"filters.pgClass":function(val) { 
-				if(val==='1'){
-					this.filters.selProject=null; 
-					this.xmGroups=[]
-					this.searchXmGroups();
-				}
-			}
+			}, 
 		}, 
 		data() {
 			return {
@@ -338,8 +327,7 @@ XmProductSelect,XmProjectSelect,
 					groupNameKey:'',
 					mngUsernamekey:'',
 					groupUsernameKey:'',
-					selProject:null,
-					pgClass:'',
+					selProject:null, 
 				},
 				xmGroups: [],//查询结果
 				pageInfo:{//分页数据
@@ -480,6 +468,15 @@ XmProductSelect,XmProjectSelect,
 				if(this.filters.mngUsernamekey){
 					params.mngUsernamekey=this.filters.mngUsernamekey
 				}
+				if(this.pgClass==='0'||!this.pgClass){
+					if(!params.projectId){
+						return;
+					}
+				}else if(this.pgClass==='1'){
+					if(!params.productId){
+						return;
+					}
+				}
 				var func=getGroups
 				this.load.list = true;
 				if( !params.productId && !params.projectId && !params.iterationId){
@@ -716,14 +713,7 @@ XmProductSelect,XmProjectSelect,
 				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
 			},
             initData: function(){
-				this.filters.selProject=this.selProject;
-				if(this.selProject && this.selProject.id){
-					this.filters.pgClass="0"
-				}else if(this.xmProduct && this.xmProduct.id){
-					this.filters.pgClass="1"
-				}else{
-					this.filters.pgClass="0"
-				}
+				this.filters.selProject=this.selProject; 
             },
 			renderCurrentClass (node) {
 				return 'label-bg-blue'
diff --git a/src/views/xm/core/xmProduct/XmProductInfo.vue b/src/views/xm/core/xmProduct/XmProductInfo.vue
index 636a8bc3..95aa2134 100644
--- a/src/views/xm/core/xmProduct/XmProductInfo.vue
+++ b/src/views/xm/core/xmProduct/XmProductInfo.vue
@@ -36,10 +36,16 @@
 				</el-submenu > 
 				<el-menu-item  index="缺陷">
 					 <span slot="title"><i class="el-icon-question"  ></i>缺陷</span>
-				</el-menu-item>
-				<el-menu-item  index="团队">
-					 <span slot="title"><i class="el-icon-user-solid"  ></i>团队</span>
-				</el-menu-item>  
+				</el-menu-item> 
+				<el-submenu index="团队">
+					<template slot="title">团队</template>
+						<el-menu-item   index="产品团队">
+							<span slot="title"><i class="el-icon-solid"></i>产品团队</span> 
+						</el-menu-item>
+						<el-menu-item index="项目团队">
+							<span slot="title"><i class="el-icon-solid"></i>项目团队</span>
+						</el-menu-item> 
+				</el-submenu >
 				<el-submenu index="计划">
 					<template slot="title">计划</template>
 						<el-menu-item   index="产品计划">
@@ -151,7 +157,8 @@
 			  <xm-task-mng v-if="infotype=='产品任务'" ptype="1" queryScope="task"  ref="productXmTaskMng" :xm-product="xmProduct" key="productXmTaskMng"></xm-task-mng>
 			 <xm-task-mng v-if="infotype=='项目任务'" ptype="0" queryScope="task"  ref="projectXmTaskMng" :xm-product="xmProduct" key="projectXmTaskMng"></xm-task-mng>
 			  <xm-question v-if="infotype=='缺陷'" :qtype="'bug'" :xm-product='xmProduct' ref="xmQuestion"></xm-question>
-			  <xm-group-mng v-if="infotype=='团队'" :xm-product="xmProduct"></xm-group-mng>
+			  <xm-group-mng v-if="infotype=='项目团队'" pgClass="0" :xm-product="xmProduct" key="projectGroup"></xm-group-mng>
+			  <xm-group-mng v-if="infotype=='产品团队'" pgClass="1" :xm-product="xmProduct" key="productGroup"></xm-group-mng>
 			  <xm-file-mng v-if="infotype=='文档'" :xm-product="xmProduct"></xm-file-mng>
 			  <xm-task-mng v-if="infotype=='产品计划'" ref="productPlan" ptype="1" queryScope="planTask"  :xm-product="xmProduct" key="productPlan"></xm-task-mng>