From 8276bddd2b9b5f83d15940af6bc21b7dd29c195d 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, 6 Mar 2022 16:47:33 +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

---
 .../core/xmProjectGroup/XmProjectGroupMng.vue | 28 +++++++++++++++----
 .../XmProjectGroupUserMng.vue                 | 20 +++++++++++--
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
index 88ab9fe1..722aa3a7 100644
--- a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
+++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
@@ -1,11 +1,15 @@
 <template>
 	<section class="page-container border padding" >
 		<el-row> 
+					<el-input v-model="filters.groupNameKey" style="width:15%;" clearable placeholder="小组名称查询"></el-input> 
+					<el-input v-model="filters.mngUsernamekey" style="width:15%;" clearable placeholder="组长、副组长名称查询"></el-input> 
+					<el-input v-model="filters.groupUsernameKey" style="width:15%;" clearable placeholder="组员名称查询"></el-input>
+					<el-button type="primary" @click="searchXmProjectGroups">查询</el-button>
  					<el-button  type="plain" @click="showGroupState" icon="el-icon-s-data">小组进度</el-button> 
- 					<el-button  type="plain" @click="xmRecordVisible=true" icon="el-icon-document">变化日志</el-button>
-					<el-button  type="plain" @click="doSearchImGroupsByProjectId" icon="el-icon-document">绑定即聊情况</el-button>
- 					<el-button @click="groupRoleDescVisible=true" icon="el-icon-document">角色说明</el-button> 
-					 <font color="red">注意：点击架构图进行操作</font>
+ 					<el-button class="hidden-md-and-down" type="plain" @click="xmRecordVisible=true" icon="el-icon-document">变化日志</el-button>
+					<el-button class="hidden-md-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-row> 
 		<el-row ref="table" :style="{overflowX:'auto',height:maxTableHeight+'px'}">
 			<vue-okr-tree :data="okrTreeData" v-loading="load.list"
@@ -299,11 +303,14 @@ XmProductSelect,
 			xmIteration(){
 				this.getXmProjectGroup();
 			}
-		},
+		}, 
 		data() {
 			return {
 				filters: {
-					key: ''
+					key: '',
+					groupNameKey:'',
+					mngUsernamekey:'',
+					groupUsernameKey:'',
 				},
 				xmProjectGroups: [],//查询结果
 				pageInfo:{//分页数据
@@ -437,6 +444,15 @@ XmProductSelect,
 				if(this.filters.key){
 					params.key=this.filters.key
 				}
+				if(this.filters.groupNameKey){
+					params.groupNameKey=this.filters.groupNameKey
+				}
+				if(this.filters.groupUsernameKey){
+					params.groupUsernameKey=this.filters.groupUsernameKey
+				}
+				if(this.filters.mngUsernamekey){
+					params.mngUsernamekey=this.filters.mngUsernamekey
+				}
 				var func=getGroups
 				this.load.list = true;
 				if( !params.productId && !params.projectId && !params.iterationId){
diff --git a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
index 2120818a..21011893 100644
--- a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
+++ b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
@@ -1,8 +1,10 @@
 <template>
 	<section class="page-container border padding">
 		<el-row>
-			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input>
-			<el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmProjectGroupUsers" icon="el-icon-search">查询</el-button>
+ 			<el-input v-model="filters.groupNameKey" style="width:15%;" clearable placeholder="小组名称查询"></el-input> 
+			<el-input v-model="filters.mngUsernamekey" style="width:15%;" clearable placeholder="组长、副组长名称查询"></el-input> 
+			<el-input v-model="filters.groupUsernameKey" style="width:15%;" clearable placeholder="组员名称查询"></el-input>
+			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" @click="searchXmProjectGroupUsers" icon="el-icon-search">查询</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 class="padding-top">
@@ -82,7 +84,10 @@
 		data() {
 			return {
 				filters: {
-					key: ''
+					key: '',
+					groupNameKey:'',
+					mngUsernamekey:'',
+					groupUsernameKey:'',
 				},
 				xmProjectGroupUsers: [],//查询结果
 				pageInfo:{//分页数据
@@ -160,6 +165,15 @@
 					params.key=this.filters.key
 				}
 
+				if(this.filters.groupNameKey){
+					params.groupNameKey=this.filters.groupNameKey
+				}
+				if(this.filters.groupUsernameKey){
+					params.groupUsernameKey=this.filters.groupUsernameKey
+				}
+				if(this.filters.mngUsernamekey){
+					params.mngUsernamekey=this.filters.mngUsernamekey
+				}
 				if(this.xmProjectGroup){
 					params.groupId=this.xmProjectGroup.id
 				}