From 7d3a04b68c05a56b69cddf5ae417b92e6dada916 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 25 Jul 2022 14:48:24 +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/xmTask/XmTaskDetail.vue | 74 +++++++++++++++++++++++
 src/views/xm/core/xmTask/XmTaskEdit.vue   | 42 ++++++++++---
 2 files changed, 108 insertions(+), 8 deletions(-)
 create mode 100644 src/views/xm/core/xmTask/XmTaskDetail.vue

diff --git a/src/views/xm/core/xmTask/XmTaskDetail.vue b/src/views/xm/core/xmTask/XmTaskDetail.vue
new file mode 100644
index 00000000..81cc5deb
--- /dev/null
+++ b/src/views/xm/core/xmTask/XmTaskDetail.vue
@@ -0,0 +1,74 @@
+<template>
+ 	<xm-task-edit v-if="xmTaskDb&&xmTaskDb.id && showInfo" :xm-task="xmTaskDb"  :visible="showInfo"></xm-task-edit>
+ </template>
+
+<script> 
+	 
+	import {  listXmTask } from '@/api/xm/core/xmTask';
+	import { mapGetters } from 'vuex';  
+
+	export default {  
+		props:['xmTask','reload','visible'],
+		computed: {
+		    ...mapGetters([
+		      'userInfo','roles'
+				]), 
+		}, 
+		watch:{
+			 'visible':function(){
+				if(this.visible){
+					if(this.reload){ 
+						this.getTask(this.xmTask.id)
+					}else{
+						this.xmTaskDb=this.xmTask
+						this.showInfo=true
+					}
+				}else{
+					this.showInfo=false
+				}
+				
+				
+			 }
+		},
+		data() {
+			return { 
+				 xmTaskDb:null, 
+				 showInfo:false,
+			}
+		},//end data
+		methods: { 
+			  
+			 getTask(id){
+				if(!id){
+					this.xmTaskDb=null
+					return;
+				}
+				 listXmTask({id:id}).then(res=>{
+					 var tips = res.data.tips;
+					 if(tips.isOk){
+						 this.xmTaskDb=res.data.data[0] 
+						 this.showInfo=true
+					 }else{
+
+					 }
+				 })
+			 }
+			
+		},//end methods
+		components: {  
+			XmTaskEdit:()=>import("./XmTaskEdit"),
+			//在下面添加其它组件
+		},  
+		mounted() {  
+			  if(this.reload){
+
+					this.getTask(this.xmTask.id)
+				}else{
+					this.xmTaskDb=this.xmTask
+				}
+		}
+	}
+</script>
+
+<style scoped> 
+</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index 7616ca11..10b3f37f 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -129,11 +129,19 @@
 						<el-row class="padding"> 
 							<el-col :span="8"> 
 								<mdp-field-x v-model="editForm.parentTaskname" label="上级计划" icon="el-icon-time" color="#E6A23C">
-									<el-button slot="oper"
-										@click="selectParentTaskVisible=true"  
-										title="更换任务的上级，实现任务搬家功能"
-										icon="el-icon-upload2" 
-									> 选择新的上级</el-button> 
+									<div slot="oper"> 
+										<el-button  
+											@click="selectParentPlanVisible=true"  
+											title="更换任务的上级，实现任务搬家功能"
+											icon="el-icon-upload2" 
+										> 选择新的上级</el-button> 
+										
+										<el-button  v-if="editForm.parentTaskid"
+											@click="parentPlanVisible=true"  
+											title="查看上级计划明细"
+											icon="el-icon-upload2" 
+										> 查看上级计划</el-button> 
+									</div>
 								</mdp-field-x> 
 							</el-col> 
 							<el-col :span="8">  
@@ -526,9 +534,26 @@
 			</tag-mng>
 		</el-drawer>
 		
-		<el-dialog title="选择新的上级计划" append-to-body :visible.sync="selectParentTaskVisible" width="60%" top="20px">
+		<el-dialog title="选择新的上级计划" append-to-body :visible.sync="selectParentPlanVisible" width="60%" top="20px">
 		<xm-phase-select :sel-project="xmProject"   @select="onSelectedParentTask"></xm-phase-select>
 		</el-dialog>
+
+		<!--编辑 XmTask xm_task界面-->
+		<el-dialog
+			title="编辑任务"
+			:visible.sync="parentPlanVisible" 
+			fullscreen
+			append-to-body
+			:close-on-click-modal="false"
+			>
+			<xm-task-edit
+				:xm-project="{id:editForm.projectId,name:editForm.projectName}"
+				:xm-task="{id:editForm.parentTaskid,name:editForm.parentTaskname}"
+				:visible="parentPlanVisible"
+				:reload="true"
+				@cancel="parentPlanVisible = false" 
+			></xm-task-edit>
+		</el-dialog>
 	</section>
 </template>
 
@@ -673,10 +698,11 @@
 				tagSelectVisible:false,
 				subWorkItemNum:0,
 				activateTabPaneName:'2',
-				selectParentTaskVisible:false, 
+				selectParentPlanVisible:false, 
 				supRequires:[],
 				toPayEfundsVisible:false,
 				toPayMarketVisible:false,
+				parentPlanVisible:false,
 				 /**end 在上面加自定义属性**/
 			}//end return
 		},//end data
@@ -980,7 +1006,7 @@
 		components: { 
  			xmSkillMng,
 			skillMng,xmMenuSelect,XmTaskList,XmExecuserMng,XmGroupSelect,XmMenuRichDetail,TagMng,XmSubWorkItem,XmTaskWorkloadRecord,XmMenuEdit,
-			XmRecord,xmQuestionForTask,XmMyDoFocus,XmTaskExecuserForTask,XmPhaseSelect,ToPay,MdpSelectUserXm
+			XmRecord,xmQuestionForTask,XmMyDoFocus,XmTaskExecuserForTask,XmPhaseSelect,ToPay,MdpSelectUserXm,'xm-task-edit':()=>import("./XmTaskDetail"),
 			//在下面添加其它组件 'xm-task-edit':XmTaskEdit
 		},
 		mounted() {