优化

src/views/xm/core/xmIteration/XmIterationAdd.vue

@@ -2,19 +2,10 @@
 	<section class="page-container  padding border">
 		<el-row>
 			<!--新增界面 XmIteration 迭代定义--> 
-			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">  
-				<el-form-item v-if="parentIteration" label="上级迭代" prop="pid">
-					 {{parentIteration.seqNo}}&nbsp;&nbsp;{{parentIteration.iterationName}}
-				</el-form-item> 
-				<el-form-item v-else label="上级迭代" prop="pid">
-					 无上级
-				</el-form-item>  
+			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">   
 				<el-form-item label="迭代名称" prop="iterationName">
 					<el-input v-model="addForm.iterationName" placeholder="迭代名称" ></el-input>
 				</el-form-item> 
-				<el-form-item label="序号" prop="seqNo">
-					<el-input v-model="addForm.seqNo" placeholder="如1.0，2.0，1.1.1等" ></el-input> <span v-if="parentIteration" style="color:red;">建议：{{parentIteration.seqNo}}.1</span>
-				</el-form-item> 
 				<el-form-item label="开始时间" prop="startTime">
 					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.startTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
 				</el-form-item> 
@@ -59,7 +50,7 @@
 		      'userInfo','roles'
 		    ])
 		},
-		props:['xmIteration','visible','parentIteration'],
+		props:['xmIteration','visible','parentIteration','selProject','xmProduct'],
 		watch: {
 	      'xmIteration':function( xmIteration ) {
 	        this.addForm = xmIteration;
@@ -112,22 +103,25 @@
 				this.$emit('cancel');
 			},
 			//新增提交XmIteration 迭代定义 父组件监听@submit="afterAddSubmit"
-			addSubmit: function () {
-				if(!this.roles.some(i=>i.roleid=='iterationAdmin')){
-					this.$notify({showClose: true, message: "只有迭代管理员可以修改迭代", type:  'error' }); 
-					return ;
-				}
+			addSubmit: function () { 
 				this.$refs.addForm.validate((valid) => {
-					if (valid) {
+					if (valid) { 
+						var links=[];
+						if(this.xmProduct){
+							 links.push({proId:this.xmProduct.id,ltype:'1'})
+						}
 						
+						if(this.selProject){
+							 links.push({proId:this.selProject.id,ltype:'0'})
+						}
+						var params={...this.addForm}
+						params.links=links;
 						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
-							this.load.add=true
-							let params = Object.assign({}, this.addForm); 
+							this.load.add=true 
 							addXmIteration(params).then((res) => {
 								this.load.add=false
 								var tips=res.data.tips;
-								if(tips.isOk){
-									this.$refs['addForm'].resetFields();
+								if(tips.isOk){ 
 									this.$emit('submit',res.data.data);//  @submit="afterAddSubmit"
 								}
 								this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 

src/views/xm/core/xmIterationLink/XmIterationLinkForProject.vue

@@ -3,6 +3,7 @@
 		<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-row>
 		<el-row style="padding-top:10px;">
 			<!--列表 XmIterationLink 迭代表与项目表的关联关系，一般由迭代管理员将迭代挂接到项目表-->
@@ -28,6 +29,11 @@
 			<el-drawer title="选择迭代" :visible.sync="iterationVisible"  size="50%"  append-to-body  :close-on-click-modal="false">
 				<xm-iteration-select @row-click="onIterationSelect"></xm-iteration-select>
 			</el-drawer> 
+			
+			<!--新增 XmIteration 迭代定义界面-->
+			<el-drawer title="新增迭代" :visible.sync="addFormVisible"  size="50%"  append-to-body  :close-on-click-modal="false">
+				<xm-iteration-add :xm-iteration="addForm" :sel-project="selProject" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-iteration-add>
+			</el-drawer>
 		</el-row>
 	</section>
 </template>
@@ -37,12 +43,13 @@
 	import config from '@/common/config';//全局公共库 
 	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
 	import { listXmIterationLinkWithProjectInfo,addXmIterationLink, delXmIterationLink, batchDelXmIterationLink } from '@/api/xm/core/xmIterationLink';
-	import  XmIterationLinkAdd from './XmIterationLinkAdd';//新增界面
-	import  XmIterationLinkEdit from './XmIterationLinkEdit';//修改界面
+ 
 	import { mapGetters } from 'vuex'
 	import XmProjectSelect from '../xmProject/XmProjectSelect.vue';
 	import XmIterationSelect from '../xmIteration/XmIterationSelect.vue';
 	
+	import  XmIterationAdd from '../xmIteration/XmIterationAdd';//新增界面
+	
 	export default { 
 		props:['xmIteration','selProject'],
 		watch:{
@@ -268,11 +275,10 @@
 			/**end 自定义函数请在上面加**/
 			
 		},//end methods
-		components: { 
-		    'xm-iteration-link-add':XmIterationLinkAdd,
-		    'xm-iteration-link-edit':XmIterationLinkEdit,
+		components: {  
 			XmProjectSelect,
 			XmIterationSelect,
+			XmIterationAdd,
 		},
 		mounted() { 
 			this.$nextTick(() => {