diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue
index e46fb2b6..4922a9f8 100644
--- a/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue
+++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue
@@ -18,7 +18,16 @@
如果没用副组长可以设置为项目助理、小组助理等，具有组长同等权限
-
+
+
+
+ 是否属于协作公司
+
+
+
+ 如果该团队属于某协作公司，请选择协作公司。
+
+
@@ -30,6 +39,10 @@
+
+
+
+
@@ -40,11 +53,12 @@
import { addXmProjectGroup,editXmProjectGroup } from '@/api/xm/core/xmProjectGroup';
import { mapGetters } from 'vuex'
import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
+ import BranchSelect from '@/views/mdp/sys/branch/BranchSelect';//机构选择
export default {
name:'xmProjectGroupEdit',
components: {
- UsersSelect,
+ UsersSelect,BranchSelect,
},
computed: {
...mapGetters([ 'userInfo' ]),
@@ -80,7 +94,8 @@
},
userType:"leader",
- userSelectVisible:false
+ userSelectVisible:false,
+ branchVisible:false,
}//end return
},//end data
@@ -152,6 +167,11 @@
}
},
+ branchRowClick: function(row, event, column){
+ this.branchVisible=false
+ this.editForm.crowBranchId=row.id
+ this.editForm.crowBranchName=row.branchName
+ },
},//end method
mounted() {
diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
index ca6e09d9..61d9ebbd 100644
--- a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
+++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
@@ -9,12 +9,12 @@
@@ -35,17 +35,14 @@
append-to-body :close-on-click-modal="true"
width="50%" >
- 新增下级小组
- 通过模板批量导入下级小组
+ 新增下级小组
- 新增下级小组
- 通过模板批量导入下级小组
+ 新增下级小组
- 新增下级小组
- 通过模板批量导入下级小组
+ 新增下级小组
修改小组信息
新增组员
删除小组
@@ -178,7 +175,17 @@
props:["visible","selProject" ,"isSelectSingleUser","isSelectMultiUser",'xmProduct','xmIteration'],
computed: {
...mapGetters(['userInfo']),
-
+ expandedKeys(){
+ var expandedKeys=[]
+ if(this.xmProduct&&this.xmProduct.id){
+ expandedKeys.push(this.xmProduct.id)
+ }else if(this.selProject && this.selProject.id){
+ expandedKeys.push(this.selProject.id)
+ }else if(this.xmIteration){
+ expandedKeys.push(this.xmIteration.id)
+ }
+ return expandedKeys;
+ },
okrTreeData(){
var groups=this.xmProjectGroups;
groups.forEach(i=>{