From 28fd24ed0df162b9620ff086d336eed5a4bbcdc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 20 Mar 2022 15:50:42 +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/xmIteration/XmIterationAdd.vue          | 8 +++++++-
 .../xm/core/xmIteration/XmIterationForLinkComplex.vue     | 4 ++--
 .../xm/core/xmIterationLink/XmIterationLinkForProduct.vue | 3 +--
 .../xm/core/xmIterationLink/XmIterationLinkForProject.vue | 3 +--
 4 files changed, 11 insertions(+), 7 deletions(-)

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 @@
 						<xm-iteration-edit v-if="showPanel=='detail'" :xm-iteration="xmIteration"></xm-iteration-edit>
 					</el-tab-pane> 
 					<el-tab-pane label="配置关联产品" lazy name="iterationProductLink" v-if="xmIteration&&xmIteration.id">
-						<xm-iteration-link-for-product  v-if="showPanel=='iterationProductLink'" :xm-iteration="xmIteration"></xm-iteration-link-for-product>
+						<xm-iteration-link-for-product  v-if="showPanel=='iterationProductLink'" :xm-iteration="xmIteration" :sel-project="selProject"></xm-iteration-link-for-product>
 					</el-tab-pane> 
 					<el-tab-pane label="配置需求范围" lazy name="iterationMenuMng" v-if="xmIteration&&xmIteration.id">
       					<xm-iteration-menu-mng v-if="showPanel=='iterationMenuMng'" :xm-iteration="xmIteration"></xm-iteration-menu-mng>
 					</el-tab-pane>
 					<el-tab-pane label="配置关联项目" lazy name="iterationProjectLink" v-if="xmIteration&&xmIteration.id">
-						<xm-iteration-link-for-project  v-if="showPanel=='iterationProjectLink'" :xm-iteration="xmIteration"></xm-iteration-link-for-project>
+						<xm-iteration-link-for-project  v-if="showPanel=='iterationProjectLink'" :xm-iteration="xmIteration" :xm-product="xmProduct"></xm-iteration-link-for-project>
 					</el-tab-pane>
 					<el-tab-pane label="需求列表" lazy name="menus" v-if="xmIteration&&xmIteration.id">
 						<xm-menu-mng v-if="xmIteration && showPanel=='menus'" :xm-product="xmProduct"  :xm-iteration="xmIteration" :sel-project="selProject" :disabled-mng="false"></xm-menu-mng>
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 @@
 	<section class="app-container"> 
 		<el-row>
 			<el-button type="primary" v-if="xmIteration" @click="productVisible=true" icon="el-icon-plus" > 选择更多产品加入迭代 </el-button>
-			<el-button type="primary" v-if="xmProduct" @click="iterationVisible=true" icon="el-icon-plus" > 选择更多迭代加入产品 </el-button>
-			<el-button type="primary"  icon="el-icon-plus" @click="showAdd"> 新增迭代 </el-button>
+			<el-button type="primary" v-if="xmProduct" @click="iterationVisible=true" icon="el-icon-plus" > 选择更多迭代加入产品 </el-button> 
 		</el-row>
 		<el-row style="padding-top:10px;">
 			<!--列表 XmIterationLink 迭代表与产品表的关联关系，一般由迭代管理员将迭代挂接到产品表-->
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 @@
 	<section class="app-container"> 
 		<el-row>
 			<el-button type="primary" v-if="xmIteration" @click="projectVisible=true" icon="el-icon-plus" > 选择更多项目加入迭代 </el-button>
-			<el-button type="primary" v-if="selProject" @click="iterationVisible=true" icon="el-icon-plus" > 选择更多迭代加入项目 </el-button>
-			<el-button type="primary"  icon="el-icon-plus" @click="showAdd"> 新增迭代 </el-button>
+			<el-button type="primary" v-if="selProject" @click="iterationVisible=true" icon="el-icon-plus" > 选择更多迭代加入项目 </el-button> 
 		</el-row>
 		<el-row style="padding-top:10px;">
 			<!--列表 XmIterationLink 迭代表与项目表的关联关系，一般由迭代管理员将迭代挂接到项目表-->