From 3d299259570c277198e61c27ca494bb60e22194a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 10 Mar 2022 01:54:16 +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/xmProject/XmProjectInfo.vue     |  4 ++--
 src/views/xm/core/xmTask/XmTaskCenter.vue         |  2 +-
 src/views/xm/core/xmTask/XmTaskList.vue           |  1 +
 src/views/xm/core/xmTask/XmTaskListForMenu.vue    |  3 ++-
 src/views/xm/core/xmTask/XmTaskListForProduct.vue |  2 +-
 src/views/xm/core/xmTask/XmTaskMng.vue            | 12 +++++++++---
 src/views/xm/core/xmTask/XmTaskMngBatch.vue       |  7 ++++++-
 7 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/views/xm/core/xmProject/XmProjectInfo.vue b/src/views/xm/core/xmProject/XmProjectInfo.vue
index 5512a8b0..77f33f2d 100644
--- a/src/views/xm/core/xmProject/XmProjectInfo.vue
+++ b/src/views/xm/core/xmProject/XmProjectInfo.vue
@@ -135,11 +135,11 @@
 			 <xm-iteration-for-project-complex  v-if="infotype=='迭代'" ref="xmIterationMng" :sel-project="selProject"></xm-iteration-for-project-complex>
  			 <xm-product-for-project-complex  v-if="infotype=='产品'" ref="xmProductComplex" :sel-project="selProject"></xm-product-for-project-complex>
 			 <xm-menu-mng v-if="infotype=='需求'" :sel-project="selProject" :disabled-mng="false"></xm-menu-mng>
-			 <xm-task-mng v-if="infotype=='任务'" ref="xmTaskMng" :sel-project="selProject" ></xm-task-mng>
+			 <xm-task-mng v-if="infotype=='任务'" ref="xmTaskMng" :sel-project="selProject"  key="task"></xm-task-mng>
 			  <xm-question v-if="infotype=='缺陷'" :qtype="'bug'" :sel-project='selProject' ref="xmQuestion"></xm-question>
 			  <xm-group-mng v-if="infotype=='团队'" :sel-project="selProject"></xm-group-mng>
 			  <xm-file-mng v-if="infotype=='文档'" :sel-project="selProject"></xm-file-mng>
-			   <xm-task-mng v-if="infotype=='计划'" ref="projectPlan" work-item-type="projectPlan" :sel-project="selProject" ></xm-task-mng>
+			   <xm-task-mng v-if="infotype=='计划'" ref="projectPlan" work-item-type="projectPlan" :sel-project="selProject" key="projectPlan"></xm-task-mng>
 			 <!-- <xm-project-phase-mng v-if="infotype=='计划'" ref="xmProjectPhaseMng" :sel-project="selProject" ></xm-project-phase-mng> -->
 			  <xm-test-case-exec-mng v-if="infotype=='测试计划'" :visible="infotype=='测试计划'"  :sel-project='selProject' ref="xmQuestion"></xm-test-case-exec-mng>
 			<xm-menu-with-plan v-if="infotype=='需求监控'" ref="xmMenuWithPlan" :sel-project="selProject"></xm-menu-with-plan>
diff --git a/src/views/xm/core/xmTask/XmTaskCenter.vue b/src/views/xm/core/xmTask/XmTaskCenter.vue
index 3b6f715d..30a79f6a 100644
--- a/src/views/xm/core/xmTask/XmTaskCenter.vue
+++ b/src/views/xm/core/xmTask/XmTaskCenter.vue
@@ -1,7 +1,7 @@
 <template>
 	<section>
 		<el-row class="xm-task">
-			 <xm-task-mng :is-task-center="1"></xm-task-mng>
+			 <xm-task-mng :is-task-center="1" work-item-type="task"></xm-task-mng>
 		</el-row>
 	</section>
 </template>
diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue
index 7e0df221..9daf180d 100644
--- a/src/views/xm/core/xmTask/XmTaskList.vue
+++ b/src/views/xm/core/xmTask/XmTaskList.vue
@@ -267,6 +267,7 @@
 					params.userid=this.userInfo.userid
 					params.isMy="1"
 				}
+				params.ntype="0"
 				getTask(params).then((res) => {
 					var tips=res.data.tips;
 					if(tips.isOk){ 
diff --git a/src/views/xm/core/xmTask/XmTaskListForMenu.vue b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
index 1f7c9d06..44304480 100644
--- a/src/views/xm/core/xmTask/XmTaskListForMenu.vue
+++ b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
@@ -221,7 +221,8 @@
 				}
 				params.menuId=this.menuId
 				
-				params.withParents="1"
+				params.ntype="0"
+				//params.withParents="1"
 				getTask(params).then((res) => {
 					var tips=res.data.tips;
 					if(tips.isOk){ 
diff --git a/src/views/xm/core/xmTask/XmTaskListForProduct.vue b/src/views/xm/core/xmTask/XmTaskListForProduct.vue
index 01f88d96..51343b39 100644
--- a/src/views/xm/core/xmTask/XmTaskListForProduct.vue
+++ b/src/views/xm/core/xmTask/XmTaskListForProduct.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-		 <xm-task-mng :xm-product="xmProduct"></xm-task-mng>
+		 <xm-task-mng :xm-product="xmProduct" work-item-type="task"></xm-task-mng>
 	</section>
 </template>
 
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index a3a34471..67d65fcf 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -1131,6 +1131,7 @@ export default {
     "menuName",
     "xmProduct",
     "xmIteration",
+    "workItemType"
   ],
   watch: {
     selProject: function (oval, val) {
@@ -1388,10 +1389,14 @@ export default {
         }
         params.orderBy = orderBys.join(",");
       }
-      params=this.getParams(params)
-      params.isTop="1"
+      params=this.getParams(params) 
+      if(this.workItemType=='projectPlan'){
+        params.isTop="1" 
+			  params.withParents="1"
+      }else{
+        params.ntype="0"
+      }
       
-			params.withParents="1"
       getTask(params)
         .then((res) => {
           var tips = res.data.tips;
@@ -2300,6 +2305,7 @@ export default {
       this.searchXmTasks();
     }, 
     getParams(params) {
+      
       if (this.dateRanger && this.dateRanger.length == 2) {
         params.createTimeStart = this.dateRanger[0];
         params.createTimeEnd = this.dateRanger[1];
diff --git a/src/views/xm/core/xmTask/XmTaskMngBatch.vue b/src/views/xm/core/xmTask/XmTaskMngBatch.vue
index fc2d368a..f7398a52 100644
--- a/src/views/xm/core/xmTask/XmTaskMngBatch.vue
+++ b/src/views/xm/core/xmTask/XmTaskMngBatch.vue
@@ -473,7 +473,7 @@ export default {
     },
  
   },
-  props: ["selProject",  "visible","xmTasks"],
+  props: ["selProject",  "visible","workItemType"],
   watch: {
     selProject: function (oval, val) {
       this.filters.selProject = this.selProject;
@@ -683,8 +683,13 @@ export default {
       }
 	  this.load.list=true
 	  params=this.getParams(params)
+    if(this.workItemType=='projectPlan'){
       params.isTop = "1";
       params.withParents = "1";
+    }else{ 
+      params.ntype="0"
+    }
+     
       getTask(params)
         .then((res) => {
           var tips = res.data.tips;