From c796178d31d7ec374aa8a569bdfd3be0f422cb03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 11 Mar 2022 23:52:12 +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

---
 .../selectShopLocation/BranchSelect.vue       |  2 +-
 src/utils/request.js                          |  1 +
 src/views/xm/core/xmGroup/XmGroupMng.vue      | 28 ++++++++++++++++---
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/components/selectShopLocation/BranchSelect.vue b/src/components/selectShopLocation/BranchSelect.vue
index 3aaa3819..d9fdeb22 100644
--- a/src/components/selectShopLocation/BranchSelect.vue
+++ b/src/components/selectShopLocation/BranchSelect.vue
@@ -133,7 +133,7 @@
 						this.pageInfo.total = res.data.total;this.pageInfo.count=false;
 						this.branchs = res.data.data;
 					}else{
-						this.$message({showClose: true, message: tips.msg, type: 'error' });
+						this.$notify({showClose: true, message: tips.msg, type: 'error' });
 					} 
 					this.load.list = false;
 				}).catch(() => {
diff --git a/src/utils/request.js b/src/utils/request.js
index 89bf4d9a..97c66332 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -73,6 +73,7 @@ service.interceptors.response.use(
     }
     
     Message({
+      showClose:true,
       message: '通讯错误',
       type: 'error',
       duration: 5 * 1000
diff --git a/src/views/xm/core/xmGroup/XmGroupMng.vue b/src/views/xm/core/xmGroup/XmGroupMng.vue
index 3aef921d..76b828c7 100644
--- a/src/views/xm/core/xmGroup/XmGroupMng.vue
+++ b/src/views/xm/core/xmGroup/XmGroupMng.vue
@@ -1,6 +1,14 @@
 <template>
 	<section class="page-container border padding" >
 		<el-row> 
+			 
+			<el-popover
+				placement="right"
+				width="400"
+				trigger="click"> 
+				<xm-project-select :auto-select="true" 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> 
+			</el-popover>
 					<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>
@@ -206,13 +214,15 @@
 	import  XmGroupStateMng from '../xmGroupState/XmGroupStateMng';//修改界面
 	import  XmGroupUserMng from '../xmGroupUser/XmGroupUserMng';//修改界面
 	import XmProjectList from '../xmProject/XmProjectList';
+	
+	import XmProjectSelect from '../xmProject/XmProjectSelect';
 	import XmProductSelect from '../xmProduct/XmProductSelect.vue';
 	
 	export default {
 	    name:'xmGroupMng',
 		components: {
 		    XmGroupEdit,VueOkrTree,UsersSelect,XmGroupStateMng,XmGroupUserMng,XmProjectList,
-XmProductSelect,
+XmProductSelect,XmProjectSelect,
 		},
 		props:["visible","selProject" ,"isSelectSingleUser","isSelectMultiUser",'xmProduct','xmIteration'],
 		computed: {
@@ -295,6 +305,7 @@ XmProductSelect,
             },
 			
 			selProject(){
+				this.selProject=this.selProject;
 				this.getXmGroup();
 			},
 			xmProduct(){
@@ -311,6 +322,7 @@ XmProductSelect,
 					groupNameKey:'',
 					mngUsernamekey:'',
 					groupUsernameKey:'',
+					selProject:null,
 				},
 				xmGroups: [],//查询结果
 				pageInfo:{//分页数据
@@ -432,8 +444,8 @@ XmProductSelect,
 					params.orderBy= orderBys.join(",")
 				}
 				
-				if(this.selProject){
-					params.projectId=this.selProject.id
+				if(this.filters.selProject){
+					params.projectId=this.filters.selProject.id
 				}
 				if(this.xmIteration){
 					params.iterationId=this.xmIteration.id
@@ -682,7 +694,7 @@ XmProductSelect,
 				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
 			},
             initData: function(){
-
+				this.filters.selProject=this.selProject;
             },
 			renderCurrentClass (node) {
 				return 'label-bg-blue'
@@ -749,6 +761,14 @@ XmProductSelect,
 				this.addForm.pgClass="1"
 				this.addFormVisible=true;
 				this.selectProductVisible=false;
+			},
+			onProjectRowClick(project){
+				this.filters.selProject=project;
+				this.searchXmGroups();
+			},
+			onProjectClearSelect(){
+				this.filters.selProject=null
+				this.xmGroups=[]
 			}
 		},//end methods
 		mounted() {