diff --git a/src/views/xm/core/xmWorkload/XmWorkloadList.vue b/src/views/xm/core/xmWorkload/XmWorkloadList.vue
index 12e9f4b1..3ff32679 100644
--- a/src/views/xm/core/xmWorkload/XmWorkloadList.vue
+++ b/src/views/xm/core/xmWorkload/XmWorkloadList.vue
@@ -20,12 +20,18 @@
 						 {{scope.row.wstatus==='1'?'已确认':'待确认'}}
 					 </template>
 				 </el-table-column>
-				<el-table-column prop="bizName" label="业务标题" min-width="150" show-overflow-tooltip>
+
+				<el-table-column prop="bizType" label="报工类型" width="120" show-overflow-tooltip>
+					<template slot-scope="scope">
+						<mdp-select-dict-tag :disabled="true" v-model="scope.row.bizType" :dict="dicts['wlBizType']"></mdp-select-dict-tag>
+					</template> 
+				</el-table-column> 
+				<el-table-column prop="bizName" label="报工业务" width="120" show-overflow-tooltip>
 					<template slot-scope="scope">
-						<el-link @click="goToBizDetail(scope.row)">{{scope.row.bizName}}</el-link>
+						<el-link @click="openDialog(scope.row)">{{scope.row.bizName}}</el-link>
 					</template>
-				</el-table-column>
-				<el-table-column prop="remark" label="备注" min-width="80" show-overflow-tooltip></el-table-column>
+				</el-table-column> 
+				<el-table-column prop="remark" label="报工备注" width="120" show-overflow-tooltip></el-table-column>  
 				<el-table-column prop="ttype" label="任务类型" min-width="80" show-overflow-tooltip :formatter="formatterOption"></el-table-column>
 
 			</el-table>
diff --git a/src/views/xm/core/xmWorkload/XmWorkloadMng.vue b/src/views/xm/core/xmWorkload/XmWorkloadMng.vue
index 3e438121..fb2ed568 100644
--- a/src/views/xm/core/xmWorkload/XmWorkloadMng.vue
+++ b/src/views/xm/core/xmWorkload/XmWorkloadMng.vue
@@ -170,7 +170,18 @@
         -->
 <!--				<el-table-column prop="cuserid" label="创建人编号" width="120" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="bizDate" label="业务日期yyyy-MM-dd" width="120" show-overflow-tooltip></el-table-column>-->
-				<el-table-column prop="remark" label="备注" width="120" show-overflow-tooltip>  
+				
+				<el-table-column prop="bizType" label="报工类型" width="120" show-overflow-tooltip>
+					<template slot-scope="scope">
+						<mdp-select-dict-tag :disabled="true" v-model="scope.row.bizType" :dict="dicts['wlBizType']"></mdp-select-dict-tag>
+					</template> 
+				</el-table-column> 
+				<el-table-column prop="bizName" label="报工业务" width="120" show-overflow-tooltip>
+					<template slot-scope="scope">
+						<el-link @click="openDialog(scope.row)">{{scope.row.bizName}}</el-link>
+					</template>
+				</el-table-column> 
+				<el-table-column prop="remark" label="报工备注" width="120" show-overflow-tooltip></el-table-column>  
           <template slot-scope="scope"> 
             <span class="cell-text">
               <span v-if="scope.row.remark">{{ scope.row.remark}}</span>
@@ -209,6 +220,29 @@
       <el-drawer title="选择员工" :visible.sync="selectFiltersPmUserVisible" size="60%" append-to-body>
         <users-select  @confirm="onFiltersPmUserSelected" ref="usersSelect"></users-select>
       </el-drawer> 
+
+
+			
+		<el-dialog title="任务明细" :visible.sync="taskDetailVisible" width="90%" top="20px" append-to-body>
+			<xm-task-detail :visible="taskDetailVisible" :xm-task="{id:editForm.taskId,name:editForm.bizName}" :reload="true"></xm-task-detail>
+		</el-dialog>
+		
+		<el-dialog title="缺陷明细" :visible.sync="bugDetailVisible" width="90%" top="20px" append-to-body>
+			<xm-question-detail :visible="bugDetailVisible" :xm-question="{id:editForm.bugId,name:editForm.bizName}" :reload="true"></xm-question-detail>
+		</el-dialog>
+		
+		<el-dialog title="测试用例明细" :visible.sync="caseDetailVisible" width="90%" top="20px" append-to-body>
+			<xm-test-case-detail :visible="caseDetailVisible" :xm-test-case="{id:editForm.caseId,name:editForm.bizName}" :reload="true"></xm-test-case-detail>
+		</el-dialog>
+		
+		<el-dialog title="执行用例明细" :visible.sync="planCaseDetailVisible" width="90%" top="20px" append-to-body>
+			<xm-test-plan-case-detail :visible="planCaseDetailVisible" :xm-plan-test-case="{planId:editForm.planId,caseId:editForm.caseId,name:editForm.bizName}" :reload="true"></xm-test-plan-case-detail>
+		</el-dialog>
+		
+		<el-dialog title="需求明细" :visible.sync="menuDetailVisible" width="90%" top="20px" append-to-body>
+			<xm-menu-detail :visible="menuDetailVisible" :xm-menu="{id:editForm.menuId,name:editForm.bizName}" :reload="true"></xm-menu-detail>
+		</el-dialog>
+
 	    </el-row>
 	</section>
 </template>
@@ -237,6 +271,12 @@
       XmTaskSbillSelect,
       UsersSelect,
       XmWorkloadSimpleList,
+       
+			"xm-task-detail":()=>import("../xmTask/XmTaskDetail"),
+			"xm-question-detail":()=>import("../xmQuestion/XmQuestionDetail"),
+			"xm-test-case-detail":()=>import("../xmTestCase/XmTestCaseDetail"),
+			"xm-test-plan-case-detail":()=>import("../xmTestPlanCase/XmTestPlanCaseDetail"),
+			"xm-menu-detail":()=>import("../xmMenu/XmMenuDetail"),
 		},
 		props:['visible','wstatuses','sstatuses','queryScope'/**my/all */,'sbillId','bizType'/*报工类型1-任务，2-缺陷，3-测试用例设计，4-测试执行 */,
 		'xmMenu','xmTestCase','xmQuestion','xmTestPlanCase'],
@@ -563,6 +603,20 @@
         this.filters.pmUser=this.userInfo;
         this.searchXmWorkloads();
       },
+			openDialog(row){
+				this.editForm=row
+				if(row.bizType=='1'){
+					this.taskDetailVisible=true
+				}else if(row.bizType=='2'){
+					this.bugDetailVisible=true
+				}else if(this.bizType=='3'){
+					this.caseDetailVisible=true
+				}else if(this.bizType=='4'){
+					this.planCaseDetailVisible=true
+				}else if(this.bizType=='5'){
+					this.menuDetailVisible=true
+				}
+			}
 
     },//end methods
 		mounted() {
diff --git a/src/views/xm/core/xmWorkload/XmWorkloadSimpleList.vue b/src/views/xm/core/xmWorkload/XmWorkloadSimpleList.vue
index 438f604c..df12b174 100644
--- a/src/views/xm/core/xmWorkload/XmWorkloadSimpleList.vue
+++ b/src/views/xm/core/xmWorkload/XmWorkloadSimpleList.vue
@@ -42,13 +42,17 @@
 						</span>
 					 </template>
 				 </el-table-column>
-				<el-table-column prop="remark" label="备注" width="120" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="ttype" label="任务类型" width="80" show-overflow-tooltip>
-					 <template slot-scope="scope">
-						<el-tag v-for="(item,index) in formatDictsWithClass(dicts,'taskType',scope.row.ttype)" :key="index" :type="item.className">{{item.name}}</el-tag>
-					 </template>
-
-				</el-table-column>
+				<el-table-column prop="bizType" label="报工类型" width="120" show-overflow-tooltip>
+					<template slot-scope="scope">
+						<mdp-select-dict-tag :disabled="true" v-model="scope.row.bizType" :dict="dicts['wlBizType']"></mdp-select-dict-tag>
+					</template> 
+				</el-table-column> 
+				<el-table-column prop="bizName" label="报工业务" width="120" show-overflow-tooltip>
+					<template slot-scope="scope">
+						<el-link @click="openDialog(scope.row)">{{scope.row.bizName}}</el-link>
+					</template>
+				</el-table-column> 
+				<el-table-column prop="remark" label="报工备注" width="120" show-overflow-tooltip></el-table-column>  
 
 			</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>
@@ -59,6 +63,27 @@
 			<el-dialog :title="'任务【'+xmTask.name+'】新增工时'" :visible.sync="addFormVisible"  width="60%" top="20px"  append-to-body  :close-on-click-modal="false">
 				<xm-workload-edit op-type="add" :xm-task="xmTask" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-workload-edit>
 			</el-dialog>
+
+			
+			<el-dialog title="任务明细" :visible.sync="taskDetailVisible" width="90%" top="20px" append-to-body>
+				<xm-task-detail :visible="taskDetailVisible" :xm-task="{id:editForm.taskId,name:editForm.bizName}" :reload="true"></xm-task-detail>
+			</el-dialog>
+			
+			<el-dialog title="缺陷明细" :visible.sync="bugDetailVisible" width="90%" top="20px" append-to-body>
+				<xm-question-detail :visible="bugDetailVisible" :xm-question="{id:editForm.bugId,name:editForm.bizName}" :reload="true"></xm-question-detail>
+			</el-dialog>
+			
+			<el-dialog title="测试用例明细" :visible.sync="caseDetailVisible" width="90%" top="20px" append-to-body>
+				<xm-test-case-detail :visible="caseDetailVisible" :xm-test-case="{id:editForm.caseId,name:editForm.bizName}" :reload="true"></xm-test-case-detail>
+			</el-dialog>
+			
+			<el-dialog title="执行用例明细" :visible.sync="planCaseDetailVisible" width="90%" top="20px" append-to-body>
+				<xm-test-plan-case-detail :visible="planCaseDetailVisible" :xm-plan-test-case="{planId:editForm.planId,caseId:editForm.caseId,name:editForm.bizName}" :reload="true"></xm-test-plan-case-detail>
+			</el-dialog>
+			
+			<el-dialog title="需求明细" :visible.sync="menuDetailVisible" width="90%" top="20px" append-to-body>
+				<xm-menu-detail :visible="menuDetailVisible" :xm-menu="{id:editForm.menuId,name:editForm.bizName}" :reload="true"></xm-menu-detail>
+			</el-dialog>
 	    </el-row>
 	</section>
 </template>
@@ -74,7 +99,12 @@
 	export default {
 	    name:'xmWorkloadSimpleList',
 		components: {
-		    XmWorkloadEdit,
+		    XmWorkloadEdit, 
+			"xm-task-detail":()=>import("../xmTask/XmTaskDetail"),
+			"xm-question-detail":()=>import("../xmQuestion/XmQuestionDetail"),
+			"xm-test-case-detail":()=>import("../xmTestCase/XmTestCaseDetail"),
+			"xm-test-plan-case-detail":()=>import("../xmTestPlanCase/XmTestPlanCaseDetail"),
+			"xm-menu-detail":()=>import("../xmMenu/XmMenuDetail"),
 		},
 		props:['xmTask','visible','userid','wstatus','sstatus'],
 		computed: {
@@ -311,8 +341,21 @@
 			},
             initData: function(){
 
-            },
-
+            }, 
+			openDialog(row){
+				this.editForm=row
+				if(row.bizType=='1'){
+					this.taskDetailVisible=true
+				}else if(row.bizType=='2'){
+					this.bugDetailVisible=true
+				}else if(this.bizType=='3'){
+					this.caseDetailVisible=true
+				}else if(this.bizType=='4'){
+					this.planCaseDetailVisible=true
+				}else if(this.bizType=='5'){
+					this.menuDetailVisible=true
+				}
+			}
 		},//end methods
 		mounted() {
 			this.$nextTick(() => { 
diff --git a/src/views/xm/core/xmWorkload/XmWorkloadSimpleListForBizDate.vue b/src/views/xm/core/xmWorkload/XmWorkloadSimpleListForBizDate.vue
index dc2a3ff9..1639de12 100644
--- a/src/views/xm/core/xmWorkload/XmWorkloadSimpleListForBizDate.vue
+++ b/src/views/xm/core/xmWorkload/XmWorkloadSimpleListForBizDate.vue
@@ -37,10 +37,10 @@
 				</el-table-column> 
 				<el-table-column prop="bizName" label="报工业务" width="120" show-overflow-tooltip>
 					<template slot-scope="scope">
-						<el-link @click="openDialog(scope.row)"></el-link>
+						<el-link @click="openDialog(scope.row)">{{scope.row.bizName}}</el-link>
 					</template>
 				</el-table-column> 
-				<el-table-column prop="remark" label="报工备注" width="120" show-overflow-tooltip></el-table-column> 
+				<el-table-column prop="remark" label="报工备注" width="120" show-overflow-tooltip></el-table-column>  
  				<el-table-column fixed="right" label="操作" min-width="120">
 					<template slot-scope="scope">
                				<xm-task-sbill-select style="display:inline;"  :auto-select="false"  :project-id="scope.row.projectId"    placeholder="结算"  @row-click="batchJoinToSbill(scope.row,$event)">