diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js
index c55fb7ff..180fbca0 100644
--- a/src/router/routes_xm.js
+++ b/src/router/routes_xm.js
@@ -181,9 +181,13 @@ export default {
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/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: 'xmTaskWorkload/ToComfirmWorkload', component: _import('xm/core/xmTaskWorkload/ToComfirmWorkload'), name: 'ToComfirmWorkload', 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: 'xmTaskWorkload/ToComfirmWorkload', component: _import('xm/core/xmTaskWorkload/ToComfirmWorkload'), name: 'ToComfirmWorkload', 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/ToComfirmWorkloadAll', component: _import('xm/core/xmTaskWorkload/ToComfirmWorkloadAll'), name: 'ToComfirmWorkloadAll', meta: { title: '待确认工时'}},
]
}
]
diff --git a/src/views/xm/core/xmTaskWorkload/FinWorkloadToSbillAll.vue b/src/views/xm/core/xmTaskWorkload/FinWorkloadToSbillAll.vue
new file mode 100644
index 00000000..0f47e9aa
--- /dev/null
+++ b/src/views/xm/core/xmTaskWorkload/FinWorkloadToSbillAll.vue
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/xm/core/xmTaskWorkload/ToComfirmWorkloadAll.vue b/src/views/xm/core/xmTaskWorkload/ToComfirmWorkloadAll.vue
new file mode 100644
index 00000000..20c2a10a
--- /dev/null
+++ b/src/views/xm/core/xmTaskWorkload/ToComfirmWorkloadAll.vue
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
diff --git a/src/views/xm/core/xmTaskWorkload/WaitWorkloadToSbillAll.vue b/src/views/xm/core/xmTaskWorkload/WaitWorkloadToSbillAll.vue
new file mode 100644
index 00000000..3f7434f5
--- /dev/null
+++ b/src/views/xm/core/xmTaskWorkload/WaitWorkloadToSbillAll.vue
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue
index 990b0853..c17a29f4 100644
--- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue
+++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue
@@ -234,7 +234,7 @@
UsersSelect,
XmTaskWorkloadSimpleList,
},
- props:['visible','wstatuses','sstatuses'],
+ props:['visible','wstatuses','sstatuses','queryScope'/**my/all */],
computed: {
...mapGetters(['userInfo']),
@@ -376,6 +376,11 @@
params.startBidDate = this.dateRanger[0];
params.endBizDate = this.dateRanger[1];
}
+ if(this.queryScope){
+ params.queryScope=this.queryScope
+ }else{
+ params.queryScope="my"
+ }
this.load.list = true;
listXmTaskWorkload(params).then((res) => {