diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue index 085ee334..17880ef7 100644 --- a/src/views/xm/core/xmMenu/XmMenuEdit.vue +++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue @@ -198,6 +198,9 @@ + + + 元 @@ -292,6 +295,8 @@ import XmMyDoFocus from '@/views/myWork/my/components/DoFocus'; import ArchiveEdit from '@/views/xm/core/wiki/archive/WikiMenuEdit'; import XmTestCaseMng from '@/views/xm/core/xmTestCase/XmTestCaseMng'; + + import xmQuestionMng from "@/views/xm/core/xmQuestion/XmQuestionMng"; import XmEpicFeaturesSelect from "../xmMenu/XmEpicFeaturesSelect"; import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm' @@ -632,6 +637,7 @@ 'xm-menu-edit':()=>import("./XmMenuDetail"), 'xm-workload-record':()=>import("../xmWorkload/XmWorkloadRecord"), XmEpicFeaturesSelect, + xmQuestionMng, }, mounted() { diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue index 0ee13f68..8946351c 100644 --- a/src/views/xm/core/xmTask/XmTaskMng.vue +++ b/src/views/xm/core/xmTask/XmTaskMng.vue @@ -1814,7 +1814,7 @@ export default { }else if(option.action==='executorUserid'){ var user= groupUsers[0]; var params={} - var row=option.data; + var row=option.data; params.taskId = row.id; params.projectId=row.projectId params.projectName=row.projectName @@ -1825,18 +1825,23 @@ export default { 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'}) - } - }) + if(this.sels.length>0){ + this.editXmTaskSomeFields(row,"executorUserid",params) + }else{ + 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'}) + } + }) + } + } },