From 109d059811ecd3e0c166f8a9ef3ec6bc30ee1575 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 15 Mar 2022 11:59:53 +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   | 38 +++++++++++++++----
 .../core/xmIteration/XmIterationOverview.vue  | 29 ++++++++++----
 2 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/src/views/xm/core/xmIteration/XmIterationEdit.vue b/src/views/xm/core/xmIteration/XmIterationEdit.vue
index 042a1b9b..4e164dcc 100644
--- a/src/views/xm/core/xmIteration/XmIterationEdit.vue
+++ b/src/views/xm/core/xmIteration/XmIterationEdit.vue
@@ -1,5 +1,15 @@
 <template>
 	<section class="page-container  padding border">
+		
+		<el-row class="padding-header">
+			<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>
 			<!--新增界面 XmIteration 迭代定义--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">  
@@ -19,14 +29,13 @@
 					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.onlineTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
 				</el-form-item>   
 				<el-form-item label="负责人姓名" prop="adminUsername">
-					{{editForm.adminUsername}} <el-button @click="userSelectVisible=true">选择负责人</el-button>
+					{{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="预算工作量"></el-input> 人时 ，1人工作1日=8人时
 				</el-form-item>    
 				<el-form-item>
-					<el-col :span="24" :offset="8"> 
-						<el-button @click.native="handleCancel">取消</el-button>  
+					<el-col :span="24" :offset="8">  
 						<el-button v-loading="load.edit" type="primary" @click.native="editSubmit" :disabled="load.edit==true">提交</el-button>  
 					</el-col>
 				</el-form-item> 
@@ -51,7 +60,20 @@
 		computed: {
 		    ...mapGetters([
 		      'userInfo','roles'
-		    ])
+		    ]),
+			calcIterationCurrStep(){
+				var istatus= this.dicts.iterationStatus
+				if(!istatus){
+					return 1;
+				}else{
+					var status=istatus.findIndex(i=>this.editForm.iphase==i.id)
+					if(status>=0){
+						return status+1;
+					}else{
+						return 1;
+					}
+				}
+			} 
 		},
 		props:['xmIteration','visible'],
 		watch: {
@@ -77,7 +99,7 @@
 				},
 				//新增界面数据 迭代定义
 				editForm: {
-					id:'',branchId:'',iterationName:'',startTime:'',endTime:'',onlineTime:'',pid:'',adminUserid:'',adminUsername:'',ctime:'',budgetCost:'',budgetWorkload:'',distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',seqNo:'',
+					id:'',branchId:'',iterationName:'',startTime:'',endTime:'',onlineTime:'',pid:'',adminUserid:'',adminUsername:'',ctime:'',budgetCost:'',budgetWorkload:'',distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',seqNo:'',iphase:'0'
 				},
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				userSelectVisible:false,
@@ -134,8 +156,10 @@
 			//在下面添加其它组件 'xm-iteration-edit':XmIterationEdit
 			UsersSelect
 		},
-		mounted() {
-
+		mounted() { 
+			initSimpleDicts('all',['iterationStatus'] ).then(res=>{
+			this.dicts=res.data.data;
+			})
 			this.editForm=Object.assign(this.editForm, this.xmIteration);   
 			/**在下面写其它函数***/
 			
diff --git a/src/views/xm/core/xmIteration/XmIterationOverview.vue b/src/views/xm/core/xmIteration/XmIterationOverview.vue
index 4769b7a9..17f69933 100644
--- a/src/views/xm/core/xmIteration/XmIterationOverview.vue
+++ b/src/views/xm/core/xmIteration/XmIterationOverview.vue
@@ -5,14 +5,8 @@
         <el-card class="box-card" style="padding:0px ;height:100px">
           <div>
             <el-row style="padding:10px">
-              <el-steps :active="this.xmIteration.iphase+1" align-center finish-status="success">
-                <el-step title="未开始"></el-step>
-                <el-step title="需求评审"></el-step>
-                <el-step title="计划会"></el-step>
-                <el-step title="研发中"></el-step>
-                <el-step title="测试中"></el-step>
-                <el-step title="迭代上线"></el-step>
-                <el-step title="已完成"></el-step>
+              <el-steps :active="calcIterationCurrStep" align-center finish-status="success">
+                <el-step :title="item.name" v-for="(item,index) in dicts['iterationStatus']" :key="index"></el-step> 
               </el-steps>
             </el-row>
           </div>
@@ -245,6 +239,7 @@
 
 <script>
 import util from "@/common/js/util"; // 全局公共库
+import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 import { mapGetters } from "vuex";
 
 export default {
@@ -303,6 +298,19 @@ export default {
     xmIterationStateCpd(){
       return this.xmIteration
     },
+    calcIterationCurrStep(){
+				var istatus= this.dicts.iterationStatus
+				if(!istatus){
+					return 1;
+				}else{
+					var status=istatus.findIndex(i=>this.xmIteration.iphase==i.id)
+					if(status>=0){
+						return status+1;
+					}else{
+						return 1;
+					}
+				}
+			} 
   },
 
   props:['xmIteration'],
@@ -318,6 +326,7 @@ export default {
     return {
       isActive: true,
       maxTableHeight:300,
+      dicts:{},
       };
   },
 
@@ -574,6 +583,10 @@ export default {
   },
 
   mounted() {
+    
+    initSimpleDicts('all',['iterationStatus'] ).then(res=>{
+      this.dicts=res.data.data;
+    })
     this.$nextTick(() => { 
       this.maxTableHeight=util.calcTableMaxHeight(this.$refs.table.$el)
     });