diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js
index 7d3a7087..bc2487dd 100644
--- a/src/router/routes_xm.js
+++ b/src/router/routes_xm.js
@@ -176,22 +176,11 @@ export default {
       },
       //leaf: true,//只有一个节点
       children: [
-        { path: 'xmTaskSbill/XmTaskSbillMng', component: _import('xm/core/xmTaskSbill/XmTaskSbillMng'), name: 'XmTaskSbilllMng', meta: { title: '任务结算单'}},
-        /*{ path: 'xmTaskWorkload/XmTaskWorkloadMng', component: _import('xm/core/xmTaskWorkload/XmTaskWorkloadMng'), name: 'XmTaskWorkloadMng', meta: { title: '工时列表'}},*/
-        { path: 'xmTaskWorkload/ToComfirmWorkload', component: _import('xm/core/xmTaskWorkload/ToComfirmWorkload'), name: 'ToComfirmWorkload', meta: { title: '待确认工时(我)'}},
-        { path: 'xmTaskWorkload/HadComfirmWorkload', component: _import('xm/core/xmTaskWorkload/HadComfirmWorkload'), name: 'HadComfirmWorkload', meta: { title: '已确认工时(我)'}},
-        { path: 'xmTaskWorkload/WaitWorkloadToSbill', component: _import('xm/core/xmTaskWorkload/WaitWorkloadToSbill'), name: 'WaitWorkloadToSbill', meta: { title: '待结算工时(我)'}},
-        { path: 'xmTaskWorkload/FinWorkloadToSbill', component: _import('xm/core/xmTaskWorkload/FinWorkloadToSbill'), name: 'FinWorkloadToSbill', meta: { title: '已结算工时(我)'}},
-        
+        { path: 'xmTaskSbill/XmTaskSbillMng', component: _import('xm/core/xmTaskSbill/XmTaskSbillMng'), name: 'XmTaskSbilllMng', meta: { title: '任务结算单'}},    
+        { path: 'xmTaskWorkload/XmTaskWorkloadInfoMy', component: _import('xm/core/xmTaskWorkload/XmTaskWorkloadInfoMy'), name: 'XmTaskWorkloadInfoMy', meta: { title: '工时确认(我)'}},  
         { path: 'xmTaskWorkload/WorkloadSetDayListMy', component: _import('xm/core/xmTaskWorkload/WorkloadSetDayListMy'), name: 'WorkloadSetDayListMy', meta: { title: '工时日报表(我)'}},
-        { path: 'xmTaskWorkload/WorkloadSetMonthListMy', component: _import('xm/core/xmTaskWorkload/WorkloadSetMonthListMy'), name: 'WorkloadSetMonthListMy', meta: { title: '工时月报表(我)'}},
-        
-        { path: 'xmTaskWorkload/XmTaskWorkloadInfo', component: _import('xm/core/xmTaskWorkload/XmTaskWorkloadInfo'), name: 'XmTaskWorkloadInfo', meta: { title: '工时管理'}},
-        { path: 'xmTaskWorkload/ToComfirmWorkloadAll', component: _import('xm/core/xmTaskWorkload/ToComfirmWorkloadAll'), name: 'ToComfirmWorkloadAll', meta: { title: '待确认工时'}},
-        { path: 'xmTaskWorkload/HadComfirmWorkloadAll', component: _import('xm/core/xmTaskWorkload/HadComfirmWorkloadAll'), name: 'HadComfirmWorkloadAll', meta: { title: '已确认工时'}},
-         { path: 'xmTaskWorkload/WaitWorkloadToSbillAll', component: _import('xm/core/xmTaskWorkload/WaitWorkloadToSbillAll'), name: 'WaitWorkloadToSbillAll', meta: { title: '待结算工时'}},
-        { path: 'xmTaskWorkload/FinWorkloadToSbillAll', component: _import('xm/core/xmTaskWorkload/FinWorkloadToSbillAll'), name: 'FinWorkloadToSbillAll', meta: { title: '已结算工时'}},
-        
+        { path: 'xmTaskWorkload/WorkloadSetMonthListMy', component: _import('xm/core/xmTaskWorkload/WorkloadSetMonthListMy'), name: 'WorkloadSetMonthListMy', meta: { title: '工时月报表(我)'}}, 
+        { path: 'xmTaskWorkload/XmTaskWorkloadInfo', component: _import('xm/core/xmTaskWorkload/XmTaskWorkloadInfo'), name: 'XmTaskWorkloadInfo', meta: { title: '工时确认'}},
         { path: 'xmTaskWorkload/WorkloadSetDayList', component: _import('xm/core/xmTaskWorkload/WorkloadSetDayList'), name: 'WorkloadSetDayList', meta: { title: '工时日报表'}},
         { path: 'xmTaskWorkload/WorkloadSetMonthList', component: _import('xm/core/xmTaskWorkload/WorkloadSetMonthList'), name: 'WorkloadSetMonthList', meta: { title: '工时月报表'}},
       ]
diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadInfo.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadInfo.vue
index 3ddf1d4f..30cce71e 100644
--- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadInfo.vue
+++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadInfo.vue
@@ -7,14 +7,15 @@
         <el-option label="待确认" value="0"></el-option> 
         <el-option label="已确认" value="1"></el-option> 
       </el-select>
-
+      <!--
       <el-select  v-model="filters.sstatus" clearable @change="searchXmTaskWorkloads" placeholder="请选择工时单状态">
         <el-option label="全部结算状态" value=""></el-option>
         <el-option label="无需结算" value="0"></el-option>
-        <el-option label="待结算" value="0"></el-option>
+        <el-option label="待结算" value="1"></el-option>
         <el-option label="已提交" value="2"></el-option> 
         <el-option label="已结算" value="4"></el-option>
       </el-select>
+      -->
 			<el-input v-model="filters.key" style="width: 150px;" clearable placeholder="模糊查询员工名称"></el-input>
 			<el-input v-model="filters.userid" style="width: 150px;" clearable placeholder="员工编号"></el-input>
 			<el-input v-model="filters.taskId" style="width: 150px;" clearable placeholder="任务编号"></el-input>
@@ -49,8 +50,7 @@
 		<el-row class="padding-top">
 			<!--列表 XmTaskWorkload 工时登记表-->
 			<el-table ref="xmTaskWorkloadTable" :data="xmTaskWorkloads" :row-style="{height:'50px'}" :height="maxTableHeight" @sort-change="sortChange" highlight-current-row
-                v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;" :header-cell-style="{'text-align':'center'}"
-                :cell-style="{'text-align':'center'}">
+                v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;"  >
 				<el-table-column  type="selection" width="55" show-overflow-tooltip fixed="left"></el-table-column>
 				<el-table-column sortable type="index" width="55" show-overflow-tooltip fixed="left"></el-table-column>
  				<el-table-column prop="username" label="姓名" min-width="120" show-overflow-tooltip  sortable  fixed="left"> 
@@ -372,8 +372,9 @@
         }
         if(this.queryScope){
           params.queryScope=this.queryScope
+          params.userid=this.userInfo.userid
         }else{
-          params.queryScope="my"
+          params.queryScope="all" 
         }
         if(this.sbillId){
           params.sbillId=this.sbillId
diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadInfoMy.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadInfoMy.vue
new file mode 100644
index 00000000..329df479
--- /dev/null
+++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadInfoMy.vue
@@ -0,0 +1,47 @@
+<template>
+  <section>
+    <xm-task-workload-info queryScope="my"></xm-task-workload-info>
+  </section>
+</template>
+
+<script>
+import {mapGetters} from "vuex";
+import XmTaskWorkloadInfo from "./XmTaskWorkloadInfo";
+
+export default {
+  computed: {
+    ...mapGetters([
+      'userInfo','roles'
+    ]),
+  },
+  watch: {
+
+  },
+  data() {
+    return {
+      visible:true,
+      /**end 自定义属性请在上面加 请加备注**/
+    }
+  },//end data
+  methods: {
+
+    /**end 自定义函数请在上面加**/
+
+  },//end methods
+  components: {
+    XmTaskWorkloadInfo,
+  },
+  mounted() {
+    this.$nextTick(() => {
+
+    });
+  }
+
+
+}
+</script>
+
+<style scoped>
+
+</style>
+
diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleList.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleList.vue
index 09c380bb..f15c2078 100644
--- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleList.vue
+++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleList.vue
@@ -2,7 +2,7 @@
 	<section> 
 		<el-row class="padding-top">
 			<!--列表 XmTaskWorkload 工时登记表-->
-			<el-descriptions title="用户信息" :column="3" :size="size" border>
+			<el-descriptions :column="3" :size="size" border>
 				<el-descriptions-item label="项目">{{xmTask.projectName}}</el-descriptions-item>
 				<el-descriptions-item label="任务" :span="2">{{xmTask.name}}</el-descriptions-item>
 				<el-descriptions-item label="预估工时"><el-tag>{{xmTask.budgetWorkload}} &nbsp;h</el-tag> </el-descriptions-item>
@@ -30,6 +30,18 @@
 						</span>
 					 </template>
 				 </el-table-column>
+ 				<el-table-column prop="sstatus" label="结算状态" min-width="120" show-overflow-tooltip>
+					 <template slot-scope="scope">
+						<div class="cell-text">
+							<el-tag v-for="(item,index) in formatDictsWithClass(dicts,'sstatus',scope.row.sstatus)" :key="index" :type="item.className">{{item.name}}</el-tag>
+						</div>
+						<span class="cell-bar">
+							<el-select  v-model="scope.row.sstatus" placeholder="结算状态"  style="display:block;"  @change="editXmTaskWorkloadSomeFields(scope.row,'sstatus',$event)">
+								<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.sstatus" :key="index"></el-option>
+							</el-select>
+						</span>
+					 </template>
+				 </el-table-column>
 				<el-table-column prop="remark" label="备注" min-width="120" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="ttype" label="任务类型" min-width="80" show-overflow-tooltip>
 					 <template slot-scope="scope">