From 6daba1fad39bd7a6506ead31d85dad52d933e415 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 9 Aug 2022 11:13:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E6=8A=A5=E5=B7=A5=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/xmWorkload/XmWorkloadEdit.vue     | 26 ++++++-------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/views/xm/core/xmWorkload/XmWorkloadEdit.vue b/src/views/xm/core/xmWorkload/XmWorkloadEdit.vue
index 51c76799..32b3002a 100644
--- a/src/views/xm/core/xmWorkload/XmWorkloadEdit.vue
+++ b/src/views/xm/core/xmWorkload/XmWorkloadEdit.vue
@@ -34,7 +34,7 @@
 				
 				<el-row>
 					
-					<el-col :span="12"> 
+					<el-col :span="24"> 
 						<el-form-item label="计时方式" prop="workloadFillType">
  							<el-select v-model="workloadFillType" style="display:inline;">
 								<el-option value="1" label="正常报工(都适用)"></el-option>
@@ -42,12 +42,7 @@
 								<el-option value="3" label="按预估工时减去已登记工时一次性填满（适合不严格要求报工，但为了统计进度等）"></el-option>
 							</el-select>
 						</el-form-item>  
-					</el-col> 
-					<el-col :span="12"> 
-						<el-form-item label="任务执行人">
- 							 {{val.executorUsername}}
-						</el-form-item>  
-					</el-col> 
+					</el-col>  
 				</el-row>
 				<el-row>
 					<el-col :span="12">
@@ -59,8 +54,8 @@
 					
 					<el-col :span="12">
 						<el-form-item label="工时归属" prop="username">
-							<el-input   style="width:80%;" v-model="editForm.username" placeholder="工时归属工作人员，点击更换" @click.native="groupUserSelectVisible=true"></el-input> 
-						</el-form-item>  
+							<mdp-select-user-xm label="工时归属" v-model="editForm" userid-key="userid" username-key="username" :project-id="val.projectId"></mdp-select-user-xm>
+ 						</el-form-item>  
 					</el-col> 
 				</el-row>  
 				<el-row v-if="workloadFillType=='2'">  
@@ -85,11 +80,7 @@
 		<el-row style="float:right">
 		    <el-button @click.native="handleCancel">取消</el-button>
             <el-button v-loading="load.edit" type="primary" @click.native="saveSubmit" :disabled="load.edit==true">提交</el-button>
-		</el-row>
-		
-		<el-drawer append-to-body title="选择负责人"  :visible.sync="groupUserSelectVisible" size="60%"    :close-on-click-modal="false">
-			<xm-group-select  :visible="groupUserSelectVisible" :sel-project="{id:val.projectId,projectName:val.projectName}" :isSelectSingleUser="1" @user-confirm="groupUserSelectConfirm"></xm-group-select>
-		</el-drawer>
+		</el-row> 
 	</section>
 </template>
 
@@ -98,15 +89,14 @@
 	import config from "@/common/config"; //全局公共库import
 	import { getDicts,initSimpleDicts,initComplexDicts } from '@/api/mdp/meta/item';//字典表
 	import { addXmWorkload,editXmWorkload } from '@/api/xm/core/xmWorkload';
-	import { listXmTaskExecuser  } from '@/api/xm/core/xmTaskExecuser';
-
-	import XmGroupSelect from '../xmGroup/XmGroupSelect.vue';
+	import { listXmTaskExecuser  } from '@/api/xm/core/xmTaskExecuser'; 
+	import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';
 	import { mapGetters } from 'vuex'
 
 	export default {
 	    name:'xmWorkloadEdit',
 	    components: {
-			XmGroupSelect
+			MdpSelectUserXm
         },
 		computed: {
 		    ...mapGetters([ 'userInfo'  ]),