From af6304dd689137bda4f0b50722c04580faa493cd 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, 15 Jan 2023 02:15:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=A7=E8=A1=8C=E4=BA=BA?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xmTaskExecuser/XmTaskExecuserForTask.vue     | 16 +++++++++-------
 .../xm/core/xmTaskExecuser/XmTaskExecuserMng.vue |  6 +++++-
 .../core/xmTaskExecuser/XmTaskExecuserSelect.vue |  7 ++++---
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue
index 7b9356b1..08a65024 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue
@@ -12,7 +12,7 @@
 			<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 type="expand">
 					<template slot-scope="props">
-						<el-form label-position="left"  class="demo-table-expand">
+						<el-form label-position="left"  class="padding">
 							<el-form-item label="报价">
 								工作量：<span>{{ props.row.quoteWorkload }} 人时</span> 金额：<span>{{ props.row.quoteAmount }}元</span>
 							</el-form-item>
@@ -41,11 +41,9 @@
 					</template>
 				</el-table-column>
 				<el-table-column prop="username" label="姓名" min-width="150" >
-					<template slot-scope="scope">
-						<div>
-						{{scope.row.username}}  
-						</div>
-					</template>
+						 <template slot-scope="scope">
+							<mdp-select-user-xm :key="scope.row.id" v-model="scope.row" userid-key="userid" username-key="username" :project-id="scope.row.projectId" :disabled="true"></mdp-select-user-xm>
+						 </template>
 				</el-table-column> 
 				
 				<el-table-column prop="quoteStartTime" label="报价工期" min-width="150" >
@@ -78,7 +76,9 @@
 			<el-drawer append-to-body title="报价" :visible.sync="quotePriceVisible" size="60%" :close-on-click-modal="false">
 				<el-form :model="quotePriceForm" label-width="100px" ref="quotePriceForm">
 					<el-form-item label="候选人名称">
-						<span>{{ quotePriceForm.username }} </span>
+						 <template slot-scope="scope">
+							<mdp-select-user-xm v-model="quotePriceForm" userid-key="userid" username-key="username" :disabled="true"></mdp-select-user-xm>
+						 </template>
 					</el-form-item>
 					<el-form-item label="报价工期" prop="quoteWeekday">
 						<div>
@@ -143,6 +143,7 @@
 	import { mapGetters } from 'vuex'
 	import html2canvas from 'html2canvas'
 	import { uploadBase64 } from '@/api/mdp/arc/image';
+	import MdpSelectUserXm from "@/views/xm/core/components/MdpSelectUserXm/index";
 
 	export default {
 		computed: {
@@ -738,6 +739,7 @@
 		components: {
 		    'xm-task-execuser-add':XmTaskExecuserAdd,
 		    'xm-task-execuser-edit':XmTaskExecuserEdit, 
+			MdpSelectUserXm,
 		    //在下面添加其它组件
 		},
 		mounted() {
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
index ca2c7493..a6b9e3e8 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
@@ -21,6 +21,9 @@
 				 <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">
+							<mdp-select-user-xm :key="scope.row.id" v-model="scope.row" userid-key="userid" username-key="username" :project-id="scope.row.projectId" :disabled="true"></mdp-select-user-xm>
+						 </template> 
 					</el-table-column>    
 					<el-table-column prop="execUserBranchId" label="用户归属公司" width="150" sortable  show-overflow-tooltip fixed="left"> 
 					</el-table-column>   
@@ -181,6 +184,7 @@
 	import html2canvas from 'html2canvas'
 	import { uploadBase64 } from '@/api/mdp/arc/image';
   	import XmWorkloadEdit from "@/views/xm/core/xmWorkload/XmWorkloadEdit";
+	import MdpSelectUserXm from "@/views/xm/core/components/MdpSelectUserXm/index";
 
 	export default {
 		computed: {
@@ -828,7 +832,7 @@
 		},//end methods
 		components: {
 		    'xm-task-execuser-add':XmTaskExecuserAdd,
-		    'xm-task-execuser-edit':XmTaskExecuserEdit, XmWorkloadEdit,
+		    'xm-task-execuser-edit':XmTaskExecuserEdit, XmWorkloadEdit,MdpSelectUserXm
 		    //在下面添加其它组件
 		},
 		mounted() {
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserSelect.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserSelect.vue
index 5131953e..433584fc 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserSelect.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserSelect.vue
@@ -30,7 +30,7 @@
 				</el-table-column>  
 					 <el-table-column prop="username" label="用户姓名"  width="150" sortable  show-overflow-tooltip fixed="left">  
 						 <template slot-scope="scope">
-							 {{scope.row.username}} 
+							<mdp-select-user-xm :key="scope.row.id" v-model="scope.row" userid-key="userid" username-key="username" :project-id="scope.row.projectId" :disabled="true"></mdp-select-user-xm>
 						 </template>
 					</el-table-column>    
 					<el-table-column prop="execUserBranchId" label="用户归属公司" width="150" sortable  show-overflow-tooltip fixed="left"> 
@@ -85,8 +85,8 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import config from "@/common/config"; //全局公共库
-
+	import config from "@/common/config"; //全局公共库 
+	import MdpSelectUserXm from "@/views/xm/core/components/MdpSelectUserXm/index";
 	//import Sticky from '@/components/Sticky' // 粘性header组件
 	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmTaskExecuserWithTask,editXmTaskExecuser,leaveTask,beExecutor,settleExec, delXmTaskExecuser, batchDelXmTaskExecuser,quotePrice,becomeCandidate,toTest,testSuccess,testFail } from '@/api/xm/core/xmTaskExecuser';
@@ -251,6 +251,7 @@
 		},//end methods
 		components: { 
 		    //在下面添加其它组件
+			MdpSelectUserXm
 		},
 		mounted() {
 			this.$nextTick(() => {