diff --git a/src/views/xm/core/xmIteration/XmIterationAdd.vue b/src/views/xm/core/xmIteration/XmIterationAdd.vue index 450259d9..2b7bca94 100644 --- a/src/views/xm/core/xmIteration/XmIterationAdd.vue +++ b/src/views/xm/core/xmIteration/XmIterationAdd.vue @@ -97,16 +97,22 @@ this.$refs.addForm.validate((valid) => { if (valid) { var links=[]; + var msg=""; if(this.xmProduct){ links.push({proId:this.xmProduct.id,ltype:'1'}) + msg="产品【"+this.xmProduct.productName+"】" + } if(this.selProject){ links.push({proId:this.selProject.id,ltype:'0'}) + if(msg.length>0){ + msg=msg+",项目【"+this.selProject.name+"】" + } } var params={...this.addForm} params.links=links; - this.$confirm('确认提交吗?', '提示', {}).then(() => { + this.$confirm('确认提交迭代吗?'+(msg.length>0?'将自动关联'+msg:''), '提示', {}).then(() => { this.load.add=true addXmIteration(params).then((res) => { this.load.add=false diff --git a/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue b/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue index 89d2b475..77d7467d 100644 --- a/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue +++ b/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue @@ -36,13 +36,13 @@ - + - + diff --git a/src/views/xm/core/xmIterationLink/XmIterationLinkForProduct.vue b/src/views/xm/core/xmIterationLink/XmIterationLinkForProduct.vue index ae35a1e5..3775dae8 100644 --- a/src/views/xm/core/xmIterationLink/XmIterationLinkForProduct.vue +++ b/src/views/xm/core/xmIterationLink/XmIterationLinkForProduct.vue @@ -2,8 +2,7 @@
选择更多产品加入迭代 - 选择更多迭代加入产品 - 新增迭代 + 选择更多迭代加入产品 diff --git a/src/views/xm/core/xmIterationLink/XmIterationLinkForProject.vue b/src/views/xm/core/xmIterationLink/XmIterationLinkForProject.vue index 9156f2c7..a3413422 100644 --- a/src/views/xm/core/xmIterationLink/XmIterationLinkForProject.vue +++ b/src/views/xm/core/xmIterationLink/XmIterationLinkForProject.vue @@ -2,8 +2,7 @@
选择更多项目加入迭代 - 选择更多迭代加入项目 - 新增迭代 + 选择更多迭代加入项目