diff --git a/src/views/xm/core/xmIteration/XmIterationInfo.vue b/src/views/xm/core/xmIteration/XmIterationInfo.vue
index 5a0dcce2..b14f85a2 100644
--- a/src/views/xm/core/xmIteration/XmIterationInfo.vue
+++ b/src/views/xm/core/xmIteration/XmIterationInfo.vue
@@ -37,7 +37,7 @@
-
+
diff --git a/src/views/xm/core/xmProduct/XmProductInfo.vue b/src/views/xm/core/xmProduct/XmProductInfo.vue
index dccba631..e4e6f08a 100644
--- a/src/views/xm/core/xmProduct/XmProductInfo.vue
+++ b/src/views/xm/core/xmProduct/XmProductInfo.vue
@@ -136,11 +136,11 @@
-
+
-
+
diff --git a/src/views/xm/core/xmProject/XmProjectInfo.vue b/src/views/xm/core/xmProject/XmProjectInfo.vue
index b702e15f..c9ab6224 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/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue
index 41d5a1ed..896182dc 100644
--- a/src/views/xm/core/xmTask/XmTaskAdd.vue
+++ b/src/views/xm/core/xmTask/XmTaskAdd.vue
@@ -8,19 +8,19 @@
计划项
任务
+
+ {{addForm.projectName}}
+
+
+ {{addForm.productName}}
+
{{addForm.parentTaskname}}
选上级 请尽量选择上级,对任务进行归类，方便排版和操作
-
-
-
-
-
- {{addForm.projectName}}
-
-
+
+
里程碑
@@ -167,11 +167,11 @@
-
+
-
+
@@ -216,7 +216,7 @@
}
}
},
- props:['xmTask','visible','xmProject','projectPhase',"parentTask"],
+ props:['xmTask','visible','xmProject','xmProduct',"parentTask","ptype"],
watch: {
'xmTask':function( xmTask ) {
},
@@ -505,12 +505,16 @@
this.addForm.parentTaskname=this.parentTask.name;
this.addForm.taskType=this.parentTask.taskType
this.addForm.planType=this.parentTask.planType
+ this.addForm.ptype=this.parentTask.ptype
}
if(this.xmProject){
this.addForm.projectId=this.xmProject.id
this.addForm.projectName=this.xmProject.name
}
-
+ if(this.xmProduct){
+ this.addForm.productId=this.xmProduct.id
+ this.addForm.productName=this.xmProduct.productName
+ }
if(this.parentTask && this.parentTask.id){
if(this.parentTask.childrenCnt){
this.addForm.sortLevel=this.parentTask.sortLevel+"."+(this.parentTask.childrenCnt+1)
@@ -527,6 +531,9 @@
if(!this.addForm.uniOutPrice){
this.addForm.uniOutPrice=100
}
+ if(!this.parentTask || !this.parentTask.id){
+ this.addForm.ptype=this.ptype
+ }
this.addForm.createUserid=this.userInfo.userid
this.addForm.createUsername=this.userInfo.username;
this.addForm.executorUserid=this.userInfo.userid
diff --git a/src/views/xm/core/xmTask/XmTaskCenter.vue b/src/views/xm/core/xmTask/XmTaskCenter.vue
index 30a79f6a..db020e3e 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 bab768d3..f09b0830 100644
--- a/src/views/xm/core/xmTask/XmTaskList.vue
+++ b/src/views/xm/core/xmTask/XmTaskList.vue
@@ -7,8 +7,8 @@
placement="right"
width="400"
trigger="click">
-
- {{filters.selProject?filters.selProject.name:'选择项目'}}
+
+ {{filters.selProject?filters.selProject.name:'选择项目'}}
@@ -110,7 +110,7 @@
},
},
- props: ["selProject",'isMultiSelect','xmProduct','xmIteration','checkScope'/**task/all/plan */,'queryScope'/**task/all/plan */,],
+ props: ["selProject",'isMultiSelect','xmProduct','xmIteration','checkScope'/**task/planTask/plan */,'queryScope'/**task/planTask/plan */,"ptype"],
watch: {
"selkey": function(val) {
// console.log("任务类型");
@@ -238,7 +238,7 @@
params=this.getParams(params)
- if(this.queryScope=='all'){
+ if(this.queryScope=='planTask'){
params.isTop="1"
params.withParents="1"
}else if(this.queryScope=='plan'){
@@ -251,6 +251,9 @@
params.isTop="1"
params.withParents="1"
}
+ if(this.ptype){
+ params.ptype=this.ptype
+ }
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 51343b39..7e997d98 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 d9f060c0..a38eda2a 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -772,9 +772,10 @@
>
{
var tips = res.data.tips;
@@ -1579,14 +1585,26 @@ export default {
}
return true;
}else{
- if(!this.filters.selProject || !this.filters.selProject.id){
- this.$notify({
- showClose: true,
- message: "请先选择项目",
- type: "warning",
- });
- return false;
+ if(this.ptype==='0'){
+ if(!this.filters.selProject || !this.filters.selProject.id){
+ this.$notify({
+ showClose: true,
+ message: "请先选择项目",
+ type: "warning",
+ });
+ return false;
+ }else if(this.ptype==='1'){
+ if( !this.xmProduct && this.xmProduct.id){
+ this.$notify({
+ showClose: true,
+ message: "请先选择产品",
+ type: "warning",
+ });
+ return false;
+ }
+ }
}
+
}
return true;
diff --git a/src/views/xm/core/xmTask/XmTaskMngBatch.vue b/src/views/xm/core/xmTask/XmTaskMngBatch.vue
index 9da76e54..e6cc65f6 100644
--- a/src/views/xm/core/xmTask/XmTaskMngBatch.vue
+++ b/src/views/xm/core/xmTask/XmTaskMngBatch.vue
@@ -345,7 +345,7 @@ export default {
},
},
- props: ["selProject", "visible","workItemType","xmTasks"],
+ props: ["selProject", "visible","ptype","xmTasks","queryScope"],
watch: {
selProject: function (oval, val) {
this.filters.selProject = this.selProject;
@@ -527,7 +527,7 @@ export default {
}
this.load.list=true
params=this.getParams(params)
- if(this.workItemType=='projectPlan'){
+ if(this.ptype=='projectPlan'){
params.isTop = "1";
params.withParents = "1";
}else{