From 31f0f94cbe78ac291b8930ec9b53dcc1da7597c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Fri, 20 May 2022 01:19:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xm/core/xmTask/XmTaskAdd.vue | 33 ++++++++++--------- src/views/xm/core/xmTask/XmTaskEdit.vue | 18 +++------- .../xmTaskWorkload/XmTaskWorkloadEdit.vue | 23 +++++++++++-- .../xmTaskWorkload/XmTaskWorkloadRecord.vue | 28 ++++++++-------- 4 files changed, 55 insertions(+), 47 deletions(-) diff --git a/src/views/xm/core/xmTask/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue index 347eba0a..52d4f584 100644 --- a/src/views/xm/core/xmTask/XmTaskAdd.vue +++ b/src/views/xm/core/xmTask/XmTaskAdd.vue @@ -131,21 +131,6 @@ - - - - - {{addForm.productId}} - - - - - {{addForm.menuName}}     {{addForm.menuName?'更改':'设置'}}    - 查看需求 - - - - @@ -176,7 +161,22 @@ - + + + + + + {{addForm.productId}} + + + + + {{addForm.menuName}}     {{addForm.menuName?'更改':'设置'}}    + 查看需求 + + + + 是否需要结算 @@ -604,6 +604,7 @@ } this.addForm.id=null; + this.activateTabPaneName="1" }, toMenu(){ this.menuDetailVisible=true diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue index 066a4874..5462c7fe 100644 --- a/src/views/xm/core/xmTask/XmTaskEdit.vue +++ b/src/views/xm/core/xmTask/XmTaskEdit.vue @@ -64,10 +64,8 @@ - - - + + {{editForm.rate?editForm.rate:0}}% @@ -80,8 +78,7 @@ end-key="endTime" @change="onBudgetDateRangerChange" type="daterange" - :auto-default="false" - align="right" + :auto-default="false" unlink-panels range-separator="-" start-placeholder="开始日期" @@ -322,6 +319,7 @@ import XmMenuEdit from '../xmMenu/XmMenuEdit.vue'; this.editForm=Object.assign(this.editForm, this.xmTask); this.editFormBak=Object.assign({},this.editForm) this.setSkills() + this.activateTabPaneName="1" //从新打开页面时某些数据需要重新加载，可以在这里添加 } }, @@ -365,13 +363,7 @@ import XmMenuEdit from '../xmMenu/XmMenuEdit.vue'; selectTaskVisible:false, execUserVisible:false, groupUserSelectVisible:false, - execGroupUserSelectVisible:false, - budgetDateRanger: [ - util.formatDate(beginDate, "yyyy-MM-dd HH:mm:ss"), - util.formatDate(endDate, "yyyy-MM-dd HH:mm:ss") - ], - actDateRanger: [ - ], + execGroupUserSelectVisible:false, pickerOptions: util.getPickerOptions('datarange'), tagSelectVisible:false, subWorkItemNum:0, diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue index 97d46a56..3c962ff5 100644 --- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue +++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue @@ -8,12 +8,12 @@ - {{xmTask.budgetWorkload?xmTask.budgetWorkload:0}}  小时 + {{xmTask.budgetWorkload?xmTask.budgetWorkload:0}}  小时   >>   {{budgetWorkload}}  小时 - {{xmTask.actWorkload?xmTask.actWorkload:0}} 小时, {{xmTask.rate}}% + {{xmTask.actWorkload?xmTask.actWorkload:0}} 小时, {{xmTask.rate}}%   >>   {{rate}}%   @@ -98,6 +98,22 @@ }, computed: { ...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'], @@ -143,7 +159,7 @@ ] }, 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, maxTableHeight:300, @@ -155,6 +171,7 @@ }//end return },//end data methods: { + // 取消按钮点击 父组件监听@cancel="editFormVisible=false" 监听 handleCancel:function(){ this.$emit('cancel'); diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecord.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecord.vue index 13b4c428..1ace7b1b 100644 --- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecord.vue +++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecord.vue @@ -5,37 +5,35 @@ - - - + + - {{editForm.initWorkload?editForm.initWorkload:'0'}}  小时 - +  小时 + - +  小时 - + {{editForm.actWorkload?editForm.actWorkload:0}}   小时{{editForm.rate}}% - - - - - {{editForm.initWorkload?editForm.initWorkload:'0'}}  小时 - + + + +  小时 + - + {{editForm.budgetWorkload}}  小时 - + {{editForm.actWorkload?editForm.actWorkload:0}}   小时,{{editForm.rate}}%