优化

src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue

@@ -18,7 +18,16 @@
 						<el-input v-model="editForm.assUsername" placeholder="副组长姓名" @click.native="showUserSelect('ass')"></el-input>
 						<font color="red">如果没用副组长可以设置为项目助理、小组助理等，具有组长同等权限</font>
 					</el-form-item>  
-				</el-form-item>          
+				</el-form-item>     
+				<el-form-item label="企业协作" prop="isCrow"> 
+					<el-form-item label="" prop="isCrow">
+						<el-checkbox v-model="editForm.isCrow" true-label="1" false-label="0">是否属于协作公司</el-checkbox>
+					</el-form-item> 
+					<el-form-item label="协作公司" prop="crowBranchName" v-if="editForm.isCrow">
+						<el-input v-model="editForm.crowBranchName" placeholder="协作公司名称" @click.native="branchVisible=true"></el-input>
+						<font color="red">如果该团队属于某协作公司，请选择协作公司。</font>
+					</el-form-item>  
+				</el-form-item>      
 			</el-form>
 		</el-row>
 
@@ -30,6 +39,10 @@
 			<el-drawer append-to-body title="选择员工" :visible.sync="userSelectVisible" size="60%">
 				<users-select isSingleUser=true   @confirm="onUserSelected" ref="usersSelect"></users-select>
 			</el-drawer>
+			
+		<el-drawer title="机构选择" :visible.sync="branchVisible"  size="50%" top="20" :close-on-click-modal="false" append-to-body>
+			<branch-select :visible="branchVisible"  @cancel="branchVisible=false" @row-click="branchRowClick"></branch-select>
+		</el-drawer>
 	</section>
 </template> 
 
@@ -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() {

src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue

@@ -9,12 +9,12 @@
   		</el-row> 
 		<el-row >
 			<vue-okr-tree :data="okrTreeData" v-loading="load.list"
-				show-collapsable 
-				default-expand-all   
+				show-collapsable   
 				node-key="id"
 				current-lable-class-name="crrentClass" 
 				:render-content="renderContent"  
   				@node-click="handleNodeClick"
+				:default-expanded-keys="expandedKeys"
   				direction="horizontal"
   			></vue-okr-tree>   
 		</el-row>
@@ -35,17 +35,14 @@
 				append-to-body  :close-on-click-modal="true"
 				width="50%" >
 				<el-row v-if="currNodeType=='project'">   
-					<el-button type="primary" @click="showAdd" icon="el-icon-plus" v-loading="load.add">新增下级小组</el-button>   
-					<el-button @click="showAdd" icon="el-icon-plus"  v-loading="load.add">通过模板批量导入下级小组</el-button>  
+					<el-button type="primary" @click="showAdd" icon="el-icon-plus" v-loading="load.add">新增下级小组</el-button>  
 				</el-row> 
 				<el-row v-if="currNodeType=='product'">  
-					<el-button type="primary" @click="showAdd" icon="el-icon-plus"  v-loading="load.add">新增下级小组</el-button>   
-					<el-button @click="showAdd" icon="el-icon-plus"  v-loading="load.add">通过模板批量导入下级小组</el-button>  
+					<el-button type="primary" @click="showAdd" icon="el-icon-plus"  v-loading="load.add">新增下级小组</el-button>  
 				</el-row> 
 				<el-row v-if="currNodeType=='group'">  
 					
-					<el-button type="primary" @click="showAddSub(editForm)" icon="el-icon-plus"  v-loading="load.add">新增下级小组</el-button>  
-					<el-button @click="showAddSub(editForm)" icon="el-icon-plus"  v-loading="load.add">通过模板批量导入下级小组</el-button>   
+					<el-button type="primary" @click="showAddSub(editForm)" icon="el-icon-plus"  v-loading="load.add">新增下级小组</el-button>   
 					<el-button @click="showEdit(editForm)" icon="el-icon-edit"  v-loading="load.edit">修改小组信息</el-button> 
 					<el-button @click="userSelectVisible=true" icon="el-icon-plus"  v-loading="load.add">新增组员</el-button> 
 					<el-button type="danger" @click="handleDel(editForm)" icon="el-icon-delete"  v-loading="load.del">删除小组</el-button>
@@ -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=>{