From aa46020f14f5e33a20f7239817e84e5458cf8b06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 11 Jul 2022 23:34:50 +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

---
 .../xm/core/xmIteration/XmIterationAdd.vue    | 30 +++++++++----------
 .../xm/core/xmIteration/XmIterationEdit.vue   |  7 ++---
 .../xmIteration/XmIterationForLinkComplex.vue | 17 +++++------
 3 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/src/views/xm/core/xmIteration/XmIterationAdd.vue b/src/views/xm/core/xmIteration/XmIterationAdd.vue
index e824e791..fe76c797 100644
--- a/src/views/xm/core/xmIteration/XmIterationAdd.vue
+++ b/src/views/xm/core/xmIteration/XmIterationAdd.vue
@@ -1,5 +1,5 @@
 <template>
-	<section class="page-container  padding border">
+	<section class="padding border">
 		<el-row>
 			<!--新增界面 XmIteration 迭代定义--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">   
@@ -11,22 +11,16 @@
 				<el-form-item label="迭代名称" prop="iterationName">
 					<el-input v-model="addForm.iterationName" placeholder="迭代名称" minlength="10"></el-input>
 					<font color="blue">格式如下： 上线日期+主题+V版本号 例如： 2021.6.15购书商城V1.0.9 &nbsp;&nbsp;留空，选日期后自动填写迭代名称</font>
-				</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> 
-				<el-form-item label="结束时间" prop="endTime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.endTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
+				</el-form-item>  
+				<el-form-item label="起止时间" prop="startTime">
+					<date-range :auto-default="true" start-key="startTime" end-key="endTime" v-model="addForm" placeholder="选择日期"   value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" ></date-range>
+				</el-form-item>   
 				<el-form-item label="上线时间" prop="onlineTime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.onlineTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
+					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.onlineTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" @change="editSomeFields(editForm,'onlineTime',$event)"></el-date-picker>
 				</el-form-item>   
 				<el-form-item label="负责人姓名" prop="adminUsername">
 					{{addForm.adminUsername}} <el-button @click="userSelectVisible=true">选择负责人</el-button>
-				</el-form-item>  
-				<el-form-item label="预算工作量" prop="budgetWorkload">
-					<el-input v-model="addForm.budgetWorkload" type="number" style="width:60%;" min="0" placeholder="预算工作量"></el-input> 人时 ，1人工作1日=8人时
-				</el-form-item>    
+				</el-form-item>     
 				<el-form-item>
 					<el-col :span="24" :offset="8"> 
 						<el-button @click.native="handleCancel">取消</el-button>  
@@ -75,7 +69,7 @@
 				}
 	      	}
 	      },
-		  'addForm.endTime':function(val){
+		  'addForm.onlineTime':function(val){
 			  if(!val){
 				  return;
 			  }
@@ -104,7 +98,13 @@
 					], 
 					productId: [
 						{ required: true, message: '产品编号不能为空', trigger: 'change' }
-					]
+					], 
+					onlineTime: [
+						{ required: true, message: '上线时间不能为空', trigger: 'change' }
+					],
+					startTime:[ 
+						{ required: true, message: '开始时间不能为空', trigger: 'change' }
+					],
 				},
 				//新增界面数据 迭代定义,
 				addForm: {
diff --git a/src/views/xm/core/xmIteration/XmIterationEdit.vue b/src/views/xm/core/xmIteration/XmIterationEdit.vue
index 42037062..62727088 100644
--- a/src/views/xm/core/xmIteration/XmIterationEdit.vue
+++ b/src/views/xm/core/xmIteration/XmIterationEdit.vue
@@ -2,7 +2,7 @@
 	<section class="padding border">
 		 
 		<el-row style="padding-left:70px;">
-			 <font color="blue" style="text-align:center;">注意：请尽量在评审会阶段把需求明确，进入计划会后，不允许再添加需求进入迭代。原则上需求评审后需求只出不进。</font>
+			 <font color="blue" style="text-align:center;">注意：请尽量在评审会阶段把需求明确.<br/>进入计划会后，不允许再添加需求进入迭代。原则上需求评审后需求只出不进。</font>
 		</el-row>
 		<el-row>
 			<!--新增界面 XmIteration 迭代定义--> 
@@ -27,10 +27,7 @@
 				</el-form-item>   
 				<el-form-item label="负责人姓名" prop="adminUsername">
 					{{editForm.adminUsername}} <el-button type="text" @click="userSelectVisible=true">选择负责人</el-button>
-				</el-form-item>  
-				<el-form-item label="预算工作量" prop="budgetWorkload">
-					<el-input v-model="editForm.budgetWorkload" type="number" min="0" style="width:60%;" placeholder="预算工作量" @change="editSomeFields(editForm,'budgetWorkload',$event)"></el-input> 人时 ，1人工作1日=8人时
-				</el-form-item>     
+				</el-form-item>      
 			</el-form>
 		</el-row>
 		
diff --git a/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue b/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue
index 46999882..40ad22c3 100644
--- a/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue
+++ b/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue
@@ -6,16 +6,9 @@
 					<el-col :span="20">
 						<xm-iteration-select ref="xmIterationSelect" :auto-select="true" :link-project-id="selProject?selProject.id:null" :product-id="xmProduct?xmProduct.id:null"  @row-click="onIterationRowClick" @clear="onIterationClearSelect"></xm-iteration-select>
  					</el-col>
-					<el-col :span="4">
-						<el-popover
-							placement="bottom"
-							width="800"
-							v-model="iterationAddVisible"
-							trigger="manual">  
-									<xm-iteration-add  :xm-product="xmProduct" :sel-project="selProject" :visible="iterationAddVisible" @cancel="iterationAddVisible=false" @submit="afterIterationAddSubmit"></xm-iteration-add>
-							<el-link type="warning" slot="reference" @click="iterationAddVisible=true" icon="el-icon-plus">迭代</el-link> 
-						</el-popover> 
-					</el-col>
+					<el-col :span="4">  
+ 							<el-link type="warning" @click="iterationAddVisible=true" icon="el-icon-plus">迭代</el-link> 
+ 					</el-col>
  				 </el-row> 
 				<el-row ref="pageMainRef" class="padding border" :style="{ maxHeight: maxTableHeight + 'px', overflowY: 'auto' }"> 
 								<h4 class="padding-bottom">迭代常用功能快捷导航</h4>
@@ -315,6 +308,10 @@
 			</el-col>
 
 		</el-row>
+		
+		<el-dialog  width="60%" top="20px" :visible.sync="iterationAddVisible" append-to-body>  
+					<xm-iteration-add  :xm-product="xmProduct" :sel-project="selProject" :visible="iterationAddVisible" @cancel="iterationAddVisible=false" @submit="afterIterationAddSubmit"></xm-iteration-add>
+ 		</el-dialog> 
 	</section>
 </template>