From bbb67e2adc8c5befacb061ae7786a95dd64a9a7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 2 Mar 2022 07:52:06 +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/xmQuestion/XmQuestionAdd.vue  |  7 +++++++
 src/views/xm/core/xmQuestion/XmQuestionEdit.vue | 12 +++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
index 700009ec..d96c50ba 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
@@ -317,7 +317,11 @@
 				if(task.menuId){
 					this.addForm.menuId=task.menuId
 					this.addForm.menuName=task.menuName
+					this.addForm.productId=task.productId
 				}
+				
+				this.addForm.handlerUserid=task.executorUserid
+				this.addForm.handlerUsername=task.executorUsername 
 			},
 			handleCloseTaskTag:function(){
 				this.addForm.taskId=''
@@ -333,6 +337,9 @@
 			onSelectedMenu(menu){
 				this.addForm.menuId=menu.menuId
 				this.addForm.menuName=menu.menuName
+				this.addForm.iterationId=menu.iterationId
+				this.addForm.iterationName=menu.iterationName
+				this.addForm.productId=menu.productId
 				this.selectMenuVisible=false;
 			},
 			handleCloseMenuTag:function(){
diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index 21fb7ffa..7ebdd61b 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -209,7 +209,7 @@
 				//新增界面数据 xm_question
 				editForm: {
 					id:'',name:'',projectId:'',projectName:'',taskId:'',taskName:'',endTime:'',askUserid:'',askUsername:'',handlerUserid:'',handlerUsername:'',priority:'',solution:'',processTime:'',receiptMessage:'',receiptTime:'',description:'',createUserid:'',createUsername:'',createTime:'',status:'',receiptMessage:'',
-					attachment: [],
+					attachment: [],iterationId:'',iterationName:'',productId:'',
 				},
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				fileVisible: true,
@@ -366,6 +366,13 @@
 			onSelectedTask(task){
 				this.editForm.taskId=task.id
 				this.editForm.taskName=task.name
+				if(!this.editForm.menuId){
+					this.editForm.menuId=task.menuId
+					this.editForm.menuName=task.menuName
+					this.editForm.productId=task.productId
+				} 
+				this.editForm.handlerUserid=task.executorUserid
+				this.editForm.handlerUsername=task.executorUsername
 				this.selectTaskVisible=false;
 			},
 			handleCloseTaskTag:function(){
@@ -392,6 +399,9 @@
 			onSelectedMenu(menu){
 				this.editForm.menuId=menu.menuId
 				this.editForm.menuName=menu.menuName
+				this.editForm.productId=menu.productId
+				this.editForm.iterationId=menu.iterationId
+				this.editForm.iterationName=menu.iterationName
 				this.selectMenuVisible=false;
 			},
 			handleCloseMenuTag:function(){