diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 9d328624..a87aba63 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -222,6 +222,16 @@
 
 							</el-table-column>
 							<template>
+							<el-table-column prop="mmUsername" label="跟进人"  min-width="100" show-overflow-tooltip  sortable>
+								<template slot-scope="scope">
+									<div class="cell-text">
+										{{scope.row.mmUsername}}
+									</div>
+									<span class="cell-bar">
+										 <el-button @click="$refs.xmGroupDialog.open({data:scope.row,action:'editMmUserid'})">选跟进人</el-button>
+									</span>
+								</template>
+							</el-table-column>
 							<el-table-column prop="productId" label="产品" width="100" show-overflow-tooltip sortable>
 							</el-table-column>
 							
@@ -339,16 +349,6 @@
 									</span>
 								</template>
 							</el-table-column>
-							<el-table-column prop="mmUsername" label="跟进人"  min-width="100" show-overflow-tooltip  sortable>
-								<template slot-scope="scope">
-									<div class="cell-text">
-										{{scope.row.mmUsername}}
-									</div>
-									<span class="cell-bar">
-										 <el-button @click="$refs.xmGroupDialog.open({data:scope.row,action:'editMmUserid'})">选跟进人</el-button>
-									</span>
-								</template>
-							</el-table-column>
 							</template>
 						</el-table>
 						<el-pagination  layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination>
diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue b/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue
index 3c564faf..ffc8702f 100644
--- a/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue
+++ b/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue
@@ -87,6 +87,22 @@
 									</span>
 								</template>
               </el-table-column>
+              <el-table-column
+                sortable
+                prop="executorUsername"
+                label="执行人"
+                width="120"
+                show-overflow-tooltip
+              >
+								<template slot-scope="scope">
+									<div class="cell-text">
+										{{scope.row.executorUsername}}
+									</div>
+									<span class="cell-bar">
+										 <el-button @click="$refs.xmGroupDialog.open({data:scope.row,action:'executorUserid'})">选执行人</el-button>
+									</span>
+								</template>
+              </el-table-column>
         </el-table> 
       </el-row>
       
@@ -159,6 +175,8 @@ import treeTool from "@/common/js/treeTool"; //全局公共库
 import XmTaskWorkloadRecordDialog from '../xmTaskWorkload/XmTaskWorkloadRecordDialog.vue';
 
 	import XmPhaseSelect from "../xmTask/XmPhaseSelect.vue"; 
+	import { addXmTaskExecuser } from '@/api/xm/core/xmTaskExecuser';
+
 export default {
   computed: {
     ...mapGetters(["userInfo", "roles"]), 
@@ -332,6 +350,32 @@ export default {
           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'})
+          }
+        })
       }
       
     },
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index bb1280da..7fd66a4a 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -406,17 +406,6 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column
-                sortable
-                prop="budgetWorkload"
-                label="工时"
-                width="150"
-              >
-
-                <template slot-scope="scope">
-                  	<span title="实际工时 / 预算工时 或者 (剩余工时+实际工时)">{{scope.row.actWorkload}} &nbsp;/ &nbsp;{{scope.row.rworkload?parseInt(scope.row.actWorkload)+parseInt(scope.row.rworkload):scope.row.budgetWorkload}}h </span>
-                </template>
-              </el-table-column>
               <el-table-column
                 sortable
                 prop="createUsername"
@@ -462,6 +451,17 @@
                   </span>
                 </template>
               </el-table-column>
+              <el-table-column
+                sortable
+                prop="budgetWorkload"
+                label="工时"
+                width="150"
+              >
+
+                <template slot-scope="scope">
+                  	<span title="实际工时 / 预算工时 或者 (剩余工时+实际工时)">{{scope.row.actWorkload}} &nbsp;/ &nbsp;{{scope.row.rworkload?parseInt(scope.row.actWorkload)+parseInt(scope.row.rworkload):scope.row.budgetWorkload}}h </span>
+                </template>
+              </el-table-column>
               <el-table-column sortable prop="productId" label="产品" width="100" show-overflow-tooltip>
               </el-table-column>
               <el-table-column sortable prop="projectId" label="项目" width="100" show-overflow-tooltip>
diff --git a/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue b/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue
index bbe9265b..3afa6746 100644
--- a/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue
+++ b/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue
@@ -88,6 +88,22 @@
 									</span>
 								</template>
               </el-table-column>
+              <el-table-column
+                sortable
+                prop="executorUsername"
+                label="执行人"
+                width="120"
+                show-overflow-tooltip
+              >
+								<template slot-scope="scope">
+									<div class="cell-text">
+										{{scope.row.createUsername}}
+									</div>
+									<span class="cell-bar">
+										 <el-button @click="$refs.xmGroupDialog.open({data:scope.row,action:'executorUsername'})">选负责人</el-button>
+									</span>
+								</template>
+              </el-table-column>
         </el-table> 
       </el-row>
       <el-dialog :title="ntype==='0'?'新增任务':'新增计划'" :visible.sync="addFormVisible" append-to-body modal-append-to-body>
@@ -127,7 +143,7 @@
         @edit-fields="onEditXmTaskSomeFields"
       ></xm-task-edit>
     </el-dialog>
- 			<xm-group-dialog ref="xmGroupDialog" :isSelectSingleUser="true" :sel-project="linkProjectId?{id:linkProjectId}:null" :xm-product="parentXmTask?{id:parentXmTask.productId}:null" @user-confirm="selectCreateUserConfirm">
+ 			<xm-group-dialog ref="xmGroupDialog" :isSelectSingleUser="true" :sel-project="linkProjectId?{id:linkProjectId}:(parentXmTask&&parentXmTask.projectId?{id:parentXmTask.projectId}:null)" :xm-product="parentXmTask?{id:parentXmTask.productId}:null" @user-confirm="selectCreateUserConfirm">
 			</xm-group-dialog>  
       <xm-task-workload-record-dialog ref="workloadRecordDialog" @submi="afterWorkloadSubmit" @edit-xm-task-some-fields="onEditXmTaskSomeFields" @submit="onWorkloadSubmit"></xm-task-workload-record-dialog>
     </el-row> 
@@ -144,6 +160,7 @@ import treeTool from "@/common/js/treeTool"; //全局公共库
 	import { mapGetters } from 'vuex'
 import XmTaskWorkloadRecordDialog from '../xmTaskWorkload/XmTaskWorkloadRecordDialog.vue';
  
+	import { addXmTaskExecuser } from '@/api/xm/core/xmTaskExecuser';
 
 export default {
   computed: {
@@ -306,6 +323,32 @@ export default {
           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'})
+          }
+        })
       }
       
     },