diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue index 10e869ac..cc5cc98a 100644 --- a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue +++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue @@ -1,8 +1,38 @@ @@ -12,14 +42,40 @@ //import Sticky from '@/components/Sticky' // 粘性header组件 //import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 import { updateGroup,getProjectGroup } from '@/api/xm/core/xmProjectGroup'; - import { mapGetters } from 'vuex'; - import XmProjectGroupFormwork from '../xmProjectGroupFormwork/XmProjectGroupFormwork'; + import { mapGetters } from 'vuex'; + import XmProjectGroupEdit from "./XmProjectGroupEdit" + import {VueOkrTree} from 'vue-okr-tree'; + import 'vue-okr-tree/dist/vue-okr-tree.css' + export default { computed: { ...mapGetters([ 'userInfo','roles' - ]) + ]), + okrTreeData(){ + var groups=this.groups; + groups.forEach(i=>{ + i.label=i.groupName + if(i.groupUsers){ + var groupUsers=i.groupUsers; + groupUsers.forEach(i=>i.label=i.username) + i.children=groupUsers + } + }) + var topLabel="组织架构" + if(this.xmProduct&&this.xmProduct.id){ + topLabel=this.xmProduct.name+"-产品组织架构" + }else if(this.selProject && this.selProject.id){ + topLabel=this.selProject.name+"-项目组织架构" + } + var data=[{ + label:topLabel, + children:groups + } + ] + return data; + } }, props: ["selProject" ,"isSelectSingleUser","isSelectMultiUser",'xmProduct','xmIteration'], watch:{ @@ -39,6 +95,13 @@ /**begin 自定义属性请在下面加 请加备注**/ groupSelectVisible: true, groups:[], + editForm: { + id:'',groupName:'',projectId:'' + }, + addForm: { + id:'',groupName:'',projectId:'' + }, + groupOperSelectVisible:false, /**end 自定义属性请在上面加 请加备注**/ } },//end data @@ -103,13 +166,35 @@ /**begin 自定义函数请在下面加**/ onUserSelected:function(users){ this.$emit("user-confirm",users); + }, + + renderCurrentClass (node) { + return 'label-bg-blue' + }, + handleNodeClick (data) { + this.groupOperSelectVisible=true; + this.editForm=data; + }, + renderContent (h, node) { + return ( +
+
{node.data.label}
+
+ {node.data.leaderUsername? + (
{node.data.leaderUsername }
+ ) + : + (
) + } +
+
+ ) } /**end 自定义函数请在上面加**/ },//end methods components: { - - XmProjectGroupFormwork + VueOkrTree,XmProjectGroupEdit, //在下面添加其它组件 }, mounted() { diff --git a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue index b47b64cb..ca4d550e 100644 --- a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue +++ b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue @@ -1,8 +1,5 @@