diff --git a/src/api/xm/core/xmTaskSbill.js b/src/api/xm/core/xmTaskSbill.js new file mode 100644 index 00000000..081c4bd0 --- /dev/null +++ b/src/api/xm/core/xmTaskSbill.js @@ -0,0 +1,30 @@ +import axios from '@/utils/request' + +import config from '@/common/config' + +let base = config.getCoreBasePath(); + + +/** + * 任务结算表 + *1 默认只开放普通查询，所有查询，只要上传 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉， + *2 查询、新增、修改的参数格式 params={id:'结算单据编号 主键',title:'结算单标题',amt:'金额=工时表中结算金额之和',ctime:'创建时间',cuserid:'创建人编号',cusername:'创建人姓名',remark:'备注',branchId:'机构编号',deptid:'部门编号',cpId:'相对方编号(机构写机构号，个人写个人编号)',cpName:'相对方名称（机构写机构名称，个人写个人名称）',workload:'结算工作量=工时表中工时之和',bizMonth:'业务月份yyyy-MM',bizDate:'业务日期yyyy-MM-dd',bizFlowState:'结算流程状态',bizProcInstId:'结算流程实例',ltime:'更新时间',status:'0-待提交，1-已提交，2-已通过，3-已付款，4-已完成',fmsg:'最后审核意见',projectId:'项目编号',projectName:'项目名称'} + **/ + +//普通查询 条件之间and关系 +export const listXmTaskSbill = params => { return axios.get(`${base}/xm/core/xmTaskSbill/list`, { params: params }); }; + +//模糊查询任务结算表 条件之间or关系 +//export const listXmTaskSbillKey = params => { return axios.get(`${base}/xm/core/xmTaskSbill/listKey`, { params: params }); }; + +//删除一条任务结算表 params={id:'结算单据编号 主键'} +export const delXmTaskSbill = params => { return axios.post(`${base}/xm/core/xmTaskSbill/del`,params); }; + +//批量删除任务结算表 params=[{id:'结算单据编号 主键'}] +export const batchDelXmTaskSbill = params => { return axios.post(`${base}/xm/core/xmTaskSbill/batchDel`, params); }; + +//修改一条任务结算表记录 +export const editXmTaskSbill = params => { return axios.post(`${base}/xm/core/xmTaskSbill/edit`, params); }; + +//新增一条任务结算表 +export const addXmTaskSbill = params => { return axios.post(`${base}/xm/core/xmTaskSbill/add`, params); }; diff --git a/src/api/xm/core/xmTaskWorkload.js b/src/api/xm/core/xmTaskWorkload.js new file mode 100644 index 00000000..f85bc730 --- /dev/null +++ b/src/api/xm/core/xmTaskWorkload.js @@ -0,0 +1,30 @@ +import axios from '@/utils/request' + +import config from '@/common/config' + +let base = config.getCoreBasePath(); + + +/** + * 工时登记表 + *1 默认只开放普通查询，所有查询，只要上传 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉， + *2 查询、新增、修改的参数格式 params={id:'主键 主键',userid:'员工编号',username:'姓名',ctime:'创建日期',taskId:'业务对象主键任务编号',cuserid:'创建人编号',bizDate:'业务日期yyyy-MM-dd',wstatus:'状态0-待确认，1-已确认，2-无效',remark:'备注',ttype:'任务类型-关联字典taskType',sbillId:'结算单据编号',stime:'结算提交时间',sstatus:'结算状态0-无需结算，1-待结算2-已提交3-已通过4-已结算',amt:'工时对应金额',samt:'结算金额',workload:'工时，一个task_id可多次提交，小时'} + **/ + +//普通查询 条件之间and关系 +export const listXmTaskWorkload = params => { return axios.get(`${base}/xm/core/xmTaskWorkload/list`, { params: params }); }; + +//模糊查询工时登记表 条件之间or关系 +//export const listXmTaskWorkloadKey = params => { return axios.get(`${base}/xm/core/xmTaskWorkload/listKey`, { params: params }); }; + +//删除一条工时登记表 params={id:'主键 主键'} +export const delXmTaskWorkload = params => { return axios.post(`${base}/xm/core/xmTaskWorkload/del`,params); }; + +//批量删除工时登记表 params=[{id:'主键 主键'}] +export const batchDelXmTaskWorkload = params => { return axios.post(`${base}/xm/core/xmTaskWorkload/batchDel`, params); }; + +//修改一条工时登记表记录 +export const editXmTaskWorkload = params => { return axios.post(`${base}/xm/core/xmTaskWorkload/edit`, params); }; + +//新增一条工时登记表 +export const addXmTaskWorkload = params => { return axios.post(`${base}/xm/core/xmTaskWorkload/add`, params); }; diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js index b7dff47d..2782c8f8 100644 --- a/src/router/routes_xm.js +++ b/src/router/routes_xm.js @@ -14,9 +14,9 @@ export default { icon: 'project' }, // leaf: true,//只有一个节点 - children: [ + children: [ { path: 'xmProject/XmProjectAllMng', component: _import('xm/core/xmProject/XmProjectAllMng'), name: 'xmProjectAllMng', meta: { title: '项目总览' }}, - { path: 'xmProject/XmProjectMng', component: _import('xm/core/xmProject/XmProjectMng'), name: 'xmProjectMng', meta: { title: '项目(我的)' }}, + { path: 'xmProject/XmProjectMng', component: _import('xm/core/xmProject/XmProjectMng'), name: 'xmProjectMng', meta: { title: '项目(我的)' }}, { path: 'xmProjectState/XmProjectStateMng', component: _import('xm/core/xmProjectState/XmProjectStateMng'), name: 'XmProjectStateMng', meta: { title: '项目统计' }}, { path: 'xmBranchState/XmBranchStateMng', component: _import('xm/core/xmBranchState/XmBranchStateMng'), name: 'XmBranchStateMng', meta: { title: '所有项目汇总' }}, { path: 'xmProject/XmProjectRecycle', component: _import('xm/core/xmProject/XmProjectRecycle'), name: 'XmProjectRecycle', meta: { title: '项目回收站' }}, @@ -134,7 +134,7 @@ export default { { path: 'xmIteration/XmIterationMng', component: _import('xm/core/xmIteration/XmIterationMng'), name: 'XmIterationMng', meta: { title: '迭代管理' }}, { path: 'xmIterationMenu/XmIterationMenuMng', component: _import('xm/core/xmIterationMenu/XmIterationMenuMng'), name: 'XmIterationMenuMng', meta: { title: '需求迭代' }}, ] - }, + }, { path: '/xm/core', component: Layout, @@ -146,8 +146,23 @@ export default { }, // leaf: true,//只有一个节点 children: [ - { path: 'xmGroup/XmGroupAllMng', component: _import('xm/core/xmGroup/XmGroupAllMng'), name: 'XmGroupAllMng', meta: { title: '团队管理' }}, - { path: 'xmGroupUser/XmGroupUserMng', component: _import('xm/core/xmGroupUser/XmGroupUserMng'), name: 'XmGroupUserMng', meta: { title: '成员管理' }}, + { path: 'xmGroup/XmGroupAllMng', component: _import('xm/core/xmGroup/XmGroupAllMng'), name: 'XmGroupAllMng', meta: { title: '团队管理' }}, + { path: 'xmGroupUser/XmGroupUserMng', component: _import('xm/core/xmGroupUser/XmGroupUserMng'), name: 'XmGroupUserMng', meta: { title: '成员管理' }}, + ] + }, + { + path: '/xm/core', + component: Layout, + name: 'TaskSbill', + iconCls: 'fa el-icon-menu', + meta: { + menu:true, + title: '任务结算', + icon: 'task' + }, + //leaf: true,//只有一个节点 + children: [ + { path: 'xmTaskSbill/XmTaskSbillMng', component: _import('xm/core/xmTaskSbill/XmTaskSbillMng'), name: 'XmTaskSbilllMng', meta: { title: '任务结算',icon:'task' }}, ] } ] diff --git a/src/views/xm/core/xmTaskSbill/SelectXmProject.vue b/src/views/xm/core/xmTaskSbill/SelectXmProject.vue new file mode 100644 index 00000000..0a6e3e82 --- /dev/null +++ b/src/views/xm/core/xmTaskSbill/SelectXmProject.vue @@ -0,0 +1,135 @@ + + + + + diff --git a/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue b/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue new file mode 100644 index 00000000..5706b5ce --- /dev/null +++ b/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue @@ -0,0 +1,217 @@ + + + + + diff --git a/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue b/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue new file mode 100644 index 00000000..f8a37e16 --- /dev/null +++ b/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue @@ -0,0 +1,265 @@ + + + + + diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue new file mode 100644 index 00000000..bd501905 --- /dev/null +++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue @@ -0,0 +1,174 @@ + + + + + diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue new file mode 100644 index 00000000..0d49d0e6 --- /dev/null +++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue @@ -0,0 +1,260 @@ + + + + +