From a4b45e51fbb081186795527c6a96a168c0d529c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 1 Mar 2022 16:14:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmProduct/XmProductMng.vue | 12 +++++++++---
 src/views/xm/core/xmProject/XmProjectMng.vue | 20 ++++++++++++++------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index 33c7d579..8e0dcbd0 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -1,10 +1,10 @@
 <template>
 	<section class="page-container">
 		<el-row>
-		<el-col :span="6"> 
+		<el-col :span="6" v-if="templateVisible"> 
 			<xm-product-tpl-mng @copy="searchXmProducts" ref="xmProductTplMngRef" show-type="simple"></xm-product-tpl-mng>
 		</el-col> 
-		<el-col :span="18" class="padding-top padding-left border">
+		<el-col :span="templateVisible?18:24" class="padding-top padding-left border">
 			<el-row>
 				<el-row>
 					<el-select   v-model="filters.queryScope"    placeholder="产品查询范围">
@@ -82,7 +82,7 @@
 								</font>
 							</el-col>
 							<el-col  :span="24"  style="padding-top:10px;">
-								<el-button type="primary"  @click="searchXmProducts" >查询</el-button>
+								<el-button type="primary"  @click="searchXmProducts" >查询</el-button><el-button type="text"  @click="templateVisible=!templateVisible" >{{templateVisible?"隐藏模板":"显示模板"}}</el-button>
 							</el-col>
 						</el-row>
 						<el-button  slot="reference"   icon="el-icon-more"></el-button>
@@ -320,6 +320,7 @@ import XmProductSelect from './XmProductSelect.vue';
 					id:'',productName:'',code:'',isTpl:'',copyMenu:'1'
 				},
 				copyToVisible:false,
+				templateVisible:false,
 				/**begin 自定义属性请在下面加 请加备注**/
 
 				/**end 自定义属性请在上面加 请加备注**/
@@ -421,6 +422,11 @@ import XmProductSelect from './XmProductSelect.vue';
 						this.pageInfo.total = res.data.total;
 						this.pageInfo.count=false;
 						this.xmProducts = res.data.data;
+						if(this.xmProducts==null || this.xmProducts.length==0){
+							this.templateVisible=true;
+						}else{
+							this.templateVisible=false;
+						}
 					}else{
 						this.$message({showClose: true, message: tips.msg, type: 'error' });
 					}
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index 606b33bc..e335eccf 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -1,12 +1,12 @@
 <template>
 	<section class="page-container">
 		<el-row>
-			<el-col :span="6" class="padding-top  padding-left"> 
+			<el-col :span="6" class="padding-top  padding-left" v-if="templateVisible"> 
 				<el-row>
 					<xm-project-tpl-mng @copy="searchXmProjects" ref="xmProjectTplMngRef"></xm-project-tpl-mng>
 				</el-row>
 			</el-col>
-			<el-col :span="18" class="border">
+			<el-col :span="templateVisible?18:24" class="border">
 				<el-row class="padding-left">
 					<el-menu  active-text-color="#00abfc" :default-active="menukey"   mode="horizontal" @select="handleSelect">
 						<el-menu-item index="all">全部</el-menu-item>
@@ -67,9 +67,10 @@
 								</el-col>  
 								<el-col :span="24" style="padding-top:5px;">
 									<el-button  type="primary" icon="el-icon-search" @click="searchXmProjects">查询</el-button>
+									<el-button type="text" @click="templateVisible=!templateVisible">{{templateVisible?'隐藏模板':'显示模板'}}</el-button>
 								</el-col>
 							</el-row>
-							<el-button type="text" class="right-btn" slot="reference" icon="el-icon-d-arrow-right"></el-button>
+							<el-button type="text" class="right-btn" slot="reference" icon="el-icon-d-arrow-right">更多</el-button>
 						</el-popover>
 						<el-button type="primary"  @click="showAdd"  icon="el-icon-plus"></el-button>
 					</el-menu>
@@ -337,6 +338,7 @@
 					id:'',name:'',code:'',isTpl:'',copyPhase:'1',copyTask:'1',copyGrup:'0'
 				},
 				copyToVisible:false,
+				templateVisible:false,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -409,6 +411,12 @@
 						this.pageInfo.total = res.data.total;
 						this.pageInfo.count=false; 
 						this.xmProjects = res.data.data;
+						
+						if(this.xmProjects==null || this.xmProjects.length==0){
+							this.templateVisible=true
+						}else{
+							this.templateVisible=false;
+						}
 					}else{
 						this.$message({showClose: true, message: tips.msg, type: 'error' });
 					} 
@@ -735,9 +743,9 @@
 				this.filters.productName=this.$route.params.productName;
 			}
 			this.$nextTick(() => {
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+                var table=document.querySelector('.el-table');
+                var top=util.getPositionTop(table)
+                this.maxTableHeight = window.innerHeight - top -60;
 				this.showInfo = false;
 				this.getXmProjects();
 			});