From 70ceb244950f95bf9c8faa2de815cf9d24a99962 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 17:19:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../XmProjectPhaseTemplateMng.vue                     | 11 ++++++++---
 .../core/xmProjectTemplate/XmProjectTemplateList.vue  | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue
index c178d69e..80eeda8f 100644
--- a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue
+++ b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue
@@ -1,5 +1,5 @@
 <template>
-	<section class="page-container page-full-height padding border">
+	<section class="page-container  padding border">
 		<el-row v-if="!simple">
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input>  
 			<el-input v-model="filters.projectName" style="width: 20%;" placeholder="点击选择项目" @click.native="showProjectTemplate"></el-input>  
@@ -9,7 +9,7 @@
 		
 		<el-row class="page-main" v-if="!simple"> 
 			<!--列表 XmProjectPhaseTemplate xm_phase_template-->
-			<el-table lazy :load="loadXmProjectPhaseLazy" :data="xmProjectPhaseTemplateTreeData" @sort-change="sortChange" row-key="id"  :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table :height="maxTableHeight" lazy :load="loadXmProjectPhaseLazy" :data="xmProjectPhaseTemplateTreeData" @sort-change="sortChange" row-key="id"  :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column sortable type="selection" width="40"></el-table-column> 
 				<el-table-column prop="phaseName" label="计划名称" min-width="260" >
 					
@@ -53,7 +53,7 @@
 		</el-row>
 		<el-row  v-if="simple"> 
 			<!--列表 XmProjectPhaseTemplate xm_phase_template-->
-			<el-table default-expand-all :data="xmProjectPhaseTemplateTreeData" @sort-change="sortChange" row-key="id"  :tree-props="{children: 'children', hasChildren: 'hasChildren'}" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table lazy :load="loadXmProjectPhaseLazy"  default-expand-all :height="maxTableHeight" :data="xmProjectPhaseTemplateTreeData" @sort-change="sortChange" row-key="id"  :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
  				<el-table-column prop="phaseName" label="计划名称" min-width="180" > 
 					 <template slot-scope="scope">  
 						 {{scope.row.seqNo}} &nbsp;&nbsp;{{scope.row.phaseName}}
@@ -144,6 +144,7 @@
 				},
 				parentPhaseTemplate:null,
 				projectTemplateVisible:false,
+				maxTableHeight:300,
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
@@ -297,6 +298,10 @@
 				this.filters.projectTemplate=this.selProjectTemplate
 			}
 			this.$nextTick(() => {
+				
+                var table=document.querySelector('.el-table');
+                var top=util.getPositionTop(table)
+                this.maxTableHeight = window.innerHeight - top -60;
 				this.getXmProjectPhases();   
 			}); 
 			
diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue
index d4fea2df..9bc991ac 100644
--- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue
+++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue
@@ -1,5 +1,5 @@
 <template>
-	<section class="page-container page-full-height padding border">
+	<section class="page-container padding border">
 		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="项目模板名称查询"></el-input>  
 			<el-select v-model="filters.xmType" @change="searchXmProjectTemplates">
@@ -7,9 +7,9 @@
 			</el-select>
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectTemplates">查询</el-button> 
   		</el-row>
-		<el-row class="page-main page-height-80"> 
+		<el-row class="page-main"> 
 			<!--列表 XmProjectTemplate xm_project_template-->
-			<el-table :data="xmProjectTemplates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table :height="maxTableHeight" :data="xmProjectTemplates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column  type="selection" width="45"></el-table-column>
 				<el-table-column sortable type="index" width="45"></el-table-column>
   				<el-table-column prop="name" label="项目名称" min-width="150" ></el-table-column> 
@@ -94,6 +94,7 @@
 					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planInnerUserAt:'',planOutUserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planInnerUserPrice:'',planOutUserPrice:'',planOutUserCnt:'',planInnerUserCnt:'',planWorkingHours:'',taxRate:'',planInnerUserWorkload:'',planOutUserWorkload:'',productId:'',productName:'',templateId:'',tcuserid:'',tcusername:'',tremark:'',tctime:'',tcbranchId:'',shareScope:''
 				},
 				projectTemplateInfoVisible:false,
+				maxTableHeight:false,
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
@@ -211,6 +212,10 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				
+                var table=document.querySelector('.el-table');
+                var top=util.getPositionTop(table)
+                this.maxTableHeight = window.innerHeight - top -60;
 				this.getXmProjectTemplates();
 				listOption([{categoryId:'all',itemCode:'projectType'}] ).then(res=>{
 					if(res.data.tips.isOk){