From fb73a74f7b38de5b3868e2a894cb3517970e93fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 5 May 2022 04:15:02 +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      | 57 ++++++++++++-------
 .../xmTaskExecuser/XmTaskExecuserSelect.vue   | 17 +++++-
 2 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/src/views/xm/core/xmGroup/XmGroupMng.vue b/src/views/xm/core/xmGroup/XmGroupMng.vue
index f061a532..5cf5e385 100644
--- a/src/views/xm/core/xmGroup/XmGroupMng.vue
+++ b/src/views/xm/core/xmGroup/XmGroupMng.vue
@@ -178,39 +178,44 @@
 			<el-drawer  v-if="currNodeType=='group'&&editForm.groupName" center  :title="(editForm==null?editForm.groupName:'')+'小组成员管理'" :visible.sync="groupUserVisible"  size="80%"  :close-on-click-modal="false" append-to-body>
 				<xm-group-user-mng  :xm-group="editForm" :visible="groupUserVisible" ></xm-group-user-mng>
 			</el-drawer>
+			<el-drawer    :visible.sync="candidateVisible"  size="80%"  :close-on-click-modal="false" append-to-body>
+				<xm-task-execuser-select  :sel-project="filters.selProject" :visible="candidateVisible" @select="onExecuserSelect"></xm-task-execuser-select>
+			</el-drawer>
 	    </el-row>
 		
 	</section>
 </template>
 
 <script>
-	import util from '@/common/js/util';//全局公共库
-	import treeTool from '@/common/js/treeTool';//全局公共库
-	import config from '@/common/config';//全局公共库 
-	import { getDicts,initSimpleDicts,initComplexDicts } from '@/api/mdp/meta/item';//字典表
-	import { listXmGroup, delXmGroup, batchDelXmGroup,getGroups } from '@/api/xm/core/xmGroup';
-	import  XmGroupEdit from './XmGroupEdit';//新增修改界面
-	import { mapGetters } from 'vuex'
-	import {VueOkrTree} from 'vue-okr-tree';
-	import 'vue-okr-tree/dist/vue-okr-tree.css'
-	import { listImGroup} from '@/api/mdp/im/group/imGroup';
-	import { publishMessage} from '@/api/mdp/im/imPush';
-	
-	import { listXmGroupUser, delXmGroupUser, batchDelXmGroupUser,batchAddXmGroupUser } from '@/api/xm/core/xmGroupUser';
+import util from '@/common/js/util';//全局公共库
+import treeTool from '@/common/js/treeTool';//全局公共库
+import config from '@/common/config';//全局公共库 
+import { getDicts,initSimpleDicts,initComplexDicts } from '@/api/mdp/meta/item';//字典表
+import { listXmGroup, delXmGroup, batchDelXmGroup,getGroups } from '@/api/xm/core/xmGroup';
+import  XmGroupEdit from './XmGroupEdit';//新增修改界面
+import { mapGetters } from 'vuex'
+import {VueOkrTree} from 'vue-okr-tree';
+import 'vue-okr-tree/dist/vue-okr-tree.css'
+import { listImGroup} from '@/api/mdp/im/group/imGroup';
+import { publishMessage} from '@/api/mdp/im/imPush';
 
+import { listXmGroupUser, delXmGroupUser, batchDelXmGroupUser,batchAddXmGroupUser } from '@/api/xm/core/xmGroupUser';
 
-	import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
-	import  XmGroupStateMng from '../xmGroupState/XmGroupStateMng';//修改界面
-	import  XmGroupUserMng from '../xmGroupUser/XmGroupUserMng';//修改界面 
-	
-	import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect';
-	import XmProductSelect from '@/views/xm/core/components/XmProductSelect.vue'
+
+import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
+import  XmGroupStateMng from '../xmGroupState/XmGroupStateMng';//修改界面
+import  XmGroupUserMng from '../xmGroupUser/XmGroupUserMng';//修改界面 
+
+import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect';
+import XmProductSelect from '@/views/xm/core/components/XmProductSelect.vue'
+import XmTaskExecuserSelect from '../xmTaskExecuser/XmTaskExecuserSelect.vue';
 	
 	export default {
 	    name:'xmGroupMng',
 		components: {
 		    XmGroupEdit,VueOkrTree,UsersSelect,XmGroupStateMng,XmGroupUserMng, 
 XmProductSelect,XmProjectSelect,
+XmTaskExecuserSelect,
 		},
 		props:["visible","selProject" ,"isSelectSingleUser","isSelectMultiUser",'xmProduct','xmIteration','pgClass'],
 		computed: {
@@ -280,7 +285,7 @@ XmProductSelect,XmProjectSelect,
             },
 			
 			selProject(){
-				this.selProject=this.selProject;
+				this.filters.selProject=this.selProject;
 				this.getXmGroup();
 			}, 
 			"filters.key":function(val) {
@@ -620,6 +625,16 @@ XmProductSelect,XmProjectSelect,
 				}
 				
 			},
+			onExecuserSelect:function(users){
+				this.candidateVisible=false;
+				if(users && users.length>0){
+					users.forEach(i=>{
+						i.branchId=i.execUserBranchId
+						i.branchName=''
+					})
+					this.onUserSelected(users);
+				} 
+			},
 			
 			//选择接收人
 			onUserSelected: function(groupUsers) {  
@@ -633,6 +648,8 @@ XmProductSelect,XmProjectSelect,
 					var u={
 						userid:i.userid,
 						username:i.username,
+						obranchId:i.branchId,
+						obranchName:i.branchName,
 						groupId:this.editForm.id,
 					}
 					if(this.editForm.pgClass=='1'){
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserSelect.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserSelect.vue
index ff943bfe..5131953e 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserSelect.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserSelect.vue
@@ -3,8 +3,8 @@
 		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="任务名称、用户姓名模糊查询" clearable></el-input>
 			<el-input v-model="filters.taskId" style="width:150px;" placeholder="任务编号查询" clearable></el-input>
-			<span v-if="selProject && selProject.id">
-				<el-input v-if="selProject && selProject.id" v-model="filters.projectId" style="width: 150px;" placeholder="项目编号" clearable></el-input>
+			<span v-if="!selProject || !selProject.id">
+				<el-input  v-model="filters.projectId" style="width: 150px;" placeholder="项目编号" clearable></el-input>
 				<el-input v-model="filters.branchId" style="width: 150px;" placeholder="项目公司编号" clearable></el-input> 
 			</span>
 			<el-input v-model="filters.execUserBranchId" style="width: 150px;" placeholder="用户公司编号" clearable></el-input>  
@@ -15,14 +15,23 @@
 				 <el-option v-for="(item,index) in dicts.taskState" :value="item.id" :label="item.name" :key="index"></el-option>
 			 </el-select>
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmTaskExecusers">查询</el-button> 
+			<span style="float:right;">
+			<el-button  type="primary" @click="select">确认选择</el-button>
+			</span>
 			<!-- <el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button>  -->
 		</el-row>
 		<el-row class="page-main ">
 			<!--列表 XmTaskExecuser xm_task_execuser-->
 			<el-table ref="table" :height="tableHeight" :data="xmTaskExecusers" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+				
+				 <el-table-column  label="" type="selection" width="60"  fixed="left"> 
+				</el-table-column>  
 				 <el-table-column  label="序号" type="index" width="60"  fixed="left"> 
 				</el-table-column>  
 					 <el-table-column prop="username" label="用户姓名"  width="150" sortable  show-overflow-tooltip fixed="left">  
+						 <template slot-scope="scope">
+							 {{scope.row.username}} 
+						 </template>
 					</el-table-column>    
 					<el-table-column prop="execUserBranchId" label="用户归属公司" width="150" sortable  show-overflow-tooltip fixed="left"> 
 					</el-table-column>   
@@ -236,7 +245,9 @@
 				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
 			}, 
 			/**end 自定义函数请在上面加**/
-
+			select: function(){ 
+				this.$emit('select',this.sels);//  @row-click="rowClick"
+			}, 
 		},//end methods
 		components: { 
 		    //在下面添加其它组件