diff --git a/src/api/xm/core/xmProjectGroup.js b/src/api/xm/core/xmGroup.js similarity index 67% rename from src/api/xm/core/xmProjectGroup.js rename to src/api/xm/core/xmGroup.js index be0ad367..355eb6b1 100644 --- a/src/api/xm/core/xmProjectGroup.js +++ b/src/api/xm/core/xmGroup.js @@ -12,24 +12,24 @@ let base = config.getCoreBasePath(); **/ //普通查询 条件之间and关系 -export const listXmProjectGroup = params => { return axios.get(`${base}/xm/core/xmProjectGroup/list`, { params: params }); }; +export const listXmGroup = params => { return axios.get(`${base}/xm/core/xmGroup/list`, { params: params }); }; //模糊查询xm_group 条件之间or关系 -//export const listXmProjectGroupKey = params => { return axios.get(`${base}/xm/core/xmProjectGroup/listKey`, { params: params }); }; +//export const listXmGroupKey = params => { return axios.get(`${base}/xm/core/xmGroup/listKey`, { params: params }); }; //删除一条xm_group params={id:'主键 主键'} -export const delXmProjectGroup = params => { return axios.post(`${base}/xm/core/xmProjectGroup/del`,params); }; +export const delXmGroup = params => { return axios.post(`${base}/xm/core/xmGroup/del`,params); }; //批量删除xm_group params=[{id:'主键 主键'}] -export const batchDelXmProjectGroup = params => { return axios.post(`${base}/xm/core/xmProjectGroup/batchDel`, params); }; +export const batchDelXmGroup = params => { return axios.post(`${base}/xm/core/xmGroup/batchDel`, params); }; //修改一条xm_group记录 -export const editXmProjectGroup = params => { return axios.post(`${base}/xm/core/xmProjectGroup/edit`, params); }; +export const editXmGroup = params => { return axios.post(`${base}/xm/core/xmGroup/edit`, params); }; //新增一条xm_group -export const addXmProjectGroup = params => { return axios.post(`${base}/xm/core/xmProjectGroup/add`, params); }; +export const addXmGroup = params => { return axios.post(`${base}/xm/core/xmGroup/add`, params); }; -export const getGroups = params => { return axios.get(`${base}/xm/core/xmProjectGroup/getGroups`, { params: params }); }; +export const getGroups = params => { return axios.get(`${base}/xm/core/xmGroup/getGroups`, { params: params }); }; diff --git a/src/api/xm/core/xmProjectGroupState.js b/src/api/xm/core/xmGroupState.js similarity index 72% rename from src/api/xm/core/xmProjectGroupState.js rename to src/api/xm/core/xmGroupState.js index 1409be63..4839e4c7 100644 --- a/src/api/xm/core/xmProjectGroupState.js +++ b/src/api/xm/core/xmGroupState.js @@ -12,22 +12,22 @@ let base = config.getCoreBasePath(); **/ //普通查询 条件之间and关系 -export const listXmProjectGroupState = params => { return axios.get(`${base}/xm/core/xmProjectGroupState/list`, { params: params }); }; +export const listXmGroupState = params => { return axios.get(`${base}/xm/core/xmGroupState/list`, { params: params }); }; //模糊查询功能状态表,无需前端维护，所有数据由汇总统计得出 条件之间or关系 -//export const listXmProjectGroupStateKey = params => { return axios.get(`${base}/xm/core/xmProjectGroupState/listKey`, { params: params }); }; +//export const listXmGroupStateKey = params => { return axios.get(`${base}/xm/core/xmGroupState/listKey`, { params: params }); }; //删除一条功能状态表,无需前端维护，所有数据由汇总统计得出 params={id:'主键 主键'} -export const delXmProjectGroupState = params => { return axios.post(`${base}/xm/core/xmProjectGroupState/del`,params); }; +export const delXmGroupState = params => { return axios.post(`${base}/xm/core/xmGroupState/del`,params); }; //批量删除功能状态表,无需前端维护，所有数据由汇总统计得出 params=[{id:'主键 主键'}] -export const batchDelXmProjectGroupState = params => { return axios.post(`${base}/xm/core/xmProjectGroupState/batchDel`, params); }; +export const batchDelXmGroupState = params => { return axios.post(`${base}/xm/core/xmGroupState/batchDel`, params); }; //修改一条功能状态表,无需前端维护，所有数据由汇总统计得出记录 -export const editXmProjectGroupState = params => { return axios.post(`${base}/xm/core/xmProjectGroupState/edit`, params); }; +export const editXmGroupState = params => { return axios.post(`${base}/xm/core/xmGroupState/edit`, params); }; //新增一条功能状态表,无需前端维护，所有数据由汇总统计得出 -export const addXmProjectGroupState = params => { return axios.post(`${base}/xm/core/xmProjectGroupState/add`, params); }; +export const addXmGroupState = params => { return axios.post(`${base}/xm/core/xmGroupState/add`, params); }; -export const loadTasksToXmProjectGroupState = params => { return axios.post(`${base}/xm/core/xmProjectGroupState/loadTasksToXmProjectGroupState`, params); }; +export const loadTasksToXmGroupState = params => { return axios.post(`${base}/xm/core/xmGroupState/loadTasksToXmGroupState`, params); }; diff --git a/src/api/xm/core/xmProjectGroupUser.js b/src/api/xm/core/xmGroupUser.js similarity index 60% rename from src/api/xm/core/xmProjectGroupUser.js rename to src/api/xm/core/xmGroupUser.js index 7b432352..e287680b 100644 --- a/src/api/xm/core/xmProjectGroupUser.js +++ b/src/api/xm/core/xmGroupUser.js @@ -12,21 +12,21 @@ let base = config.getCoreBasePath(); **/ //普通查询 条件之间and关系 -export const listXmProjectGroupUser = params => { return axios.get(`${base}/xm/core/xmProjectGroupUser/list`, { params: params }); }; +export const listXmGroupUser = params => { return axios.get(`${base}/xm/core/xmGroupUser/list`, { params: params }); }; //模糊查询xm_group_user 条件之间or关系 -//export const listXmProjectGroupUserKey = params => { return axios.get(`${base}/xm/core/xmProjectGroupUser/listKey`, { params: params }); }; +//export const listXmGroupUserKey = params => { return axios.get(`${base}/xm/core/xmGroupUser/listKey`, { params: params }); }; //删除一条xm_group_user params={groupId:'团队编号 主键',userid:'团队成员编号 主键'} -export const delXmProjectGroupUser = params => { return axios.post(`${base}/xm/core/xmProjectGroupUser/del`,params); }; +export const delXmGroupUser = params => { return axios.post(`${base}/xm/core/xmGroupUser/del`,params); }; //批量删除xm_group_user params=[{groupId:'团队编号 主键',userid:'团队成员编号 主键'}] -export const batchDelXmProjectGroupUser = params => { return axios.post(`${base}/xm/core/xmProjectGroupUser/batchDel`, params); }; +export const batchDelXmGroupUser = params => { return axios.post(`${base}/xm/core/xmGroupUser/batchDel`, params); }; //修改一条xm_group_user记录 -export const editXmProjectGroupUser = params => { return axios.post(`${base}/xm/core/xmProjectGroupUser/edit`, params); }; +export const editXmGroupUser = params => { return axios.post(`${base}/xm/core/xmGroupUser/edit`, params); }; //新增一条xm_group_user -export const addXmProjectGroupUser = params => { return axios.post(`${base}/xm/core/xmProjectGroupUser/add`, params); }; +export const addXmGroupUser = params => { return axios.post(`${base}/xm/core/xmGroupUser/add`, params); }; //批量删除xm_group_user params=[{groupId:'团队编号 主键',userid:'团队成员编号 主键'}] -export const batchAddXmProjectGroupUser = params => { return axios.post(`${base}/xm/core/xmProjectGroupUser/batchAdd`, params); }; \ No newline at end of file +export const batchAddXmGroupUser = params => { return axios.post(`${base}/xm/core/xmGroupUser/batchAdd`, params); }; \ No newline at end of file diff --git a/src/api/xm/core/xmProjectGroupFormwork.js b/src/api/xm/core/xmProjectGroupFormwork.js index 2b310ff6..59bdda5a 100644 --- a/src/api/xm/core/xmProjectGroupFormwork.js +++ b/src/api/xm/core/xmProjectGroupFormwork.js @@ -8,12 +8,12 @@ let base = config.getCoreBasePath(); *1 默认只开放普通查询，所有查询，只要上传 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉， *2 查询、新增、修改的参数格式 params={id:'主键 主键',branchId:'机构编号',groupName:'团队名称',isPub:'是否公共，0为否，1为是'} **/ -export const listXmProjectGroupFormwork = params => { return axios.get(`${base}/xm/core/xmProjectGroupFormwork/list`, { params: params }); }; +export const listXmGroupFormwork = params => { return axios.get(`${base}/xm/core/xmGroupFormwork/list`, { params: params }); }; -export const delXmProjectGroupFormwork = params => { return axios.post(`${base}/xm/core/xmProjectGroupFormwork/del`,params); }; +export const delXmGroupFormwork = params => { return axios.post(`${base}/xm/core/xmGroupFormwork/del`,params); }; -export const batchDelXmProjectGroupFormwork = params => { return axios.post(`${base}/xm/core/xmProjectGroupFormwork/batchDel`, params); }; +export const batchDelXmGroupFormwork = params => { return axios.post(`${base}/xm/core/xmGroupFormwork/batchDel`, params); }; -export const editXmProjectGroupFormwork = params => { return axios.post(`${base}/xm/core/xmProjectGroupFormwork/edit`, params); }; +export const editXmGroupFormwork = params => { return axios.post(`${base}/xm/core/xmGroupFormwork/edit`, params); }; -export const addXmProjectGroupFormwork = params => { return axios.post(`${base}/xm/core/xmProjectGroupFormwork/add`, params); }; \ No newline at end of file +export const addXmGroupFormwork = params => { return axios.post(`${base}/xm/core/xmGroupFormwork/add`, params); }; \ No newline at end of file diff --git a/src/api/xm/core/xmProjectGroupUserCandidate.js b/src/api/xm/core/xmProjectGroupUserCandidate.js index 432e255f..50a5fd20 100644 --- a/src/api/xm/core/xmProjectGroupUserCandidate.js +++ b/src/api/xm/core/xmProjectGroupUserCandidate.js @@ -12,19 +12,19 @@ let base = config.getCoreBasePath(); **/ //普通查询 条件之间and关系 -export const listXmProjectGroupUserCandidate = params => { return axios.get(`${base}/xm/core/xmProjectGroupUserCandidate/list`, { params: params }); }; +export const listXmGroupUserCandidate = params => { return axios.get(`${base}/xm/core/xmGroupUserCandidate/list`, { params: params }); }; //模糊查询xm_group_user_candidate 条件之间or关系 -//export const listXmProjectGroupUserCandidateKey = params => { return axios.get(`${base}/xm/core/xmProjectGroupUserCandidate/listKey`, { params: params }); }; +//export const listXmGroupUserCandidateKey = params => { return axios.get(`${base}/xm/core/xmGroupUserCandidate/listKey`, { params: params }); }; //删除一条xm_group_user_candidate params={id:'主键 主键'} -export const delXmProjectGroupUserCandidate = params => { return axios.post(`${base}/xm/core/xmProjectGroupUserCandidate/del`,params); }; +export const delXmGroupUserCandidate = params => { return axios.post(`${base}/xm/core/xmGroupUserCandidate/del`,params); }; //批量删除xm_group_user_candidate params=[{id:'主键 主键'}] -export const batchDelXmProjectGroupUserCandidate = params => { return axios.post(`${base}/xm/core/xmProjectGroupUserCandidate/batchDel`, params); }; +export const batchDelXmGroupUserCandidate = params => { return axios.post(`${base}/xm/core/xmGroupUserCandidate/batchDel`, params); }; //修改一条xm_group_user_candidate记录 -export const editXmProjectGroupUserCandidate = params => { return axios.post(`${base}/xm/core/xmProjectGroupUserCandidate/edit`, params); }; +export const editXmGroupUserCandidate = params => { return axios.post(`${base}/xm/core/xmGroupUserCandidate/edit`, params); }; //新增一条xm_group_user_candidate -export const addXmProjectGroupUserCandidate = params => { return axios.post(`${base}/xm/core/xmProjectGroupUserCandidate/add`, params); }; \ No newline at end of file +export const addXmGroupUserCandidate = params => { return axios.post(`${base}/xm/core/xmGroupUserCandidate/add`, params); }; \ No newline at end of file diff --git a/src/components/Guider/guiderData.js b/src/components/Guider/guiderData.js index 038da120..3a961d65 100644 --- a/src/components/Guider/guiderData.js +++ b/src/components/Guider/guiderData.js @@ -36,7 +36,7 @@ var xmHomePage=[ padding: 5, }, { - element: '#XmProjectGroupAllMng', + element: '#XmGroupAllMng', popover: { title: ' ', description: '这里可以快速创建项目、产品团队、快速管理团队成员。', diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js index fe7eba1d..8fce1f8e 100644 --- a/src/router/routes_xm.js +++ b/src/router/routes_xm.js @@ -148,8 +148,8 @@ export default { }, // leaf: true,//只有一个节点 children: [ - { path: 'xmProjectGroup/XmProjectGroupAllMng', component: _import('xm/core/xmProjectGroup/XmProjectGroupAllMng'), name: 'XmProjectGroupAllMng', meta: { title: '团队管理' }}, - { path: 'xmProjectGroupUser/XmProjectGroupUserMng', component: _import('xm/core/xmProjectGroupUser/XmProjectGroupUserMng'), name: 'XmProjectGroupUserMng', 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: '成员管理' }}, ] } ] diff --git a/src/views/datav/xm/project/index.vue b/src/views/datav/xm/project/index.vue index 2eafe581..aa61703d 100644 --- a/src/views/datav/xm/project/index.vue +++ b/src/views/datav/xm/project/index.vue @@ -42,7 +42,7 @@ import cards from './cards' import config from '@/common/config';//全局公共库 import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 import { listXmProjectState } from '@/api/xm/core/xmProjectState'; - import { listXmProjectGroupState} from '@/api/xm/core/xmProjectGroupState'; + import { listXmGroupState} from '@/api/xm/core/xmGroupState'; import { listXmProjectTaskTypeState } from '@/api/xm/core/xmProjectTaskTypeState'; import { listXmRecord } from '@/api/xm/core/xmRecord'; import { listXmProjectPhase } from '@/api/xm/core/xmProjectPhase'; @@ -192,10 +192,10 @@ export default { return digitalFlopData; }, rankingBoardData(){ - if( !this.xmProjectGroupStates || this.xmProjectGroupStates.length==0 ){ + if( !this.xmGroupStates || this.xmGroupStates.length==0 ){ return []; } - var rankingBoardData=this.xmProjectGroupStates.map(i=>{ + var rankingBoardData=this.xmGroupStates.map(i=>{ return {name:i.groupName,value:i.finishRate+'%'} }) return rankingBoardData @@ -274,7 +274,7 @@ export default { projectId:null, }, xmProjectState:null, - xmProjectGroupStates:[], + xmGroupStates:[], xmProjectTaskTypeStates:[], xmRecords:[], xmProjectPhases:[], @@ -291,7 +291,7 @@ export default { orderDirs:["desc"]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc'] }, - xmProjectGroupStatePageInfo:{//分页数据 + xmGroupStatePageInfo:{//分页数据 total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。 pageSize:5,//每页数据 count:false,//是否需要重新计算总记录数 @@ -325,27 +325,27 @@ export default { } }); }, - getXmProjectGroupStates(){ + getXmGroupStates(){ let params = { - pageSize: this.xmProjectGroupStatePageInfo.pageSize, - pageNum: this.xmProjectGroupStatePageInfo.pageNum, - total: this.xmProjectGroupStatePageInfo.total, - count:this.xmProjectGroupStatePageInfo.count + pageSize: this.xmGroupStatePageInfo.pageSize, + pageNum: this.xmGroupStatePageInfo.pageNum, + total: this.xmGroupStatePageInfo.total, + count:this.xmGroupStatePageInfo.count }; - if(this.xmProjectGroupStatePageInfo.orderFields!=null && this.xmProjectGroupStatePageInfo.orderFields.length>0){ + if(this.xmGroupStatePageInfo.orderFields!=null && this.xmGroupStatePageInfo.orderFields.length>0){ let orderBys=[]; - for(var i=0;i{ + listXmGroupState(params).then(res=>{ var tips = res.data.tips; if(tips.isOk){ if(res.data.data.length>0){ - this.xmProjectGroupStates=res.data.data + this.xmGroupStates=res.data.data } } }); @@ -431,7 +431,7 @@ export default { this.filters.projectId=this.$route.params.projectId; } this.getXmProjectState(); - this.getXmProjectGroupStates(); + this.getXmGroupStates(); this.getXmProjectTaskTypeStates(); this.getXmRecords(); this.getXmProjectPhases(); diff --git a/src/views/xm/XmOverview.vue b/src/views/xm/XmOverview.vue index fe699ab6..0891f80d 100644 --- a/src/views/xm/XmOverview.vue +++ b/src/views/xm/XmOverview.vue @@ -155,7 +155,7 @@
开发任务
-
+
diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupAllMng.vue b/src/views/xm/core/xmGroup/XmGroupAllMng.vue similarity index 88% rename from src/views/xm/core/xmProjectGroup/XmProjectGroupAllMng.vue rename to src/views/xm/core/xmGroup/XmGroupAllMng.vue index 36e8bbca..af60faed 100644 --- a/src/views/xm/core/xmProjectGroup/XmProjectGroupAllMng.vue +++ b/src/views/xm/core/xmGroup/XmGroupAllMng.vue @@ -8,7 +8,7 @@ import util from '@/common/js/util';//全局公共库 //import Sticky from '@/components/Sticky' // 粘性header组件 import { mapGetters } from 'vuex' - import XmProjectGroupMng from './XmProjectGroupMng.vue'; + import XmGroupMng from './XmGroupMng.vue'; export default { computed: { @@ -31,7 +31,7 @@ export default { },//end methods components: { - XmProjectGroupMng, + XmGroupMng, //在下面添加其它组件 }, mounted() { diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue b/src/views/xm/core/xmGroup/XmGroupEdit.vue similarity index 91% rename from src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue rename to src/views/xm/core/xmGroup/XmGroupEdit.vue index 8ebd70b8..a5476e1c 100644 --- a/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue +++ b/src/views/xm/core/xmGroup/XmGroupEdit.vue @@ -3,7 +3,7 @@ - + @@ -50,13 +50,13 @@ import util from '@/common/js/util';//全局公共库 import config from "@/common/config"; //全局公共库import import { getDicts,initSimpleDicts,initComplexDicts } from '@/api/mdp/meta/item';//字典表 - import { addXmProjectGroup,editXmProjectGroup } from '@/api/xm/core/xmProjectGroup'; + import { addXmGroup,editXmGroup } from '@/api/xm/core/xmGroup'; import { mapGetters } from 'vuex' import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; import BranchSelect from '@/views/mdp/sys/branch/BranchSelect';//机构选择 export default { - name:'xmProjectGroupEdit', + name:'xmGroupEdit', components: { UsersSelect,BranchSelect, }, @@ -64,12 +64,12 @@ ...mapGetters([ 'userInfo' ]), }, - props:['xmProjectGroup','visible','opType'], + props:['xmGroup','visible','opType'], watch: { - 'xmProjectGroup':function( xmProjectGroup ) { - if(xmProjectGroup){ - this.editForm = xmProjectGroup; + 'xmGroup':function( xmGroup ) { + if(xmGroup){ + this.editForm = xmGroup; } }, @@ -105,16 +105,16 @@ this.$refs['editFormRef'].resetFields(); this.$emit('cancel'); }, - //新增、编辑提交XmProjectGroup xm_group父组件监听@submit="afterEditSubmit" + //新增、编辑提交XmGroup xm_group父组件监听@submit="afterEditSubmit" saveSubmit: function () { this.$refs.editFormRef.validate((valid) => { if (valid) { this.$confirm('确认提交吗？', '提示', {}).then(() => { this.load.edit=true let params = Object.assign({}, this.editForm); - var func=addXmProjectGroup + var func=addXmGroup if(this.currOpType=='edit'){ - func=editXmProjectGroup + func=editXmGroup } func(params).then((res) => { this.load.edit=false @@ -134,8 +134,8 @@ }, initData: function(){ this.currOpType=this.opType - if(this.xmProjectGroup){ - this.editForm = Object.assign({},this.xmProjectGroup); + if(this.xmGroup){ + this.editForm = Object.assign({},this.xmGroup); } if(this.opType=='edit'){ diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue b/src/views/xm/core/xmGroup/XmGroupMng.vue similarity index 90% rename from src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue rename to src/views/xm/core/xmGroup/XmGroupMng.vue index edaf6d75..6e5b0230 100644 --- a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue +++ b/src/views/xm/core/xmGroup/XmGroupMng.vue @@ -4,7 +4,7 @@ - 查询 + 查询 小组进度 变化日志 绑定即聊情况 @@ -23,12 +23,12 @@ > - + - + @@ -162,14 +162,14 @@ - - + + - - + + - - + + @@ -191,27 +191,27 @@ import treeTool from '@/common/js/treeTool';//全局公共库 import config from '@/common/config';//全局公共库 import { getDicts,initSimpleDicts,initComplexDicts } from '@/api/mdp/meta/item';//字典表 - import { listXmProjectGroup, delXmProjectGroup, batchDelXmProjectGroup,getGroups } from '@/api/xm/core/xmProjectGroup'; - import XmProjectGroupEdit from './XmProjectGroupEdit';//新增修改界面 + import { listXmGroup, delXmGroup, batchDelXmGroup,getGroups } from '@/api/xm/core/xmGroup'; + import XmGroupEdit from './XmGroupEdit';//新增修改界面 import { mapGetters } from 'vuex' import {VueOkrTree} from 'vue-okr-tree'; import 'vue-okr-tree/dist/vue-okr-tree.css' import { listImGroup} from '@/api/mdp/im/group/imGroup'; import { publishMessage} from '@/api/mdp/im/imPush'; - import { listXmProjectGroupUser, delXmProjectGroupUser, batchDelXmProjectGroupUser,batchAddXmProjectGroupUser } from '@/api/xm/core/xmProjectGroupUser'; + import { listXmGroupUser, delXmGroupUser, batchDelXmGroupUser,batchAddXmGroupUser } from '@/api/xm/core/xmGroupUser'; import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; - import XmProjectGroupStateMng from '../xmProjectGroupState/XmProjectGroupStateMng';//修改界面 - import XmProjectGroupUserMng from '../xmProjectGroupUser/XmProjectGroupUserMng';//修改界面 + import XmGroupStateMng from '../xmGroupState/XmGroupStateMng';//修改界面 + import XmGroupUserMng from '../xmGroupUser/XmGroupUserMng';//修改界面 import XmProjectList from '../xmProject/XmProjectList'; import XmProductSelect from '../xmProduct/XmProductSelect.vue'; export default { - name:'xmProjectGroupMng', + name:'xmGroupMng', components: { - XmProjectGroupEdit,VueOkrTree,UsersSelect,XmProjectGroupStateMng,XmProjectGroupUserMng,XmProjectList, + XmGroupEdit,VueOkrTree,UsersSelect,XmGroupStateMng,XmGroupUserMng,XmProjectList, XmProductSelect, }, props:["visible","selProject" ,"isSelectSingleUser","isSelectMultiUser",'xmProduct','xmIteration'], @@ -226,13 +226,13 @@ XmProductSelect, }else if(this.xmIteration){ expandedKeys.push(this.xmIteration.id) }else{ - var groupsLvl1=this.xmProjectGroups.filter(i=>i.lvl<=1) + var groupsLvl1=this.xmGroups.filter(i=>i.lvl<=1) expandedKeys.push(...groupsLvl1) } return expandedKeys; }, okrTreeData(){ - var groups=JSON.parse(JSON.stringify(this.xmProjectGroups)); + var groups=JSON.parse(JSON.stringify(this.xmGroups)); groups.forEach(i=>{ if(i.pgroupId==''){ i.pgroupId=null; @@ -290,18 +290,18 @@ XmProductSelect, visible(val){ if(val==true){ this.initData(); - this.searchXmProjectGroups() + this.searchXmGroups() } }, selProject(){ - this.getXmProjectGroup(); + this.getXmGroup(); }, xmProduct(){ - this.getXmProjectGroup(); + this.getXmGroup(); }, xmIteration(){ - this.getXmProjectGroup(); + this.getXmGroup(); } }, data() { @@ -312,7 +312,7 @@ XmProductSelect, mngUsernamekey:'', groupUsernameKey:'', }, - xmProjectGroups: [],//查询结果 + xmGroups: [],//查询结果 pageInfo:{//分页数据 total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。 pageSize:50,//每页数据 @@ -326,7 +326,7 @@ XmProductSelect, dicts:{ //sex: [{id:'1',name:'男'},{id:'2',name:'女'}] },//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]} - addFormVisible: false,//新增xmProjectGroup界面是否显示 + addFormVisible: false,//新增xmGroup界面是否显示 addForm: { id:'',groupName:'',projectId:'',pgTypeId:'',pgTypeName:'',leaderUserid:'',leaderUsername:'',ctime:'',ltime:'',productId:'',branchId:'',pgClass:'',pgroupId:'',lvl:'',pidPaths:'',isTpl:'',assUserid:'',assUsername:'',childrenCnt:'',userCnt:'',qxCode:'',calcWorkload:'',ntype:'',crowBranchId:'',crowBranchName:'',isCrow:'' }, @@ -343,7 +343,7 @@ XmProductSelect, userSelectVisible: false, xmRecordVisible:false, - xmProjectGroupStateVisible:false, + xmGroupStateVisible:false, imGroups:[], imGroupVisible:false, groupRoleDescVisible:false, @@ -357,11 +357,11 @@ XmProductSelect, methods: { handleSizeChange(pageSize) { this.pageInfo.pageSize=pageSize; - this.getXmProjectGroups(); + this.getXmGroups(); }, handleCurrentChange(pageNum) { this.pageInfo.pageNum = pageNum; - this.getXmProjectGroups(); + this.getXmGroups(); }, // 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名 sortChange( obj ){ @@ -379,11 +379,11 @@ XmProductSelect, this.pageInfo.orderFields=[util.toLine(obj.prop)]; this.pageInfo.orderDirs=[dir]; } - this.getXmProjectGroups(); + this.getXmGroups(); }, - searchXmProjectGroups(){ + searchXmGroups(){ this.pageInfo.count=true; - this.getXmProjectGroups(); + this.getXmGroups(); }, loadNexGroup(){ debugger; @@ -402,22 +402,22 @@ XmProductSelect, }else if(this.currNodeType=='groupUser'){ return; } - listXmProjectGroup(params).then((res) => { + listXmGroup(params).then((res) => { var tips=res.data.tips; if(tips.isOk){ this.pageInfo.total = res.data.total; this.pageInfo.count=false; var childrens = res.data.data; - childrens=childrens.filter(i=>!this.xmProjectGroups.some(k=>k.id==i.id)) - this.xmProjectGroups.push(...childrens) + childrens=childrens.filter(i=>!this.xmGroups.some(k=>k.id==i.id)) + this.xmGroups.push(...childrens) }else{ this.$notify({ showClose:true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); }, - //获取列表 XmProjectGroup xm_group - getXmProjectGroups() { + //获取列表 XmGroup xm_group + getXmGroups() { let params = { pageSize: this.pageInfo.pageSize, pageNum: this.pageInfo.pageNum, @@ -456,7 +456,7 @@ XmProductSelect, var func=getGroups this.load.list = true; if( !params.productId && !params.projectId && !params.iterationId){ - func=listXmProjectGroup + func=listXmGroup params.lvl=1 } func(params).then((res) => { @@ -464,7 +464,7 @@ XmProductSelect, if(tips.isOk){ this.pageInfo.total = res.data.total; this.pageInfo.count=false; - this.xmProjectGroups = res.data.data; + this.xmGroups = res.data.data; }else{ this.$notify({ showClose:true, message: tips.msg, type: 'error' }); } @@ -472,12 +472,12 @@ XmProductSelect, }).catch( err => this.load.list = false ); }, - //显示编辑界面 XmProjectGroup xm_group + //显示编辑界面 XmGroup xm_group showEdit: function ( row,index ) { this.editFormVisible = true; this.editForm = Object.assign({}, row); }, - //显示新增界面 XmProjectGroup xm_group + //显示新增界面 XmGroup xm_group showAdd: function () { this.addForm={...this.addFormInit} if(this.currNodeType=='product'){ @@ -502,7 +502,7 @@ XmProductSelect, //this.addForm=Object.assign({}, this.editForm); }, - //显示新增界面 XmProjectGroup xm_group + //显示新增界面 XmGroup xm_group showAddSub: function (row) { if(!row){ @@ -529,19 +529,19 @@ XmProductSelect, this.addFormVisible=false; //this.pageInfo.count=true; this.groupOperSelectVisible=false; - this.xmProjectGroups.push(group) - //this.getXmProjectGroups(); + this.xmGroups.push(group) + //this.getXmGroups(); }, afterEditSubmit(){ this.editFormVisible=false; this.groupOperSelectVisible=false; - this.getXmProjectGroups(); + this.getXmGroups(); }, - //选择行xmProjectGroup + //选择行xmGroup selsChange: function (sels) { this.sels = sels; }, - //删除xmProjectGroup + //删除xmGroup handleDel: function (row,index) { this.$confirm('确认删除该记录吗?', '提示', { type: 'warning' @@ -549,31 +549,31 @@ XmProductSelect, this.load.del=true; this.groupOperSelectVisible=false; let params = { id: row.id }; - delXmProjectGroup(params).then((res) => { + delXmGroup(params).then((res) => { this.load.del=false; var tips=res.data.tips; if(tips.isOk){ this.pageInfo.count=true; - this.getXmProjectGroups(); + this.getXmGroups(); } this.$notify({ showClose:true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, - //批量删除xmProjectGroup + //批量删除xmGroup batchDel: function () { this.$confirm('确认删除选中记录吗？', '提示', { type: 'warning' }).then(() => { this.load.del=true; - batchDelXmProjectGroup(this.sels).then((res) => { + batchDelXmGroup(this.sels).then((res) => { this.load.del=false; this.groupOperSelectVisible=false; var tips=res.data.tips; if( tips.isOk ){ this.pageInfo.count=true; - this.getXmProjectGroups(); + this.getXmGroups(); } this.$notify({ showClose:true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); @@ -581,7 +581,7 @@ XmProductSelect, }, showGroupState(){ - this.xmProjectGroupStateVisible=true; + this.xmGroupStateVisible=true; }, doSearchImGroupsByProjectId(){ @@ -663,13 +663,13 @@ XmProductSelect, } return u; }) - batchAddXmProjectGroupUser(params).then(res=>{ + batchAddXmGroupUser(params).then(res=>{ this.load.add=false; this.groupOperSelectVisible=false; var tips = res.data.tips if(tips.isOk){ - this.searchXmProjectGroups() + this.searchXmGroups() } this.$notify({ showClose:true, message: tips.msg, type: tips.isOk?'success':'error'}); }) @@ -713,20 +713,20 @@ XmProductSelect, ) }, - //删除xmProjectGroupUser + //删除xmGroupUser handleDelGroupUser: function (row,index) { this.$confirm('确认删除该记录吗?', '提示', { type: 'warning' }).then(() => { this.load.del=true; let params = row; - delXmProjectGroupUser(params).then((res) => { + delXmGroupUser(params).then((res) => { this.load.del=false; var tips=res.data.tips; if(tips.isOk){ this.groupOperSelectVisible=false; this.pageInfo.count=true; - this.getXmProjectGroups(); + this.getXmGroups(); } this.$notify({ showClose:true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); @@ -757,7 +757,7 @@ XmProductSelect, this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el); this.initData() - this.searchXmProjectGroups(); + this.searchXmGroups(); }); } diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue b/src/views/xm/core/xmGroup/XmGroupSelect.vue similarity index 90% rename from src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue rename to src/views/xm/core/xmGroup/XmGroupSelect.vue index fc36fc43..65f6deb1 100644 --- a/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue +++ b/src/views/xm/core/xmGroup/XmGroupSelect.vue @@ -5,7 +5,7 @@ 确认选择 - + {{this.filters.selProject?"项目：":""}}{{this.filters.selProject.name}} 选择项目    @@ -14,7 +14,7 @@ - +

{{item.groupName}}
@@ -42,7 +42,7 @@ import util from '@/common/js/util'; //全局公共库 //import Sticky from '@/components/Sticky' // 粘性header组件 import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 - import { getGroups } from '@/api/xm/core/xmProjectGroup'; + import { getGroups } from '@/api/xm/core/xmGroup'; import XmProjectList from '../xmProject/XmProjectList'; import {mapGetters} from 'vuex' @@ -64,9 +64,9 @@ import XmProductSelect from '../xmProduct/XmProductSelect.vue'; i.groupUsers.forEach(k=>k.isSelected="0") } }) - this.xmProjectGroupFormworkSels = JSON.parse(JSON.stringify(this.selGroups)); + this.xmGroupFormworkSels = JSON.parse(JSON.stringify(this.selGroups)); }else{ - this.xmProjectGroupFormworkSels = []; + this.xmGroupFormworkSels = []; } // this.applyData(); }, @@ -99,7 +99,7 @@ import XmProductSelect from '../xmProduct/XmProductSelect.vue'; }, //下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} /**begin 自定义属性请在下面加 请加备注**/ - xmProjectGroupFormworkSels: [], + xmGroupFormworkSels: [], selectProjectVisible:false, selectProductVisible:false, maxTableHeight:300, @@ -109,21 +109,21 @@ import XmProductSelect from '../xmProduct/XmProductSelect.vue'; methods: { toggleSelected(index,valueIndex) { if(this.isSelectSingleUser=='1' || this.isSelectMultiUser=='1'){ - if(this.xmProjectGroupFormworkSels[index].groupUsers[valueIndex].isSelected == '1'){ - this.xmProjectGroupFormworkSels[index].groupUsers[valueIndex].isSelected ='0' + if(this.xmGroupFormworkSels[index].groupUsers[valueIndex].isSelected == '1'){ + this.xmGroupFormworkSels[index].groupUsers[valueIndex].isSelected ='0' }else{ - this.xmProjectGroupFormworkSels[index].groupUsers[valueIndex].isSelected ='1' + this.xmGroupFormworkSels[index].groupUsers[valueIndex].isSelected ='1' } } }, //确认项目团队组成员 groupConfirm(){ - this.$emit("select-confirm",this.xmProjectGroupFormworkSels); + this.$emit("select-confirm",this.xmGroupFormworkSels); }, userConfirm(){ var users=[]; - this.xmProjectGroupFormworkSels.forEach(i=>{ + this.xmGroupFormworkSels.forEach(i=>{ if(i.groupUsers){ i.groupUsers.forEach(k=>{ if(k.isSelected=='1'){ @@ -210,7 +210,7 @@ import XmProductSelect from '../xmProduct/XmProductSelect.vue'; i.groupUsers.forEach(k=>k.isSelected="0") } }) - this.xmProjectGroupFormworkSels = JSON.parse(JSON.stringify(this.selGroups)); + this.xmGroupFormworkSels = JSON.parse(JSON.stringify(this.selGroups)); } if(this.selProject){ this.filters.selProject=this.selProject @@ -272,7 +272,7 @@ import XmProductSelect from '../xmProduct/XmProductSelect.vue'; } - .input-xmProjectGroupFormwork { + .input-xmGroupFormwork { margin-left:10px; margin-top: 2px; align-self: center; @@ -292,7 +292,7 @@ import XmProductSelect from '../xmProduct/XmProductSelect.vue'; animation: myrotate 1s linear; } - .addXmProjectGroupFormworkSquare { + .addXmGroupFormworkSquare { width: 15px; height: 15px; display: inline-block; @@ -300,7 +300,7 @@ import XmProductSelect from '../xmProduct/XmProductSelect.vue'; animation: myrotate 2s linear infinite; } - .closeXmProjectGroupFormworkSquare { + .closeXmGroupFormworkSquare { width: 15px; height: 15px; display: inline-block; diff --git a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue b/src/views/xm/core/xmGroupState/XmGroupStateMng.vue similarity index 80% rename from src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue rename to src/views/xm/core/xmGroupState/XmGroupStateMng.vue index 6688a1b6..d9df68b1 100644 --- a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue +++ b/src/views/xm/core/xmGroupState/XmGroupStateMng.vue @@ -2,12 +2,12 @@
- 查询 - 刷新数据 + 查询 + 刷新数据 - - + +