From fa326d91c1e899a0f0fc860eaeb2c0aa7e276df0 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 14:04:28 +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/XmIterationEdit.vue   | 66 ++++++-------------
 .../xm/core/xmIteration/XmIterationInfo.vue   |  8 ++-
 .../core/xmIteration/XmIterationInfoRoute.vue |  9 ++-
 .../XmIterationOverviewComplex.vue            |  6 +-
 4 files changed, 39 insertions(+), 50 deletions(-)

diff --git a/src/views/xm/core/xmIteration/XmIterationEdit.vue b/src/views/xm/core/xmIteration/XmIterationEdit.vue
index 9213df42..42037062 100644
--- a/src/views/xm/core/xmIteration/XmIterationEdit.vue
+++ b/src/views/xm/core/xmIteration/XmIterationEdit.vue
@@ -1,15 +1,6 @@
 <template>
 	<section class="padding border">
-		
-		<el-row>
-			<el-steps :active="calcIterationCurrStep" simple finish-status="success">
- 				<el-step  v-for="(i,index) in dicts['iterationStatus']" :title="i.name" :key="index" @click.native.stop="editForm.iphase=i.id">
-					 <el-link slot="title" >
-						 {{i.name}} 
-					 </el-link>
-				</el-step> 
-			</el-steps>
-		</el-row>
+		 
 		<el-row style="padding-left:70px;">
 			 <font color="blue" style="text-align:center;">注意：请尽量在评审会阶段把需求明确，进入计划会后，不允许再添加需求进入迭代。原则上需求评审后需求只出不进。</font>
 		</el-row>
@@ -22,8 +13,14 @@
 				<el-form-item label="序号" prop="seqNo">
 					<el-input v-model="editForm.seqNo" placeholder="如1.0，2.0，1.1.1等"  @change="editSomeFields(editForm,'seqNo',$event)"></el-input>
 				</el-form-item> 
-				<el-form-item label="开始时间" prop="startTime">
-					<date-range start-key="startTime" end-key="endTime" v-model="editForm" placeholder="选择日期"   value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" @change="editSomeFields(editForm,'startTime',$event)"></date-range>
+				<el-form-item label="状态" prop="istatus">
+					
+					<el-select v-model="editForm.istatus" @change="editSomeFields(editForm,'istatus',$event)">
+					<el-option v-for="(item,index) in dicts['iterationStatus']" :key="index" :value="item.id" :label="item.name"></el-option>
+					</el-select>
+				</el-form-item> 
+				<el-form-item label="起止时间" prop="startTime">
+					<date-range :auto-default="false" start-key="startTime" end-key="endTime" v-model="editForm" placeholder="选择日期"   value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" @change="editSomeFields(editForm,'startTime',$event)"></date-range>
 				</el-form-item>  
 				<el-form-item label="上线时间" prop="onlineTime">
 					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.onlineTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" @change="editSomeFields(editForm,'onlineTime',$event)"></el-date-picker>
@@ -85,7 +82,7 @@
 	    },
 		data() {
 			return {
-				dicts:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{iterationStatus:[]},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				load:{ list: false, add: false, del: false, edit: false },//查询中...
 				editFormRules: { 
 					iterationName: [
@@ -113,36 +110,10 @@
 			handleCancel:function(){
 				this.$refs['editForm'].resetFields();
 				this.$emit('cancel');
-			},
-			//新增提交XmIteration 迭代定义 父组件监听@submit="afterAddSubmit"
-			editSubmit: function () {
-				if(!this.roles.some(i=>i.roleid=='iterationAdmin')){
-					this.$notify({position:'bottom-left',showClose:true,message: "只有迭代管理员可以修改迭代", type:  'error' }); 
-					return ;
-				}
-				this.$refs.editForm.validate((valid) => {
-					if (valid) {
-						
-						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
-							this.load.edit=true
-							let params = Object.assign({}, this.editForm); 
-							editXmIteration(params).then((res) => {
-								this.load.edit=false
-								var tips=res.data.tips;
-								if(tips.isOk){
-									this.$emit('submit');//  @submit="afterAddSubmit"
-								}
-								this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
-							}).catch( err  => this.load.edit=false);
-						});
-					}else{
-						this.$notify({position:'bottom-left',showClose:true,message: "表单验证不通过", type: 'error' }); 
-					}
-				});
-			},
+			}, 
 			/**begin 在下面加自定义方法,记得补上面的一个逗号**/
 			
-			onUserSelected: function(users) {  
+			onUserSelected: function(users) {   
 				if(users.length>1){
 					this.$notify.error("只能选一个人");
 					return;
@@ -159,8 +130,8 @@
 					params['adminUserid']=$event.userid 
 					params['adminUsername']=$event.username
 				}else if(fieldName=='startTime'){
-					params['adminUserid']=row.startTime
-					params['adminUsername']=row.endTime
+					params['startTime']=row.startTime
+					params['endTime']=row.endTime
 				}else{
 					params[fieldName]=$event
 				}
@@ -186,9 +157,12 @@
 			UsersSelect
 		},
 		mounted() { 
-			initDicts(this)
-			this.editForm=Object.assign(this.editForm, this.xmIteration);   
-			this.editFormBak={...this.editForm}
+			this.$nextTick(()=>{
+				initDicts(this)
+				this.editForm=Object.assign(this.editForm, this.xmIteration);   
+				this.editFormBak={...this.editForm}
+			})
+			
 			/**在下面写其它函数***/
 			
 		}//end mounted
diff --git a/src/views/xm/core/xmIteration/XmIterationInfo.vue b/src/views/xm/core/xmIteration/XmIterationInfo.vue
index e5ad95dc..c23ad985 100644
--- a/src/views/xm/core/xmIteration/XmIterationInfo.vue
+++ b/src/views/xm/core/xmIteration/XmIterationInfo.vue
@@ -323,6 +323,7 @@
           v-if="infotype == '迭代概览'"
 		  ref="迭代概览"
           :xm-iteration="xmIteration"
+		  @edit-fields="onEditFields"
         ></xm-iteration-overview-complex>
         <xm-project-complex
           v-if="infotype == '项目'"
@@ -742,6 +743,7 @@ export default {
 			let tips = res.data.tips;
 			if(tips.isOk){
 			  Object.assign(row,params)
+			  this.$emit('edit-fields',params)
 			}else{ 
 				this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
 			}
@@ -752,7 +754,11 @@ export default {
 	},
 	showIterationDetail(){
 		this.$refs['迭代概览'].showPanelName='detail'
-	}
+	},
+    onEditFields(row){
+      Object.assign(this.xmIteration,row)
+      this.$emit('edit-fields',row)
+    }
   }, //end methods
   components: {
     xmTaskMng,
diff --git a/src/views/xm/core/xmIteration/XmIterationInfoRoute.vue b/src/views/xm/core/xmIteration/XmIterationInfoRoute.vue
index d615c1ec..40b6328b 100644
--- a/src/views/xm/core/xmIteration/XmIterationInfoRoute.vue
+++ b/src/views/xm/core/xmIteration/XmIterationInfoRoute.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-		 <xm-iteration-info v-if="xmIteration" :xm-iteration="xmIteration" :visible="showInfo"></xm-iteration-info>
+		 <xm-iteration-info v-if="xmIteration" :xm-iteration="xmIteration" :visible="showInfo" @edit-fields="onEditFields"></xm-iteration-info>
 	</section>
 </template>
 
@@ -55,7 +55,12 @@
 
 					 }
 				 })
-			 }
+			 },
+			onEditFields(row){
+				debugger;
+				Object.assign(this.xmIteration,row)
+				localStorage.setItem("xm-iteration-info-route",JSON.stringify(this.xmIteration)); 
+			}
 			 
 			
 		},//end methods
diff --git a/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue b/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue
index 261e6baa..eeee2b57 100644
--- a/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue
+++ b/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue
@@ -25,7 +25,7 @@
         -->
       </el-menu> 
        <xm-iteration-overview class="padding-top" v-if="showPanelName=='overview'" :xm-iteration="xmIteration"></xm-iteration-overview>
-        <xm-iteration-edit v-if="showPanelName=='detail'" :xm-iteration="xmIteration"></xm-iteration-edit>
+        <xm-iteration-edit v-if="showPanelName=='detail'" :xm-iteration="xmIteration" @edit-fields="onEditFields"></xm-iteration-edit>
       <xm-iteration-link-for-product  v-if="showPanelName=='iterationProductLink'" :xm-iteration="xmIteration"></xm-iteration-link-for-product>
       <xm-iteration-link-for-project  v-if="showPanelName=='iterationProjectLink'" :xm-iteration="xmIteration"></xm-iteration-link-for-project>
       <xm-iteration-menu-mng v-if="showPanelName=='iterationMenuMng'" :xm-iteration="xmIteration"  ref="iterationMenuMng"></xm-iteration-menu-mng>
@@ -82,6 +82,10 @@ export default {
 			},
     onMenuToolBarSelect(menuIndex){
       this.showPanelName=menuIndex;
+    },
+    onEditFields(row){
+      Object.assign(this.xmIteration,row)
+      this.$emit('edit-fields',row)
     }
   },