end7less
/
program_xm_vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化任务

master
陈裕财 4 years ago
parent
90a123e297
commit
31f0f94cbe
4 changed files with 55 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 31
      src/views/xm/core/xmTask/XmTaskAdd.vue
  2. 12
      src/views/xm/core/xmTask/XmTaskEdit.vue
  3. 23
      src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue
  4. 22
      src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecord.vue

31
src/views/xm/core/xmTask/XmTaskAdd.vue
View File

@ -131,21 +131,6 @@
<el-input type="textarea" :autosize="{ minRows: 6, maxRows: 20}" v-model="addForm.description" placeholder="什么人？做什么事？，为什么？如： 作为招聘专员，我需要统计员工半年在职/离职人数，以便我能够制定招聘计划" ></el-input> <el-input type="textarea" :autosize="{ minRows: 6, maxRows: 20}" v-model="addForm.description" placeholder="什么人？做什么事？，为什么？如： 作为招聘专员，我需要统计员工半年在职/离职人数，以便我能够制定招聘计划" ></el-input>
</el-form-item> </el-form-item>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="需求" name="3">
<el-row v-if="addForm.ntype==='0'">
<el-col :span="12">
<el-form-item label="归属产品" prop="productId">
{{addForm.productId}}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="用户故事" prop="menuId" id="menuInfo" v-if="addForm.ntype!='1'">
{{addForm.menuName}} &nbsp;&nbsp;&nbsp; <el-link @click="menuVisible=true" type="primary">{{addForm.menuName?'更改':'设置'}}</el-link>&nbsp;&nbsp;&nbsp;
<el-link v-if="addForm.menuName" @click="toMenu" type="primary">查看需求</el-link>
</el-form-item>
</el-col>
</el-row>
</el-tab-pane>
<el-tab-pane label="工时" name="5"> <el-tab-pane label="工时" name="5">
<el-form-item label="报工方式" prop="wtype" > <el-form-item label="报工方式" prop="wtype" >
<el-select v-model="addForm.wtype"> <el-select v-model="addForm.wtype">
@ -177,6 +162,21 @@
</el-form-item> </el-form-item>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="需求" name="3" v-if="addForm.ntype!='1'">
<el-row>
<el-col :span="12">
<el-form-item label="归属产品" prop="productId">
{{addForm.productId}}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="用户故事" prop="menuId" id="menuInfo" v-if="addForm.ntype!='1'">
{{addForm.menuName}} &nbsp;&nbsp;&nbsp; <el-link @click="menuVisible=true" type="primary">{{addForm.menuName?'更改':'设置'}}</el-link>&nbsp;&nbsp;&nbsp;
<el-link v-if="addForm.menuName" @click="toMenu" type="primary">查看需求</el-link>
</el-form-item>
</el-col>
</el-row>
</el-tab-pane>
<el-tab-pane label="结算信息" name="7" v-if="addForm.ntype!='1'"> <el-tab-pane label="结算信息" name="7" v-if="addForm.ntype!='1'">
<el-form-item label="" prop="taskClass"> <el-form-item label="" prop="taskClass">
<el-checkbox v-model="addForm.taskClass" true-label="1" false-label="0">是否需要结算</el-checkbox> <el-checkbox v-model="addForm.taskClass" true-label="1" false-label="0">是否需要结算</el-checkbox>
@ -604,6 +604,7 @@
} }
this.addForm.id=null; this.addForm.id=null;
this.activateTabPaneName="1"
}, },
toMenu(){ toMenu(){
this.menuDetailVisible=true this.menuDetailVisible=true

12
src/views/xm/core/xmTask/XmTaskEdit.vue
View File

@ -65,9 +65,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="当前进度" prop="rate"> <el-form-item label="当前进度" prop="rate">
<el-progress
:percentage="editForm.rate?editForm.rate:0">
</el-progress>
{{editForm.rate?editForm.rate:0}}%
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -81,7 +79,6 @@
@change="onBudgetDateRangerChange" @change="onBudgetDateRangerChange"
type="daterange" type="daterange"
:auto-default="false" :auto-default="false"
align="right"
unlink-panels unlink-panels
range-separator="-" range-separator="-"
start-placeholder="开始日期" start-placeholder="开始日期"
@ -322,6 +319,7 @@ import XmMenuEdit from '../xmMenu/XmMenuEdit.vue';
this.editForm=Object.assign(this.editForm, this.xmTask); this.editForm=Object.assign(this.editForm, this.xmTask);
this.editFormBak=Object.assign({},this.editForm) this.editFormBak=Object.assign({},this.editForm)
this.setSkills() this.setSkills()
this.activateTabPaneName="1"
//从新打开页面时某些数据需要重新加载，可以在这里添加 //从新打开页面时某些数据需要重新加载，可以在这里添加
} }
}, },
@ -366,12 +364,6 @@ import XmMenuEdit from '../xmMenu/XmMenuEdit.vue';
execUserVisible:false, execUserVisible:false,
groupUserSelectVisible:false, groupUserSelectVisible:false,
execGroupUserSelectVisible:false, execGroupUserSelectVisible:false,
budgetDateRanger: [
util.formatDate(beginDate, "yyyy-MM-dd HH:mm:ss"),
util.formatDate(endDate, "yyyy-MM-dd HH:mm:ss")
],
actDateRanger: [
],
pickerOptions: util.getPickerOptions('datarange'), pickerOptions: util.getPickerOptions('datarange'),
tagSelectVisible:false, tagSelectVisible:false,
subWorkItemNum:0, subWorkItemNum:0,

23
src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue
View File

@ -8,12 +8,12 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="预估工时" prop="budgetWorkload"> <el-form-item label="预估工时" prop="budgetWorkload">
{{xmTask.budgetWorkload?xmTask.budgetWorkload:0}}&nbsp;&nbsp;小时
{{xmTask.budgetWorkload?xmTask.budgetWorkload:0}}&nbsp;&nbsp;小时 <font color="red"> &nbsp;&nbsp;>>&nbsp; &nbsp;{{budgetWorkload}} &nbsp;小时</font>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="已登工时" prop="actWorkload"> <el-form-item label="已登工时" prop="actWorkload">
{{xmTask.actWorkload?xmTask.actWorkload:0}}&nbsp;小时, <el-tag type="primary"> {{xmTask.rate}}% </el-tag>
{{xmTask.actWorkload?xmTask.actWorkload:0}}&nbsp;小时, <el-tag type="primary"> {{xmTask.rate}}% </el-tag><el-tag type="danger">&nbsp;&nbsp;>>&nbsp; &nbsp;{{rate}}% &nbsp;</el-tag>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -99,6 +99,22 @@
computed: { computed: {
...mapGetters([ 'userInfo' ]), ...mapGetters([ 'userInfo' ]),
budgetWorkload(){
if(this.editForm.rworkload>0){
return parseFloat(this.editForm.rworkload)+parseFloat(this.editForm.workload?this.editForm.workload:0)+parseFloat(this.xmTask.actWorkload?this.xmTask.actWorkload:0)
}else{
return this.xmTask.budgetWorkload;
}
},
rate(){
if(this.editForm.rworkload>0){
return Math.round((parseFloat(this.editForm.workload?this.editForm.workload:0)+parseFloat(this.xmTask.actWorkload?this.xmTask.actWorkload:0))/(parseFloat(this.editForm.rworkload)+parseFloat(this.editForm.workload?this.editForm.workload:0)+parseFloat(this.xmTask.actWorkload?this.xmTask.actWorkload:0))*100)
}else{
return Math.round((parseFloat(this.editForm.workload?this.editForm.workload:0)+parseFloat(this.xmTask.actWorkload?this.xmTask.actWorkload:0))/this.xmTask.budgetWorkload *100);
}
},
}, },
props:['xmTask','xmTaskWorkload','visible','opType'], props:['xmTask','xmTaskWorkload','visible','opType'],
@ -143,7 +159,7 @@
] ]
}, },
editForm: { editForm: {
userid:'',username:'',ctime:'',taskId:'',cuserid:'',bizDate:'',wstatus:'',remark:'',ttype:'',id:'',sbillId:'',stime:'',sstatus:'',amt:'',samt:'',workload:''
userid:'',username:'',ctime:'',taskId:'',cuserid:'',bizDate:'',wstatus:'',remark:'',ttype:'',id:'',sbillId:'',stime:'',sstatus:'',amt:'',samt:'',workload:'',rwokkload:''
}, },
rwokkload:0, rwokkload:0,
maxTableHeight:300, maxTableHeight:300,
@ -155,6 +171,7 @@
}//end return }//end return
},//end data },//end data
methods: { methods: {
// 取消按钮点击 父组件监听@cancel="editFormVisible=false" 监听 // 取消按钮点击 父组件监听@cancel="editFormVisible=false" 监听
handleCancel:function(){ handleCancel:function(){
this.$emit('cancel'); this.$emit('cancel');

22
src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecord.vue
View File

@ -6,36 +6,34 @@
<!--编辑界面 XmTaskWorkload 工时登记表--> <!--编辑界面 XmTaskWorkload 工时登记表-->
<el-form :model="editForm" label-width="100px" :rules="editFormRules" ref="editFormRef"> <el-form :model="editForm" label-width="100px" :rules="editFormRules" ref="editFormRef">
<el-row v-if="editForm.ntype==='0'"> <el-row v-if="editForm.ntype==='0'">
<el-col :span="6">
<el-col :span="8">
<el-form-item label="原估工时" prop="initWorkload"> <el-form-item label="原估工时" prop="initWorkload">
{{editForm.initWorkload?editForm.initWorkload:'0'}} &nbsp;小时
<el-input :controls="false" type="number" :step="8" style="width:80%;" v-model="editForm.initWorkload" placeholder="原估工时" @change="editXmTaskSomeFields(editForm,'initWorkload',$event)"></el-input> &nbsp;小时
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="预估工时" prop="budgetWorkload"> <el-form-item label="预估工时" prop="budgetWorkload">
<el-input :controls="false" type="number" :step="8" style="width:80%;" v-model="editForm.budgetWorkload" placeholder="预估工时" @change="editXmTaskSomeFields(editForm,'budgetWorkload',$event)"></el-input> &nbsp;小时 <el-input :controls="false" type="number" :step="8" style="width:80%;" v-model="editForm.budgetWorkload" placeholder="预估工时" @change="editXmTaskSomeFields(editForm,'budgetWorkload',$event)"></el-input> &nbsp;小时
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="已登工时" prop="actWorkload"> <el-form-item label="已登工时" prop="actWorkload">
{{editForm.actWorkload?editForm.actWorkload:0}} &nbsp; 小时<el-tag type="primary">{{editForm.rate}}%</el-tag> {{editForm.actWorkload?editForm.actWorkload:0}} &nbsp; 小时<el-tag type="primary">{{editForm.rate}}%</el-tag>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-else> <el-row v-else>
<el-col :span="6">
<el-form-item label="原估工时" prop="initWorkload">
{{editForm.initWorkload?editForm.initWorkload:'0'}} &nbsp;小时
</el-form-item>
<el-col :span="8">
<el-form-item label="原估工时" prop="initWorkload">
<el-input :controls="false" type="number" :step="8" style="width:80%;" v-model="editForm.initWorkload" placeholder="原估工时" @change="editXmTaskSomeFields(editForm,'initWorkload',$event)"></el-input> &nbsp;小时
</el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="预估工时" prop="budgetWorkload"> <el-form-item label="预估工时" prop="budgetWorkload">
{{editForm.budgetWorkload}} &nbsp;小时 {{editForm.budgetWorkload}} &nbsp;小时
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="已登工时" prop="actWorkload"> <el-form-item label="已登工时" prop="actWorkload">
{{editForm.actWorkload?editForm.actWorkload:0}} &nbsp; 小时,<el-tag type="primary">{{editForm.rate}}%</el-tag> {{editForm.actWorkload?editForm.actWorkload:0}} &nbsp; 小时,<el-tag type="primary">{{editForm.rate}}%</el-tag>
</el-form-item> </el-form-item>

Write Preview
Loading…
Cancel
Save