From 7b16edbe9391033eec06f1c9ea7fdd3857f233db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 8 Jul 2022 23:01:57 +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/xmIterationMenu/XmIterationMenuMng.vue | 8 +++-----
 src/views/xm/core/xmTask/XmTaskList.vue                  | 9 +++------
 src/views/xm/core/xmTask/XmTaskListForMenu.vue           | 2 +-
 src/views/xm/core/xmTask/XmTaskMng.vue                   | 9 +++------
 4 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
index dbd73835..7adf47ab 100644
--- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
+++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
@@ -20,7 +20,7 @@
 						</el-row>
 						<el-row class="page-main padding-top padding-left">
 							<!--列表 XmIterationMenu 迭代定义-->
-							<el-table ref="table" :height="maxTableHeight" :data="xmIterationMenusTreeData"  row-key="menuId" :tree-props="{children: 'children'}"  @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+							<el-table ref="table" :height="maxTableHeight" :data="xmIterationMenusTreeData"  row-key="menuId"   @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 								<el-table-column  type="selection" width="45"></el-table-column>
 
 								<el-table-column prop="menuName" label="已加入迭代的用户故事" min-width="140" >
@@ -96,10 +96,8 @@
 		      'userInfo','roles'
 		    ]),
 
-      		xmIterationMenusTreeData() {
-				let xmMenus = JSON.parse(JSON.stringify(this.xmIterationMenus || []));
-				let xmMenusTreeData = treeTool.translateDataToTree(xmMenus,"pmenuId","menuId");
-				 return xmMenusTreeData;
+      		xmIterationMenusTreeData() { 
+				 return this.xmIterationMenus;
 			},
 		},
 		watch:{
diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue
index 512e75f2..93b4fc8b 100644
--- a/src/views/xm/core/xmTask/XmTaskList.vue
+++ b/src/views/xm/core/xmTask/XmTaskList.vue
@@ -32,8 +32,7 @@
 							highlight-current-row
 							stripe
 							fit
-							border
-							:tree-props="{children: 'children' }"
+							border 
 							row-key="id"
 							 :height="tableHeight"
 							>
@@ -106,10 +105,8 @@
 				'userInfo','roles'
 			]),  
 			tasksTreeData() {
-				
-				var d=JSON.parse(JSON.stringify(this.xmTasks))
-				 var data= treeTool.translateDataToTree(d,"parentTaskid","id");
-				 return data;
+				 
+				 return this.xmTasks;
 			},
 			  
 		},
diff --git a/src/views/xm/core/xmTask/XmTaskListForMenu.vue b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
index 1603ae2b..61de9c61 100644
--- a/src/views/xm/core/xmTask/XmTaskListForMenu.vue
+++ b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
@@ -103,7 +103,7 @@
 			]), 
 			 
 			tasksTreeData() {
-				 return this.translateDataToTree(this.xmTasks);
+				 return this.xmTasks;
 			},
 			  
 		},
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 7ed2ed8b..327bed8e 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -326,8 +326,7 @@
               fit
               border
               tooltip-effect="light"
-              :height="tableHeight"
-              :tree-props="{ children: 'children'  }"
+              :height="tableHeight" 
               row-key="id"
               ref="table"
               :row-style="{height:'60px'}"
@@ -936,10 +935,8 @@ export default {
         return 0;
       }
     },
-    tasksTreeData() {
-      let xmTasks = JSON.parse(JSON.stringify(this.xmTasks || []));
-      const tasksTreeData = treeTool.translateDataToTree(xmTasks,"parentTaskid","id");
-      return tasksTreeData;
+    tasksTreeData() { 
+      return this.xmTasks;
     },
 
   },