diff --git a/src/views/xm/core/components/MdpSelectUserXm/index.vue b/src/views/xm/core/components/MdpSelectUserXm/index.vue index 28195141..30f34b88 100644 --- a/src/views/xm/core/components/MdpSelectUserXm/index.vue +++ b/src/views/xm/core/components/MdpSelectUserXm/index.vue @@ -14,7 +14,7 @@
- + 常用用户 部门用户项目组 @@ -33,7 +33,7 @@ - +
@@ -94,7 +94,7 @@ }, watch:{ value:{ - handler(){ + handler(){ this.initData(); }, deep:true, diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue b/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue index d007a5ba..acae8106 100644 --- a/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue +++ b/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue @@ -67,7 +67,7 @@ show-overflow-tooltip > @@ -79,7 +79,7 @@ show-overflow-tooltip > @@ -321,43 +321,7 @@ export default { afterEditSubmit(row){ Object.assign(this.editForm,row) - }, - //查询时选择责任人 - selectCreateUserConfirm(groupUsers,option) { - if(option && option.action==='createUserid'){ - if (groupUsers && groupUsers.length > 0) { - var user= groupUsers[0]; - this.editXmTaskSomeFields(option.data,option.action,user) - } - }else if(option.action==='executorUserid'){ - var user= groupUsers[0]; - var params={} - var row=option.data; - params.taskId = row.id; - params.projectId=row.projectId - params.projectName=row.projectName - params.taskName=row.name - params.quoteStartTime=row.startTime - params.quoteEndTime=row.endTime - params.quoteAmount=row.budgetAt - params.quoteWorkload=row.budgetWorkload - params.userid=user.userid - params.username=user.username - addXmTaskExecuser(params).then(res=>{ - var tips = res.data.tips - if(tips.isOk){ - //this.searchXmTasks(); - row.executorUserid=user.userid - row.executorUsername=user.username - row.exeUserids=user.userid - row.exeUsernames=user.username - }else{ - this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:'error'}) - } - }) - } - - }, + }, editXmTaskSomeFields(row,fieldName,$event){ var params={ids:[row.id]}; if(this.sels.length>0){ @@ -525,7 +489,38 @@ export default { this.addForm.parentTaskid=task.id this.addForm.parentTaskname=task.name this.selectParentTaskVisible=false - } + }, + + //查询时选择责任人 + selectExecUserConfirm(row,fieldName,users) { + + var user= users[0]; + var params={} + params.taskId = row.id; + params.projectId=row.projectId + params.projectName=row.projectName + params.taskName=row.name + params.quoteStartTime=row.startTime + params.quoteEndTime=row.endTime + params.quoteAmount=row.budgetAt + params.quoteWorkload=row.budgetWorkload + params.userid=user.userid + params.username=user.username + addXmTaskExecuser(params).then(res=>{ + var tips = res.data.tips + if(tips.isOk){ + row.executorUserid=user.userid + row.executorUsername=user.username + row.exeUserids=user.userid + row.exeUsernames=user.username + }else{ + row.executorUserid=this.editFormBak.executorUserid + row.executorUsername=this.editFormBak.executorUsername + this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:'error'}) + } + }) + + }, }, //end methods components: { XmTaskWorkloadRecordDialog,XmGroupDialog,'xm-task-edit':()=>import('../xmTask/XmTaskEdit'),XmPhaseSelect,MdpSelectUserXm, diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue index dcb5dbe0..c299c54b 100644 --- a/src/views/xm/core/xmTask/XmTaskEdit.vue +++ b/src/views/xm/core/xmTask/XmTaskEdit.vue @@ -501,13 +501,7 @@ - - - - - - + --> diff --git a/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue b/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue index 1df635a4..2b793934 100644 --- a/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue +++ b/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue @@ -68,7 +68,7 @@ show-overflow-tooltip > @@ -80,7 +80,7 @@ show-overflow-tooltip > @@ -121,9 +121,7 @@ @submit="onEditXmTaskSomeFields" @edit-fields="onEditXmTaskSomeFields" > - - - + @@ -211,6 +209,41 @@ export default { actEndTime: "", uniInnerPrice:80,uniOutPrice:100, }, + + editFormBak: { + id: "", + name: "", + parentTaskid: "", + parentTaskname: "", + projectId: "", + projectName: "", + level: "", + sortLevel: "", + executorUserid: "", + executorUsername: "", + preTaskid: "", + preTaskname: "", + startTime: "", + endTime: "", + milestone: "", + description: "", + remarks: "", + createUserid: "", + createUsername: "", + createTime: "", + rate: "", + budgetAt: "", + budgetWorkload: "", + actAt: "", + actWorkload: "", + taskState: "", + taskType: "", + taskClass: "", + toTaskCenter: "", + actStartTime: "", + actEndTime: "", + uniInnerPrice:80,uniOutPrice:100, + }, addForm:{name:''}, addFormRules:{ name: [ @@ -296,16 +329,10 @@ export default { }, //查询时选择责任人 - selectCreateUserConfirm(groupUsers,option) { - if(option && option.action==='createUserid'){ - if (groupUsers && groupUsers.length > 0) { - var user= groupUsers[0]; - this.editXmTaskSomeFields(option.data,option.action,user) - } - }else if(option.action==='executorUserid'){ - var user= groupUsers[0]; - var params={} - var row=option.data; + selectExecUserConfirm(row,fieldName,users) { + + var user= users[0]; + var params={} params.taskId = row.id; params.projectId=row.projectId params.projectName=row.projectName @@ -318,17 +345,17 @@ export default { params.username=user.username addXmTaskExecuser(params).then(res=>{ var tips = res.data.tips - if(tips.isOk){ - //this.searchXmTasks(); + if(tips.isOk){ row.executorUserid=user.userid row.executorUsername=user.username row.exeUserids=user.userid row.exeUsernames=user.username }else{ + row.executorUserid=this.editFormBak.executorUserid + row.executorUsername=this.editFormBak.executorUsername this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:'error'}) } - }) - } + }) }, editXmTaskSomeFields(row,fieldName,$event){ @@ -415,7 +442,7 @@ export default { }); }, rowClick: function (row) { - this.editForm = row; + this.editForm = row; this.editFormBak=Object.assign({},this.editForm) // this.$emit('row-click',row,);// @row-click="rowClick" },