diff --git a/src/api/xm/core/xmProjectGroup.js b/src/api/xm/core/xmProjectGroup.js index d910e5f0..bd913eef 100644 --- a/src/api/xm/core/xmProjectGroup.js +++ b/src/api/xm/core/xmProjectGroup.js @@ -4,10 +4,11 @@ import config from '@/common/config' let base = config.getCoreBasePath(); + /** * xm_project_group *1 默认只开放普通查询，所有查询，只要上传 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉， - *2 查询、新增、修改的参数格式 params={id:'主键 主键',groupName:'团队名称',projectId:'项目编号'} + *2 查询、新增、修改的参数格式 params={id:'主键 主键',groupName:'团队名称',projectId:'项目编号-属于产品线则可为空',pgTypeId:'项目团队类型编号',pgTypeName:'团队类型名称',leaderUserid:'团队负责人',leaderUsername:'负责人姓名',ctime:'创建时间',ltime:'更新时间',productId:'产品编号，属于项目组的团队则可为空',branchId:'机构编号',pgClass:'团队类别0项目1产品',pgroupId:'上级团队编号',lvl:'级别0级1级2级3级4级',pidPaths:'上级编号路径逗号分割,0,开始，本组编号+逗号结束',isTpl:'是否为模板',assUserid:'副组长编号',assUsername:'副组长姓名',childrenCnt:'下级团队数量',userCnt:'组员数量',qxCode:'权限码',calcWorkload:'是否计算工作量0否1是',ntype:'节点类型0管理团队、1执行团队'} **/ //普通查询 条件之间and关系 @@ -28,7 +29,8 @@ export const editXmProjectGroup = params => { return axios.post(`${base}/xm/core //新增一条xm_project_group export const addXmProjectGroup = params => { return axios.post(`${base}/xm/core/xmProjectGroup/add`, params); }; -export const updateGroup = params => { return axios.post(`${base}/xm/core/xmProjectGroup/updateGroup`, params); }; +export const getGroups = params => { return axios.get(`${base}/xm/core/xmProjectGroup/getGroups`, { params: params }); }; + -export const getProjectGroup = params => { return axios.get(`${base}/xm/core/xmProjectGroup/getGroup`, { params: params }); }; + \ No newline at end of file diff --git a/src/api/xm/core/xmProjectGroupUser.js b/src/api/xm/core/xmProjectGroupUser.js index 8b30e0c8..34bff9ff 100644 --- a/src/api/xm/core/xmProjectGroupUser.js +++ b/src/api/xm/core/xmProjectGroupUser.js @@ -4,10 +4,11 @@ import config from '@/common/config' let base = config.getCoreBasePath(); + /** * xm_project_group_user *1 默认只开放普通查询，所有查询，只要上传 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉， - *2 查询、新增、修改的参数格式 params={id:'主键 主键',groupId:'团队编号',userid:'团队成员编号',username:'团队成员'} + *2 查询、新增、修改的参数格式 params={groupId:'团队编号 主键',userid:'团队成员编号 主键',joinTime:'加入时间',username:'团队成员',outTime:'离队时间',status:'当前状态0参与中1已退出团队',obranchId:'组员原归属机构编号',isPri:'是否私人加入0否1是',seqNo:'排序号--从1开始',projectId:'项目编号',productId:'产品编号',pgClass:'0-项目，1-产品'} **/ //普通查询 条件之间and关系 @@ -16,10 +17,10 @@ export const listXmProjectGroupUser = params => { return axios.get(`${base}/xm/c //模糊查询xm_project_group_user 条件之间or关系 //export const listXmProjectGroupUserKey = params => { return axios.get(`${base}/xm/core/xmProjectGroupUser/listKey`, { params: params }); }; -//删除一条xm_project_group_user params={id:'主键 主键'} +//删除一条xm_project_group_user params={groupId:'团队编号 主键',userid:'团队成员编号 主键'} export const delXmProjectGroupUser = params => { return axios.post(`${base}/xm/core/xmProjectGroupUser/del`,params); }; -//批量删除xm_project_group_user params=[{id:'主键 主键'}] +//批量删除xm_project_group_user params=[{groupId:'团队编号 主键',userid:'团队成员编号 主键'}] export const batchDelXmProjectGroupUser = params => { return axios.post(`${base}/xm/core/xmProjectGroupUser/batchDel`, params); }; //修改一条xm_project_group_user记录 diff --git a/src/views/xm/core/xmProject/XmProjectAdd.vue b/src/views/xm/core/xmProject/XmProjectAdd.vue index cb3be822..e6464a98 100644 --- a/src/views/xm/core/xmProject/XmProjectAdd.vue +++ b/src/views/xm/core/xmProject/XmProjectAdd.vue @@ -144,7 +144,7 @@ import XmProjectGroupFormwork from '../xmProjectGroupFormwork/XmProjectGroupFormwork'; - import { getProjectGroup } from '@/api/xm/core/xmProjectGroup'; + import { getGroups } from '@/api/xm/core/xmProjectGroup'; export default { computed: { diff --git a/src/views/xm/core/xmProject/XmProjectEdit.vue b/src/views/xm/core/xmProject/XmProjectEdit.vue index f6d993e0..2c5de150 100644 --- a/src/views/xm/core/xmProject/XmProjectEdit.vue +++ b/src/views/xm/core/xmProject/XmProjectEdit.vue @@ -141,7 +141,7 @@ import XmProjectGroupFormwork from '../xmProjectGroupFormwork/XmProjectGroupFormwork'; - import { getProjectGroup } from '@/api/xm/core/xmProjectGroup'; + import { getGroups } from '@/api/xm/core/xmProjectGroup'; import html2canvas from 'html2canvas' export default { @@ -440,7 +440,7 @@ let params = {}; params.projectId = this.editForm.id; params.branchId = this.userInfo.branchId; - getProjectGroup(params).then((res) => { + getGroups(params).then((res) => { var tips=res.data.tips; if(tips.isOk){ this.xmProjectGroups = res.data.data; diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupAdd.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupAdd.vue deleted file mode 100644 index e157fd1c..00000000 --- a/src/views/xm/core/xmProjectGroup/XmProjectGroupAdd.vue +++ /dev/null @@ -1,114 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue index c46c6e61..fc66fb58 100644 --- a/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue +++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue @@ -1,104 +1,189 @@ \ No newline at end of file diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupOkr.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupOkr.vue new file mode 100644 index 00000000..ad1b7216 --- /dev/null +++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupOkr.vue @@ -0,0 +1,211 @@ + + + + + \ No newline at end of file diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue index 762a760a..fa1afb2c 100644 --- a/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue +++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue @@ -35,7 +35,7 @@ import util from '@/common/js/util'; //全局公共库 //import Sticky from '@/components/Sticky' // 粘性header组件 import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 - import { getProjectGroup } from '@/api/xm/core/xmProjectGroup'; + import { getGroups } from '@/api/xm/core/xmProjectGroup'; import XmProjectList from '../xmProject/XmProjectList'; import {mapGetters} from 'vuex' @@ -131,7 +131,7 @@ } this.$emit("user-confirm",users); }, - getProjectGroup(){ + getGroups(){ var params={}; if(this.filters.selProject){ params.projectId=this.filters.selProject.id @@ -143,7 +143,7 @@ }); return; } - getProjectGroup(params).then(res=>{ + getGroups(params).then(res=>{ var tips = res.data.tips; if(tips.isOk){ this.selGroups=res.data.data; @@ -156,7 +156,7 @@ onPorjectConfirm:function(project){ this.filters.selProject=project this.selectProjectVisible=false; - this.getProjectGroup(); + this.getGroups(); }, /**end 自定义函数请在上面加**/ @@ -179,7 +179,7 @@ if(this.selProject){ this.filters.selProject=this.selProject } - this.getProjectGroup(); + this.getGroups(); listOption([{categoryId:'all',itemCode:'projectGroupType'}] ).then(res=>{ if(res.data.tips.isOk){ this.options['projectGroupType']=res.data.data.projectGroupType diff --git a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue index 31649fef..006598cd 100644 --- a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue +++ b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue @@ -1,10 +1,12 @@ \ No newline at end of file