From 885ea1a356e939d215931161d8a90ffb2310afde 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:39:42 +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/xmProduct/XmProductMng.vue | 14 ++++++++++----
 src/views/xm/core/xmProject/XmProjectMng.vue |  9 +++++++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index 3af4e815..67e48b90 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -188,8 +188,12 @@
 								<div class="project-rate">
 									<el-progress :percentage="(p.finishRate==null?0:p.finishRate)"></el-progress>
 								</div>
-								<div class="project-footer">
-									<div class="project-type">{{p.xmType}}</div>
+								<div class="project-footer"> 
+									<div class="project-type" title="产品经理">
+											<mdp-select-user-xm v-if="p.pmUserid" :value="p" userid-key="pmUserid" username-key="pmUsername" :disabled="true"></mdp-select-user-xm> 
+											<mdp-select-user-xm v-else-if="p.admUserid" :value="p" userid-key="admUserid" username-key="admUsername" :disabled="true"></mdp-select-user-xm> 
+										</div>
+										<div class="project-period">{{p.startTime?p.startTime.substr(0,10):''}} ~{{p.endTime?p.endTime.substr(0,10):''}}</div>
 									<!--<div class="project-period">{{p.startTime.substr(0,10)}} ~{{p.endTime.substr(0,10)}}</div>-->
 								</div>
 							</el-card>
@@ -262,8 +266,8 @@
 							</template>
 						</el-table-column>
 						<el-table-column prop="pmUsername" label="产品经理" width="150" sortable show-overflow-tooltip>
-							<template slot-scope="scope"> 						
-								<el-tag v-if="scope.row.pmUsername">{{scope.row.pmUsername}}</el-tag> 
+							<template slot-scope="scope"> 	
+								<mdp-select-user-xm v-model="scope.row" userid-key="pmUserid" username-key="pmUsername" :disabled="true"></mdp-select-user-xm>
 							</template>
 						</el-table-column>
 						
@@ -400,6 +404,7 @@
 	import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue';
 	import XmProductSelect from '@/views/xm/core/components/XmProductSelect.vue'; 
 	import { addUserFocus , delUserFocus } from '@/api/mdp/sys/userFocus';
+	import MdpSelectUserXm from "@/views/xm/core/components/MdpSelectUserXm/index";
 
 	import Guider from '@/components/Guider/Index.js';
 
@@ -823,6 +828,7 @@
 			XmIterationSelect,
 			XmProductSelect,
 			XmProductTplMng, 
+			MdpSelectUserXm,
 		    //在下面添加其它组件
 		},
 		mounted() {
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index 0dc29556..0ccbb43b 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -148,7 +148,11 @@
 										<el-progress :percentage="(p.finishRate==null?0:p.finishRate)"></el-progress>
 									</div>
 									<div class="project-footer">
-										<div class="project-type" title="项目经理">{{p.pmUsername?p.pmUsername:p.createUsername}}</div>
+										<div class="project-type" title="项目经理">
+											<mdp-select-user-xm v-if="p.pmUserid" :value="p" userid-key="pmUserid" username-key="pmUsername" :disabled="true"></mdp-select-user-xm> 
+											<mdp-select-user-xm v-else-if="p.createUserid" :value="p" userid-key="createUserid" username-key="createUsername" :disabled="true"></mdp-select-user-xm> 
+
+										</div>
 										<div class="project-period">{{p.startTime?p.startTime.substr(0,10):''}} ~{{p.endTime?p.endTime.substr(0,10):''}}</div>
 									</div>
 								</el-card>
@@ -362,6 +366,7 @@
 	import xmProjectInfo from './XmProjectInfo'; 
 	import XmProjectTplMng from './XmProjectTplMng'; 
 	import XmProductSelect from '@/views/xm/core/components/XmProductSelect';
+	import MdpSelectUserXm from "@/views/xm/core/components/MdpSelectUserXm/index";
 
 	if(!Vue.component("xm-project-info")){
 		
@@ -896,7 +901,7 @@
 			
 			XmProductSelect,
 			xmTaskMng,
-			XmProjectTplMng,
+			XmProjectTplMng,MdpSelectUserXm
 		    //在下面添加其它组件
 		},
 		mounted() {