diff --git a/src/api/xm/core/xmQuestion.js b/src/api/xm/core/xmQuestion.js index b1a715c9..238dbd5c 100644 --- a/src/api/xm/core/xmQuestion.js +++ b/src/api/xm/core/xmQuestion.js @@ -41,6 +41,7 @@ export const getXmQuestionAttDist = params => { return axios.get(`${base}/xm/cor export const getXmQuestionAgeDist = params => { return axios.get(`${base}/xm/core/xmQuestion/getXmQuestionAgeDist`, { params: params }); }; export const getXmQuestionSort = params => { return axios.get(`${base}/xm/core/xmQuestion/getXmQuestionSort`, { params: params }); }; + diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue index 7e7f62fc..0f4793f4 100644 --- a/src/views/xm/core/xmTask/XmTaskEdit.vue +++ b/src/views/xm/core/xmTask/XmTaskEdit.vue @@ -263,7 +263,7 @@ - + diff --git a/src/views/xm/core/xmWorkload/XmWorkloadEdit.vue b/src/views/xm/core/xmWorkload/XmWorkloadEdit.vue index ecdc8396..c0320b61 100644 --- a/src/views/xm/core/xmWorkload/XmWorkloadEdit.vue +++ b/src/views/xm/core/xmWorkload/XmWorkloadEdit.vue @@ -1,8 +1,6 @@ @@ -52,6 +52,10 @@ import config from "@/common/config"; //全局公共库import import { getDicts,initSimpleDicts,initComplexDicts } from '@/api/mdp/meta/item';//字典表 import { getTask, editXmTaskSomeFields } from '@/api/xm/core/xmTask'; + + import { editSomeFieldsXmTestCase } from '@/api/xm/core/xmTestCase'; + import { editSomeFieldsXmTestPlanCase } from '@/api/xm/core/xmTestPlanCase'; + import { editXmQuestionSomeFields } from '@/api/xm/core/xmQuestion'; import { mapGetters } from 'vuex' import XmWorkloadList from './XmWorkloadList'; @@ -62,22 +66,62 @@ }, computed: { ...mapGetters([ 'userInfo' ]), + 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 + } + 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 + } + if( this.xmQuestion && this.xmQuestion.id){ + params.id=this.xmQuestion.id + params.initWorkload=this.xmMenu.initWorkload + params.budgetWorkload=this.xmMenu.budgetWorkload + params.actWorkload=this.xmMenu.actWorkload + } + 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 + } + 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 + } + return params + } }, - props:['xmTask','visible'], + props:['xmTask','visible','bizType'/*报工类型1-任务，2-缺陷，3-测试用例设计，4-测试执行 */, + 'xmMenu','xmTestCase','xmQuestion','xmTestPlanCase'], watch: { - 'xmTask':{ - handler(){ - this.initData() - } - - }, + 'visible':function(visible) { if(visible==true){ this.initData() } - } + }, + val:{ + handler(){ + this.initData(); + }, + deep:true, + } }, data() { return { @@ -106,13 +150,31 @@ saveSubmit: function () { }, initData: function(){ - this.editForm=Object.assign({},this.xmTask) + this.editForm=Object.assign({},this.val) this.editFormBak=Object.assign({},this.editForm) }, + + - editXmTaskSomeFields(row,fieldName,$event){ - + editSomeFields(row,fieldName,$event){ + var func=null; + var emit="edit-some-fields" var params={ids:[row.id]}; + if(this.bizType==='1'){ + func=editXmTaskSomeFields + + }else if(this.bizType==='2'){ + func=editXmQuestionSomeFields + }else if(this.bizType==='3'){ + func=editSomeFieldsXmTestCase + }else if(this.bizType==='4'){ + func=editSomeFieldsXmTestPlanCase + params={pkList:[{planId:row.planId,caseId:row.caseId}]}; + }else if(this.bizType==='5'){ + this.editForm=Object.assign(this.editForm,this.editFormBak) + this.$notify({position:'bottom-left',showClose:true,message:"需求数据不允许手工修改",type:tips.isOk?'success':'error'}) + return + } params[fieldName]=$event if(fieldName==='rworkload'||fieldName==='budgetWorkload'){ var total=row.budgetWorkload; @@ -126,11 +188,10 @@ params.rate=rate row.rate=rate } - editXmTaskSomeFields(params).then(res=>{ + func(params).then(res=>{ var tips = res.data.tips; - if(tips.isOk){ - //Object.assign(row,params) - this.$emit("edit-xm-task-some-fields",params); + if(tips.isOk){ + this.$emit(emit,params); }else{ this.editForm=Object.assign(this.editForm,this.editFormBak) this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'}) @@ -138,17 +199,19 @@ }) }, onWorkloadSubmit(){ - getTask({id:this.xmTask.id}).then(res=>{ - var tips = res.data.tips - if(tips.isOk){ - if(res.data.data.length>0){ - Object.assign(this.xmTask,res.data.data[0]) - Object.assign(this.editForm,this.xmTask) - Object.assign(this.editFormBak,this.xmTask) - this.$emit('submit',this.editForm) + if(this.bizType=='1'){ + getTask({id:this.xmTask.id}).then(res=>{ + var tips = res.data.tips + if(tips.isOk){ + if(res.data.data.length>0){ + Object.assign(this.xmTask,res.data.data[0]) + Object.assign(this.editForm,this.xmTask) + Object.assign(this.editFormBak,this.xmTask) + this.$emit('submit',this.editForm) + } } - } - }) + }) + } } },//end method mounted() {