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 @@
-
+
-
+
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 @@
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 @@
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;