From 86be5ceadb5c45f0563ee93b76d4ddcee3029dfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 10 Mar 2022 22:51:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/xmProject/XmProjectComplex.vue    | 37 +++++++++++--------
 .../xm/core/xmProject/XmProjectSelect.vue     | 10 +++--
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/views/xm/core/xmProject/XmProjectComplex.vue b/src/views/xm/core/xmProject/XmProjectComplex.vue
index 061e2b4c..c2689c17 100644
--- a/src/views/xm/core/xmProject/XmProjectComplex.vue
+++ b/src/views/xm/core/xmProject/XmProjectComplex.vue
@@ -1,36 +1,41 @@
 <template>
 	<section class="page-container border">
-		<el-row>
-			<el-col :span="projectVisible==true?4:0" >
-				<xm-project-select   :xm-iteration="xmIteration" :xm-product="xmProduct"  @row-click="onProjectRowClick" @clear-select="onProjectClearSelect"></xm-project-select>
-			</el-col>
-			<el-col :span="projectVisible==true?20:24" v-show="selProject && selProject.id">
+		<el-row>  
+			<el-col :span="24">
 				<el-tabs type="border-card"  :value="showPanel" @tab-click="tabClick">
-					<el-tab-pane disabled>
-						<el-button type="text" v-show="projectVisible==true" slot="label" @click.stop="projectVisible=false"><i class="el-icon-d-arrow-left" ></i> 隐藏</el-button>
-						<el-button type="text" v-show="projectVisible==false" slot="label" @click.stop="projectVisible=true"><i class="el-icon-d-arrow-right" ></i>展开</el-button>
- 					</el-tab-pane>
-					<el-tab-pane label="项目概览"   name="projectOverview">
+					<el-tab-pane disabled> 
+						<div  slot="label">
+							<el-popover
+								placement="right"
+								width="400"
+								trigger="hover"> 
+								<xm-project-select :auto-select="true"  :xm-iteration="xmIteration" :xm-product="xmProduct"  @row-click="onProjectRowClick" @clear-select="onProjectClearSelect"></xm-project-select>
+ 								 <el-link type="warning" slot="reference" @click.stop="showProjectSelect" icon="el-icon-search"><font style="font-size:14px;">{{selProject?selProject.name:'选择项目'}}</font></el-link> 
+							</el-popover>
+							
+						</div>
+					 </el-tab-pane> 
+					<el-tab-pane label="项目概览"   name="projectOverview" v-if="selProject&&selProject.id">
 					 	<xm-project-overview v-if="selProject && showPanel=='projectOverview'" :xm-product="xmProduct"  :xm-iteration="xmIteration" :sel-project="selProject"></xm-project-overview>
 					</el-tab-pane>
-					<el-tab-pane label="迭代"   name="iterations" v-if=" !xmIteration" >
+					<el-tab-pane label="迭代"   name="iterations" v-if=" !xmIteration && selProject&&selProject.id" >
 						 <xm-iteration-mng v-if=" selProject && showPanel=='iterations' && !xmIteration"   :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-iteration-mng>
 					</el-tab-pane>
-					<el-tab-pane label="产品、战略"   name="products" v-if=" !xmProduct" >
+					<el-tab-pane label="产品、战略"   name="products" v-if=" !xmProduct && selProject&&selProject.id" >
 						 <xm-product-mng v-if=" selProject && showPanel=='products'"   :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-product-mng>
 					</el-tab-pane>
 					<el-tab-pane label="项目" lazy  name="projects" v-if="!selProject">
 						<xm-product-project-for-link v-if="selProject && showPanel=='projects'"  :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-product-project-for-link>
 					</el-tab-pane>
-					<el-tab-pane label="需求" lazy name="menus" >
+					<el-tab-pane label="需求" lazy name="menus" v-if="selProject&&selProject.id">
 						<xm-menu-mng v-if="selProject && showPanel=='menus'"   :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"  :disabled-mng="false"></xm-menu-mng>
 					</el-tab-pane>
-					<el-tab-pane label="任务" lazy name="tasks" >
+					<el-tab-pane label="任务" lazy name="tasks" v-if="selProject&&selProject.id">
 						<xm-task-mng v-if="selProject && showPanel=='tasks'"  :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-task-mng>
 					</el-tab-pane>
-					<el-tab-pane label="缺陷" lazy name="bugs" >
+					<el-tab-pane label="缺陷" lazy name="bugs" v-if="selProject&&selProject.id">
 						<xm-question-mng v-if="selProject && showPanel=='bugs'"  :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-question-mng>
-					</el-tab-pane>
+					</el-tab-pane> 
 				</el-tabs>
 				<el-row>
 
diff --git a/src/views/xm/core/xmProject/XmProjectSelect.vue b/src/views/xm/core/xmProject/XmProjectSelect.vue
index 191b12d6..d9315bef 100644
--- a/src/views/xm/core/xmProject/XmProjectSelect.vue
+++ b/src/views/xm/core/xmProject/XmProjectSelect.vue
@@ -27,7 +27,7 @@
 
 
 	export default {  
-		props:["xmIteration","xmProduct"],
+		props:["xmIteration","xmProduct",'autoSelect'],
 		computed: {
 			...mapGetters([
 				'userInfo','roles'
@@ -133,11 +133,15 @@
 				params.branchId = this.userInfo.branchId;
 				listXmProject(params).then((res) => {
 					var tips=res.data.tips;
-					if(tips.isOk){ 
-						console.log(res.data);
+					if(tips.isOk){  
 						this.pageInfo.total = res.data.total;
 						this.pageInfo.count=false; 
 						this.xmProjects = res.data.data;
+						if(this.autoSelect===true&&this.xmProjects.length>0){ 
+							var row=this.xmProjects[0];
+							this.$refs.table.setCurrentRow(row);
+							this.rowClick(row);
+						}
 					}else{
 						this.$notify({showClose: true, message: tips.msg, type: 'error' });
 					}