diff --git a/src/api/xm/core/xmTaskSbill.js b/src/api/xm/core/xmTaskSbill.js index b9724d01..1469d56d 100644 --- a/src/api/xm/core/xmTaskSbill.js +++ b/src/api/xm/core/xmTaskSbill.js @@ -30,6 +30,7 @@ export const addXmTaskSbill = params => { return axios.post(`${base}/xm/core/xmT //批量修改某些字段 export const editSomeFieldsXmTaskSbill = params => { return axios.post(`${base}/xm/core/xmTaskSbill/editSomeFields`, params); }; +export const batchJoinToSbill = params => { return axios.post(`${base}/xm/core/xmTaskSbill/batchJoinToSbill`, params); }; /**-------------------------前端mng|add|edit界面公共函数---------------请写在下面----------------------------------------------- */ diff --git a/src/api/xm/core/xmTaskWorkload.js b/src/api/xm/core/xmTaskWorkload.js index 0de0a4ef..46cbfaf0 100644 --- a/src/api/xm/core/xmTaskWorkload.js +++ b/src/api/xm/core/xmTaskWorkload.js @@ -46,6 +46,9 @@ export const batchSetSbillIdNull = params => { return axios.post(`${base}/xm/cor export const listXmTaskWorkloadGroupByTaskIdAndUserid = params => { return axios.get(`${base}/xm/core/xmTaskWorkload/ListGroupByTaskIdAndUserid`, { params: params }); }; +export const listXmTaskWorkloadGroupByTaskIdAndUseridToSet = params => { return axios.get(`${base}/xm/core/xmTaskWorkload/ListGroupByTaskIdAndUseridToSet`, { params: params }); }; + + /**-------------------------前端mng|add|edit界面公共函数---------------请写在下面----------------------------------------------- */ diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js index bc2487dd..fa830fe3 100644 --- a/src/router/routes_xm.js +++ b/src/router/routes_xm.js @@ -179,7 +179,8 @@ export default { { 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/WorkloadSetMonthListMy', component: _import('xm/core/xmTaskWorkload/WorkloadSetMonthListMy'), name: 'WorkloadSetMonthListMy', meta: { title: '工时月报表(我)'}}, + { path: 'xmTaskWorkload/XmTaskWorkloadInfoToSet', component: _import('xm/core/xmTaskWorkload/XmTaskWorkloadInfoToSet'), name: 'XmTaskWorkloadInfoToSet', 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 30cce71e..6588c781 100644 --- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadInfo.vue +++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadInfo.vue @@ -82,11 +82,6 @@ - - -