Browse Source

优化

master
陈裕财 4 years ago
parent
commit
109d059811
  1. 38
      src/views/xm/core/xmIteration/XmIterationEdit.vue
  2. 29
      src/views/xm/core/xmIteration/XmIterationOverview.vue

38
src/views/xm/core/xmIteration/XmIterationEdit.vue

@ -1,5 +1,15 @@
<template> <template>
<section class="page-container padding border"> <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> <el-row>
<!--新增界面 XmIteration 迭代定义--> <!--新增界面 XmIteration 迭代定义-->
<el-form :model="editForm" label-width="120px" :rules="editFormRules" ref="editForm"> <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-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>
<el-form-item label="负责人姓名" prop="adminUsername"> <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>
<el-form-item label="预算工作量" prop="budgetWorkload"> <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-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-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-button v-loading="load.edit" type="primary" @click.native="editSubmit" :disabled="load.edit==true">提交</el-button>
</el-col> </el-col>
</el-form-item> </el-form-item>
@ -51,7 +60,20 @@
computed: { computed: {
...mapGetters([ ...mapGetters([
'userInfo','roles' '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'], props:['xmIteration','visible'],
watch: { watch: {
@ -77,7 +99,7 @@
}, },
// //
editForm: { 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 在下面加自定义属性,记得补上面的一个逗号**/ /**begin 在下面加自定义属性,记得补上面的一个逗号**/
userSelectVisible:false, userSelectVisible:false,
@ -134,8 +156,10 @@
// 'xm-iteration-edit':XmIterationEdit // 'xm-iteration-edit':XmIterationEdit
UsersSelect UsersSelect
}, },
mounted() {
mounted() {
initSimpleDicts('all',['iterationStatus'] ).then(res=>{
this.dicts=res.data.data;
})
this.editForm=Object.assign(this.editForm, this.xmIteration); this.editForm=Object.assign(this.editForm, this.xmIteration);
/**在下面写其它函数***/ /**在下面写其它函数***/

29
src/views/xm/core/xmIteration/XmIterationOverview.vue

@ -5,14 +5,8 @@
<el-card class="box-card" style="padding:0px ;height:100px"> <el-card class="box-card" style="padding:0px ;height:100px">
<div> <div>
<el-row style="padding:10px"> <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-steps>
</el-row> </el-row>
</div> </div>
@ -245,6 +239,7 @@
<script> <script>
import util from "@/common/js/util"; // import util from "@/common/js/util"; //
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
export default { export default {
@ -303,6 +298,19 @@ export default {
xmIterationStateCpd(){ xmIterationStateCpd(){
return this.xmIteration 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'], props:['xmIteration'],
@ -318,6 +326,7 @@ export default {
return { return {
isActive: true, isActive: true,
maxTableHeight:300, maxTableHeight:300,
dicts:{},
}; };
}, },
@ -574,6 +583,10 @@ export default {
}, },
mounted() { mounted() {
initSimpleDicts('all',['iterationStatus'] ).then(res=>{
this.dicts=res.data.data;
})
this.$nextTick(() => { this.$nextTick(() => {
this.maxTableHeight=util.calcTableMaxHeight(this.$refs.table.$el) this.maxTableHeight=util.calcTableMaxHeight(this.$refs.table.$el)
}); });

Loading…
Cancel
Save