From da05c066d29c081f35392b3601f9764e7f717bba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 13 Mar 2022 19:10:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmGroup/XmGroupMng.vue | 36 ++++++++++++++++--------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/views/xm/core/xmGroup/XmGroupMng.vue b/src/views/xm/core/xmGroup/XmGroupMng.vue
index 9dc97822..9b0a0c54 100644
--- a/src/views/xm/core/xmGroup/XmGroupMng.vue
+++ b/src/views/xm/core/xmGroup/XmGroupMng.vue
@@ -2,20 +2,25 @@
 	<section class="page-container border padding" >
 		<el-row> 
 			 
-			<el-popover
+			<el-popover v-if="filters.pgClass==='0' && (!selProject  || !selProject.id)"
 				placement="right"
 				width="400"
 				trigger="click"> 
-				<xm-project-select :auto-select="false" v-if="!selProject"  :xm-iteration="xmIteration" :xm-product="xmProduct"  @row-click="onProjectRowClick" @clear-select="onProjectClearSelect"></xm-project-select>
-					<el-link type="warning" slot="reference" v-if="!selProject" icon="el-icon-search"><font style="font-size:14px;">{{filters.selProject?filters.selProject.name:'选择项目'}}</font></el-link> 
+				<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>
-					<el-input v-model="filters.key" style="width:15%;" clearable placeholder="名称过滤"></el-input>  
- 					<el-button  type="plain" @click="showGroupState" icon="el-icon-s-data">小组进度</el-button> 
- 					<el-button class="hidden-lg-and-down" type="plain" @click="xmRecordVisible=true" icon="el-icon-document">变化日志</el-button>
-					<el-button class="hidden-lg-and-down" type="plain" @click="doSearchImGroupsByProjectId" icon="el-icon-document">绑定即聊情况</el-button>
- 					<el-button class="hidden-md-and-down" @click="groupRoleDescVisible=true" icon="el-icon-document">角色说明</el-button> 
-					 <font style="font-size:12px;" class="hidden-md-and-down" color="red">点击架构图操作</font>
-					 
+			<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-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> 
+			<el-button class="hidden-lg-and-down" type="plain" @click="xmRecordVisible=true" icon="el-icon-document">变化日志</el-button>
+			<el-button class="hidden-lg-and-down" type="plain" @click="doSearchImGroupsByProjectId" icon="el-icon-document">绑定即聊情况</el-button>
+			<el-button class="hidden-md-and-down" @click="groupRoleDescVisible=true" icon="el-icon-document">角色说明</el-button> 
+				<font style="font-size:12px;" class="hidden-md-and-down" color="red">点击架构图操作</font>
+				
 			<el-popover
 				placement="right"
 				width="400"
@@ -232,7 +237,7 @@
 		    XmGroupEdit,VueOkrTree,UsersSelect,XmGroupStateMng,XmGroupUserMng,XmProjectList,
 XmProductSelect,XmProjectSelect,
 		},
-		props:["visible","selProject" ,"isSelectSingleUser","isSelectMultiUser",'xmProduct','xmIteration','pgClass'],
+		props:["visible","selProject" ,"isSelectSingleUser","isSelectMultiUser",'xmProduct','xmIteration'],
 		computed: {
 		    ...mapGetters(['userInfo']),
 			expandedKeys(){  
@@ -317,6 +322,13 @@ 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() {
@@ -327,6 +339,7 @@ XmProductSelect,XmProjectSelect,
 					mngUsernamekey:'',
 					groupUsernameKey:'',
 					selProject:null,
+					pgClass:'',
 				},
 				xmGroups: [],//查询结果
 				pageInfo:{//分页数据
@@ -778,6 +791,7 @@ XmProductSelect,XmProjectSelect,
 			onProjectClearSelect(){
 				this.filters.selProject=null
 				this.xmGroups=[]
+				this.searchXmGroups();
 			},
 			filterNode(value, data) {
 				if (!value) return true;