From ae84f615cf09f81ea0995f2c8cd49fb276dedb8f 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 13:40:38 +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/xmMenu/XmMenuDetail.vue | 28 ++++++++++++++++++
 src/views/xm/core/xmMenu/XmMenuEdit.vue   | 35 ++++++++++++++++++-----
 2 files changed, 56 insertions(+), 7 deletions(-)
 create mode 100644 src/views/xm/core/xmMenu/XmMenuDetail.vue

diff --git a/src/views/xm/core/xmMenu/XmMenuDetail.vue b/src/views/xm/core/xmMenu/XmMenuDetail.vue
new file mode 100644
index 00000000..1e29c5ff
--- /dev/null
+++ b/src/views/xm/core/xmMenu/XmMenuDetail.vue
@@ -0,0 +1,28 @@
+<template> 
+	<xm-menu-edit v-if="xmMenu" :xm-menu="xmMenu" :reload="reload" :visible="xmMenu&&xmMenu.menuId"></xm-menu-edit> 
+</template>
+
+<script>    
+	export default {  
+		props:['xmMenu','reload'],  
+		data() {
+			 return {
+				
+			 }
+		},//end data
+		methods: { 
+			  
+			
+		},//end methods
+		components: {  
+			XmMenuEdit:()=>import('./XmMenuEdit')
+			//在下面添加其它组件
+		},  
+		mounted() {  
+			 
+		}
+	}
+</script>
+
+<style scoped> 
+</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index af3aa38f..7116b5c5 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -92,13 +92,22 @@
 						</el-row>
 						<el-row class="padding"> 
 								<el-col :span="8">
-									<mdp-field-x v-if="!editForm.pmenuId" v-model="editForm.pmenuName" :disabled="true" label="上级需求"> </mdp-field-x>
+									<mdp-field-x v-if="!editForm.pmenuId" v-model="editForm.pmenuId" :disabled="true" label="上级需求"> 
+									
+									</mdp-field-x>
 
-									<mdp-field-x v-else v-model="editForm.pmenuName" :label="editForm.dclass==='3'?'归属特性':(editForm.dclass==='2'?'归属史诗':'归属')" :icon="editForm.dclass==='2'?'el-icon-s-promotion':'el-icon-s-flag'" :color="editForm.dclass==='2'?'rgb(255, 153, 51)':'rgb(0, 153, 51)'">
-										<el-button slot="oper"
-											@click="showPmenu"  
+									<mdp-field-x v-else v-model="editForm.pmenuId" :label="editForm.dclass==='3'?'归属特性':(editForm.dclass==='2'?'归属史诗':'归属')" :icon="editForm.dclass==='2'?'el-icon-s-promotion':'el-icon-s-flag'" :color="editForm.dclass==='2'?'rgb(255, 153, 51)':'rgb(0, 153, 51)'">
+										<div slot="oper"> 							
+										<el-button 
+											@click="pmenuFormVisible=true"  
 											title="查看上级"
-											icon="el-icon-upload2"> 查看上级</el-button> 
+											icon="el-icon-upload2"> 查看上级</el-button> 	
+										
+										<el-button
+											@click="changePmenu"  
+											title="更换上级"
+											icon="el-icon-upload2"> 更换上级</el-button> 
+											</div>
 									</mdp-field-x>  
 								</el-col> 
 								<el-col  :span="8">
@@ -259,7 +268,10 @@
 				<tag-mng :tagIds="editForm.tagIds?editForm.tagIds.split(','):[]" :jump="true" @select-confirm="onTagSelected">
 				</tag-mng>
 			</el-drawer>
-
+ 
+				<el-dialog title="上级需求详情" :visible.sync="pmenuFormVisible" :with-header="false" width="90%" top="20px"    append-to-body   :close-on-click-modal="false" >
+					<xm-menu-edit v-if="pmenuFormVisible" :reload="true" :xm-menu="{menuId:editForm.pmenuId}" :sel-project="selProject" :visible="pmenuFormVisible" @cancel="pmenuFormVisible=false"></xm-menu-edit>
+				</el-dialog>
 
 	</section>
 </template>
@@ -375,7 +387,9 @@
 				},
 				tagSelectVisible:false, 
 				subWorkItemNum:-1,
-				activateTabPaneName:'4'
+				activateTabPaneName:'4',
+				pmenuFormVisible:false,
+
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 
 				/**end 在上面加自定义属性**/
@@ -388,6 +402,12 @@
 			// 取消按钮点击 父组件监听@cancel="editFormVisible=false" 监听
 			handleCancel:function(){
  				this.$emit('cancel');
+			},
+			showPmenu(){
+				
+			},
+			changePmenu(){
+
 			},
 			//新增提交XmMenu 项目需求表 父组件监听@submit="afterAddSubmit"
 			editSubmit: function () {
@@ -564,6 +584,7 @@
 			XmMyDoFocus,
 			ArchiveEdit,
 			XmTestCaseMng,MdpSelectUserXm,
+			'xm-menu-edit':()=>import("./XmMenuDetail")
 		},
 		mounted() {