diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue index 57f16080..04d833f4 100644 --- a/src/views/xm/core/xmMenu/XmMenuEdit.vue +++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue @@ -218,6 +218,11 @@ 元 + + + + + @@ -617,6 +622,7 @@ ArchiveEdit, XmTestCaseMng,MdpSelectUserXm, 'xm-menu-edit':()=>import("./XmMenuDetail"), + 'xm-workload-record':()=>import("../xmWorkload/XmWorkloadRecord"), XmEpicFeaturesSelect, }, mounted() { diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue index 782900f7..43ca55c4 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue @@ -141,7 +141,11 @@ 保存 - + + + + + @@ -645,7 +649,8 @@ //在下面添加其它组件 'xm-question-edit':XmQuestionEdit 'upload': AttachmentUpload,XmGroupMng,VueEditor,XmTaskList,xmMenuSelect,XmQuestionHandleMng,TagMng,XmProjectSelect, XmMyDoFocus,XmFuncSelect,MdpSelectUserXm,TestStepConfig,TestStepResult, - xmTestPlanCaseMng:()=>import('../xmTestPlanCase/XmTestPlanCaseMng') + xmTestPlanCaseMng:()=>import('../xmTestPlanCase/XmTestPlanCaseMng'), + 'xm-workload-record':()=>import("../xmWorkload/XmWorkloadRecord"), }, mounted() { this.initData(); diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue index 0f4793f4..ab3b27bf 100644 --- a/src/views/xm/core/xmTask/XmTaskEdit.vue +++ b/src/views/xm/core/xmTask/XmTaskEdit.vue @@ -998,6 +998,7 @@ xmSkillMng, skillMng,xmMenuSelect,XmTaskList,XmExecuserMng,XmGroupSelect,XmMenuRichDetail,TagMng,XmSubWorkItem,XmWorkloadRecord,XmMenuEdit, XmRecord,xmQuestionMng,XmMyDoFocus,XmTaskExecuserForTask,XmPhaseSelect,ToPay,MdpSelectUserXm,'xm-task-edit':()=>import("./XmTaskDetail"), + 'xm-workload-record':()=>import("../xmWorkload/XmWorkloadRecord"), //在下面添加其它组件 'xm-task-edit':XmTaskEdit }, mounted() { diff --git a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue index 8b323f66..80586dd4 100644 --- a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue +++ b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue @@ -87,6 +87,10 @@ + + + + @@ -138,7 +142,8 @@ import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修 components: { XmMenuSelect,XmFuncSelect,MyInput,TestStepConfig,XmQuestionMng,XmTestPlanCaseMng,MdpSelectUserXm, XmMenuEdit:()=>import("../xmMenu/XmMenuDetail"), - XmTestCasedbMng:()=>import('../xmTestCasedb/XmTestCasedbMng') + XmTestCasedbMng:()=>import('../xmTestCasedb/XmTestCasedbMng'), + 'xm-workload-record':()=>import("../xmWorkload/XmWorkloadRecord"), }, computed: { ...mapGetters([ 'userInfo' ]), diff --git a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue index 11babc0a..2de21d19 100644 --- a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue +++ b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue @@ -132,6 +132,10 @@ + + + + @@ -184,6 +188,7 @@ import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修 name:'xmTestPlanCaseEdit', components: { TestStepResult,MyInput,XmMenuEdit:()=>import('../xmMenu/XmMenuEdit.vue'),XmQuestionMng,XmQuestionAdd,MdpSelectUserXm, + 'xm-workload-record':()=>import("../xmWorkload/XmWorkloadRecord"), }, computed: { diff --git a/src/views/xm/core/xmWorkload/XmWorkloadEdit.vue b/src/views/xm/core/xmWorkload/XmWorkloadEdit.vue index c0320b61..e1bc3730 100644 --- a/src/views/xm/core/xmWorkload/XmWorkloadEdit.vue +++ b/src/views/xm/core/xmWorkload/XmWorkloadEdit.vue @@ -6,12 +6,12 @@ - {{xmTask.budgetWorkload?xmTask.budgetWorkload:0}}  小时   >>   {{budgetWorkload}}  小时 + {{val.budgetWorkload?val.budgetWorkload:0}}  小时   >>   {{budgetWorkload}}  小时 - {{xmTask.actWorkload?xmTask.actWorkload:0}} 小时, {{xmTask.rate}}%   >>   {{rate}}%   + {{val.actWorkload?val.actWorkload:0}} 小时, {{val.rate}}%   >>   {{rate}}%   @@ -45,7 +45,7 @@ - {{xmTask.executorUsername}} + {{val.executorUsername}} @@ -88,7 +88,7 @@ - + @@ -113,19 +113,65 @@ budgetWorkload(){ if(this.editForm.rworkload!=null && this.editForm.rworkload!="" && 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) + return parseFloat(this.editForm.rworkload)+parseFloat(this.editForm.workload?this.editForm.workload:0)+parseFloat(this.val.actWorkload?this.val.actWorkload:0) }else{ - return this.xmTask.budgetWorkload; + return this.val.budgetWorkload; } }, rate(){ if(this.editForm.rworkload!=null && this.editForm.rworkload!="" && 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) + return Math.round((parseFloat(this.editForm.workload?this.editForm.workload:0)+parseFloat(this.val.actWorkload?this.val.actWorkload:0))/(parseFloat(this.editForm.rworkload)+parseFloat(this.editForm.workload?this.editForm.workload:0)+parseFloat(this.val.actWorkload?this.val.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); + return Math.round((parseFloat(this.editForm.workload?this.editForm.workload:0)+parseFloat(this.val.actWorkload?this.val.actWorkload:0))/this.val.budgetWorkload *100); } }, + val(){ + var params={} + if( this.xmTask && this.xmTask.id){ + params.id=this.xmTask.id + params.initWorkload=this.xmTask.initWorkload + params.budgetWorkload=this.xmTask.budgetWorkload + params.actWorkload=this.xmTask.actWorkload + params.ntype=this.xmTask.ntype + params.name=this.xmTask.name + } + if( this.xmMenu && this.xmMenu.menuId){ + params.menuId=this.xmMenu.menuId + params.initWorkload=this.xmMenu.initWorkload + params.budgetWorkload=this.xmMenu.budgetWorkload + params.actWorkload=this.xmMenu.actWorkload + params.ntype=this.xmMenu.ntype + params.dclass=this.xmMenu.dclass + params.name=this.xmMenu.name + params.menuName=this.xmMenu.menuName + } + if( this.xmQuestion && this.xmQuestion.id){ + params.id=this.xmQuestion.id + params.initWorkload=this.xmQuestion.initWorkload + params.budgetWorkload=this.xmQuestion.budgetWorkload + params.actWorkload=this.xmQuestion.actWorkload + params.name=this.xmQuestion.name + } + if( this.xmTestCase && this.xmTestCase.id){ + params.id=this.xmTestCase.id + params.initWorkload=this.xmTestCase.initWorkload + params.budgetWorkload=this.xmTestCase.budgetWorkload + params.actWorkload=this.xmTestCase.actWorkload + params.name=this.xmTestCase.caseName + params.caseName=this.xmTestCase.caseName + } + if( this.xmTestPlanCase && this.xmTestPlanCase.planId){ + params.planId=this.xmTestPlanCase.planId + params.caseId=this.xmTestPlanCase.caseId + params.initWorkload=this.xmTestPlanCase.initWorkload + params.budgetWorkload=this.xmTestPlanCase.budgetWorkload + params.actWorkload=this.xmTestPlanCase.actWorkload + params.name=this.xmTestPlanCase.caseName + params.caseName=this.xmTestPlanCase.caseName + } + return params + } }, props:['xmTask','xmWorkload','visible','opType','bizType'/*报工类型1-任务，2-缺陷，3-测试用例设计，4-测试执行 */, @@ -148,7 +194,7 @@ this.listXmTaskExecuser(); } if(val==='3'){ - this.editForm.workload=this.xmTask.budgetWorkload-this.xmTask.actWorkload + this.editForm.workload=this.val.budgetWorkload-this.val.actWorkload } if(val==='1'){ this.editForm.workload=8 @@ -262,11 +308,11 @@ } }, listXmTaskExecuser(){ - listXmTaskExecuser({userid:this.userInfo.userid,taskId:this.xmTask.id}).then(res=>{ + listXmTaskExecuser({userid:this.userInfo.userid,taskId:this.val.id}).then(res=>{ if(res.data.tips.isOk&& res.data.data.length>0){ this.execuser=res.data.data[0] if(this.workloadFillType=='2'){ - this.editForm.workload=this.execuser.quoteWorkload-this.xmTask.actWorkload + this.editForm.workload=this.execuser.quoteWorkload-this.val.actWorkload } }else{ this.$notify({position:'bottom-left',showClose:true,message:'没有找到报价信息',type:'error'}) diff --git a/src/views/xm/core/xmWorkload/XmWorkloadList.vue b/src/views/xm/core/xmWorkload/XmWorkloadList.vue index d4bbb4ad..f1d43184 100644 --- a/src/views/xm/core/xmWorkload/XmWorkloadList.vue +++ b/src/views/xm/core/xmWorkload/XmWorkloadList.vue @@ -29,7 +29,7 @@ - + @@ -57,33 +57,61 @@ var params={} if( this.xmTask && this.xmTask.id){ params.id=this.xmTask.id + params.initWorkload=this.xmTask.initWorkload + params.budgetWorkload=this.xmTask.budgetWorkload + params.actWorkload=this.xmTask.actWorkload + params.ntype=this.xmTask.ntype + params.name=this.xmTask.name } if( this.xmMenu && this.xmMenu.menuId){ - params.id=this.xmMenu.menuId + params.menuId=this.xmMenu.menuId + params.initWorkload=this.xmMenu.initWorkload + params.budgetWorkload=this.xmMenu.budgetWorkload + params.actWorkload=this.xmMenu.actWorkload + params.ntype=this.xmMenu.ntype + params.dclass=this.xmMenu.dclass + params.name=this.xmMenu.name + params.menuName=this.xmMenu.menuName } if( this.xmQuestion && this.xmQuestion.id){ params.id=this.xmQuestion.id + params.initWorkload=this.xmQuestion.initWorkload + params.budgetWorkload=this.xmQuestion.budgetWorkload + params.actWorkload=this.xmQuestion.actWorkload + params.name=this.xmQuestion.name } if( this.xmTestCase && this.xmTestCase.id){ params.id=this.xmTestCase.id + params.initWorkload=this.xmTestCase.initWorkload + params.budgetWorkload=this.xmTestCase.budgetWorkload + params.actWorkload=this.xmTestCase.actWorkload + params.name=this.xmTestCase.caseName + params.caseName=this.xmTestCase.caseName } if( this.xmTestPlanCase && this.xmTestPlanCase.planId){ - params.id=this.xmTestPlanCase.planId + params.planId=this.xmTestPlanCase.planId + params.caseId=this.xmTestPlanCase.caseId + params.initWorkload=this.xmTestPlanCase.initWorkload + params.budgetWorkload=this.xmTestPlanCase.budgetWorkload + params.actWorkload=this.xmTestPlanCase.actWorkload + params.name=this.xmTestPlanCase.caseName + params.caseName=this.xmTestPlanCase.caseName } - return params.id + return params } }, watch:{ visible(val){ - if(val==true){ - this.initData(); + if(val==true){ this.searchXmWorkloads() } }, - val(){ - this.initData(); - this.searchXmWorkloads() + val:{ + handler(){ + this.initData(); + }, + deep:true, } }, data() { @@ -294,7 +322,8 @@ this.$emit('row-click',row, event, column);// @row-click="rowClick" }, initData: function(){ - + this.editForm=Object.assign(this.editForm,this.val) + this.editFormBak={...this.editForm} }, },//end methods diff --git a/src/views/xm/core/xmWorkload/XmWorkloadRecord.vue b/src/views/xm/core/xmWorkload/XmWorkloadRecord.vue index ea439a7e..a9aa4f17 100644 --- a/src/views/xm/core/xmWorkload/XmWorkloadRecord.vue +++ b/src/views/xm/core/xmWorkload/XmWorkloadRecord.vue @@ -133,10 +133,11 @@ ] },//新增界面数据 xm_task editForm: { + id:'',name:'',parentTaskid:'',parentTaskname:'',projectId:'',projectName:'',level:'3',sortLevel:'0',executorUserid:'',executorUsername:'', preTaskid:'',preTaskname:'',startTime:'',endTime:'',milestone:'',description:'',remarks:'',createUserid:'',createUsername:'',createTime:'',taskOut:'0', rate:0,budgetCost:'',budgetWorkload:'',actCost:'',actWorkload:'',taskState:'0',taskClass:'0',toTaskCenter:'0',actStartTime:'',actEndTime:'',taskType:'4',planType:'w2',settleSchemel:'1',ntype:'0',childrenCnt:0 - ,rworkload:null, + ,rworkload:null,dclass:'', }, maxTableHeight:300, }//end return