From 91ac32d637e3c6aae77c29c9e9ce4bf5c1236410 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 12 Jun 2021 14:08:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmEnvList/XmEnvListMng.vue  |  6 +++-
 src/views/xm/core/xmMenu/XmMenuMng.vue        |  2 +-
 src/views/xm/core/xmMenu/XmMenuWithPlan.vue   |  2 +-
 .../xm/core/xmMenuPlan/XmMenuPlanMng.vue      |  9 +++--
 .../xm/core/xmMenuState/XmMenuStateMng.vue    |  2 +-
 .../core/xmProductState/XmProductStateMng.vue | 10 ++++--
 .../xm/core/xmProject/XmProjectBudgetCost.vue |  6 ++++
 .../XmProjectContractMng.vue                  |  8 +++--
 .../xmProjectEnvList/XmProjectEnvListMng.vue  |  7 +++-
 .../XmProjectGroupFormwork.vue                |  7 +++-
 .../XmProjectGroupFormworkMng.vue             | 11 ++++--
 .../XmProjectGroupStateMng.vue                | 11 ++++--
 .../XmProjectGroupUserMng.vue                 | 11 ++++--
 .../XmProjectGroupUserCandidateMng.vue        | 11 ++++--
 .../xm/core/xmProjectKpi/XmProjectKpiMng.vue  | 11 ++++--
 .../XmProjectMBudgetCostNouserMng.vue         | 34 ++++++++++++-------
 .../XmProjectMBudgetCostUserMng.vue           | 30 ++++++++++------
 .../XmProjectMCostNouserMng.vue               | 33 +++++++++++-------
 .../XmProjectMCostUserList.vue                |  7 +++-
 .../XmProjectMCostUserMng.vue                 | 26 +++++++++-----
 .../xmProjectPhase/XmProjectPhaseBatch.vue    |  6 ++--
 .../core/xmProjectPhase/XmProjectPhaseMng.vue |  2 +-
 .../xm/core/xmQuestion/XmQuestionMng.vue      |  5 ++-
 src/views/xm/core/xmRecord/XmRecord.vue       |  4 +++
 src/views/xm/core/xmTask/XmTaskList.vue       |  5 ++-
 .../xm/core/xmTask/XmTaskListForMenu.vue      |  2 +-
 .../xm/core/xmTask/XmTaskListForProduct.vue   |  2 +-
 src/views/xm/core/xmTask/XmTaskMng.vue        |  2 +-
 src/views/xm/core/xmTask/XmTaskMngBatch.vue   |  2 +-
 .../core/xmTaskExecuser/XmTaskExecuserMng.vue |  5 ++-
 .../xm/core/xmTestCase/XmTestCaseMng.vue      |  5 ++-
 .../core/xmTestCaseExec/XmTestCaseExecMng.vue |  5 ++-
 32 files changed, 205 insertions(+), 84 deletions(-)

diff --git a/src/views/xm/core/xmEnvList/XmEnvListMng.vue b/src/views/xm/core/xmEnvList/XmEnvListMng.vue
index 948d4096..77e1ed51 100644
--- a/src/views/xm/core/xmEnvList/XmEnvListMng.vue
+++ b/src/views/xm/core/xmEnvList/XmEnvListMng.vue
@@ -8,7 +8,7 @@
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmEnvList xm_env_list-->
-			<el-table :data="xmEnvLists" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :max-height="tableHeight" :data="xmEnvLists" @sort-change="sortChange" 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="ipAddress" label="内网ip地址" min-width="80" ></el-table-column>
 				<el-table-column prop="port" label="内网访问端口" min-width="80" ></el-table-column>
@@ -101,6 +101,7 @@
 				/**begin 自定义属性请在下面加 请加备注**/
 				
 				envStateList:["不可用","已启用","已过期"],
+				tableHeight:300,
 				// 	{
 				// 		value: "0",
 				// 		label: "不可用",
@@ -256,6 +257,9 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				var subHeight=100/1000 * window.innerHeight; 
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;  
 				this.getXmEnvLists();
         	}); 
 		}
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 3da060d9..a5db21da 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -1043,7 +1043,7 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
-				var subHeight=300/1000 * window.innerHeight
+				var subHeight=350/1000 * window.innerHeight
 				if(this.selProject){
 					subHeight=400/1000 * window.innerHeight
 				}
diff --git a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
index 31f5697d..1fc6d33d 100644
--- a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
+++ b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
@@ -514,7 +514,7 @@
 		mounted() {  
 			this.$nextTick(() => {
 				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=65/1000 * window.innerHeight; 
+				var subHeight=100/1000 * window.innerHeight; 
 				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;  
 				this.getXmMenus();
 			}); 
diff --git a/src/views/xm/core/xmMenuPlan/XmMenuPlanMng.vue b/src/views/xm/core/xmMenuPlan/XmMenuPlanMng.vue
index 93ae319b..024070e6 100644
--- a/src/views/xm/core/xmMenuPlan/XmMenuPlanMng.vue
+++ b/src/views/xm/core/xmMenuPlan/XmMenuPlanMng.vue
@@ -8,7 +8,7 @@
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmMenuPlan 功能计划表,无需前端维护，所有数据由汇总统计得出-->
-			<el-table :data="xmMenuPlans" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :max-height="tableHeight" :data="xmMenuPlans" @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="projectId" label="项目编号" min-width="80" ></el-table-column>
@@ -124,9 +124,9 @@
 				//编辑xmMenuPlan界面初始化数据
 				editForm: {
 					projectId:'',id:'',projectName:'',menuId:'',planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',onlineStatus:'',onlineTime:'',planStatus:'',chargeUserid:'',chargeUsername:'',menuStatus:'',ctime:'',ltime:'',cuserid:'',cusername:'',calcTime:'',menuName:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',testCases:'',execCases:'',designCases:'',finishCases:'',iterationCnt:'',taskCnt:'',finishTaskCnt:'',productId:'',productName:'',bugCnt:''
-				}
+				},
 				/**begin 自定义属性请在下面加 请加备注**/
-					
+				tableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -265,6 +265,9 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				var subHeight=80/1000 * window.innerHeight; 
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				this.getXmMenuPlans();
         	}); 
         	/** 举例，
diff --git a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
index ef77da6c..0b6c7c99 100644
--- a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
+++ b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
@@ -9,7 +9,7 @@
 			<el-button type="primary" v-if=" batchEditVisible==true "  @click="noBatchEdit" v-loading="load.edit">返回</el-button>  
   		</el-row>
 		<el-row class="app-container" v-show="!batchEditVisible">    
-				<el-table ref="table" :data="xmMenusTreeData" default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+				<el-table ref="table" :max-height="tableHeight" :data="xmMenusTreeData" default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" 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="menuName" label="故事名称" min-width="150" >
 						<template slot-scope="scope"> 
diff --git a/src/views/xm/core/xmProductState/XmProductStateMng.vue b/src/views/xm/core/xmProductState/XmProductStateMng.vue
index 0d4eb6cc..b160833d 100644
--- a/src/views/xm/core/xmProductState/XmProductStateMng.vue
+++ b/src/views/xm/core/xmProductState/XmProductStateMng.vue
@@ -6,7 +6,7 @@
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmProductState 功能状态表,无需前端维护，所有数据由汇总统计得出-->
-			<el-table :data="xmProductStates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :max-height="tableHeight" :data="xmProductStates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
  				<el-table-column sortable type="index" width="45"></el-table-column> 
  				<el-table-column prop="productName" label="产品名称" min-width="80" ></el-table-column> 
 				<el-table-column prop="calcTime" label="汇总时间" min-width="80" ></el-table-column>
@@ -82,9 +82,9 @@
 				//编辑xmProductState界面初始化数据
 				editForm: {
 					id:'',planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',ctime:'',ltime:'',cuserid:'',cusername:'',calcTime:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',productId:'',productName:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',iterationCnt:'',taskCnt:'',finishTaskCnt:''
-				}
+				},
 				/**begin 自定义属性请在下面加 请加备注**/
-					
+				tableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -224,6 +224,10 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				
+				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				var subHeight=80/1000 * window.innerHeight; 
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				this.getXmProductStates();
         	}); 
         	/** 举例，
diff --git a/src/views/xm/core/xmProject/XmProjectBudgetCost.vue b/src/views/xm/core/xmProject/XmProjectBudgetCost.vue
index 3b734f70..79dbbbb1 100644
--- a/src/views/xm/core/xmProject/XmProjectBudgetCost.vue
+++ b/src/views/xm/core/xmProject/XmProjectBudgetCost.vue
@@ -28,6 +28,7 @@
 					</el-option>
 				</el-select> -->
 				<el-table
+					:max-height="tableHeight"
 					v-if="showType == '人力'"
 					:data="sumXmProjectMBudgetCostUsersConvert"
 					highlight-current-row
@@ -55,6 +56,7 @@
 				</el-table>
 
 				<el-table
+					:max-height="tableHeight"
 					v-if="showType == '非人力'"
 					:data="sumXmProjectMBudgetCostNousersConvert" 
 					highlight-current-row
@@ -212,6 +214,7 @@ import { months } from 'moment';
 				sumXmProjectMBudgetCostNousers:[],
 				budgetCostNouser:null, 
 				budgetCostNouserVisible:false,
+				tableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -303,6 +306,9 @@ import { months } from 'moment';
 		mounted() { 
 			this.showType = "人力";
 				this.$nextTick(() => { 
+					//var clientRect=this.$refs.table.$el.getBoundingClientRect();
+					var subHeight=500/1000 * window.innerHeight; 
+					this.tableHeight =  window.innerHeight-subHeight; 
 			  }); 
 			  this.selProjectBudget=Object.assign({},this.selProject);
 		}
diff --git a/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue b/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
index b9d84c33..2c8e22df 100644
--- a/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
+++ b/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
@@ -12,7 +12,7 @@
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmProjectContract xm_project_contract-->
-			<el-table :data="xmProjectContracts" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :max-height="tableHeight" :data="xmProjectContracts" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<!-- ht_contract_card表 -->
 				<el-table-column prop="htSn" label="合同编号" min-width="80" ></el-table-column>
 				<el-table-column prop="htName" label="合同标题" min-width="80" ></el-table-column>
@@ -94,7 +94,7 @@
 					htId:'',draftId:'',cpId:'',cpName:'',linkName:'',linkPhone:'',cpAddress:'',cpOpenBank:'',cpBankAccount:'',htName:'',htSn:'',htGrossAmount:'',htKaiPiaoAmount:'',htReceivedAmount:'',htReceivableAmount:'',htPayedAmount:'',htPayableAmount:'',htFile:'',htEffectDate:'',htFzUserid:'',htFzUsername:'',htParentType:'',htType:'',htSignDate:'',htExpireDate:'',htStatus:'',htDemand:'',htParty:'',htPartyName:'',htImportantClause:'',branchId:'',createTime:'',createUserId:'',createUserName:''
 				},
 				/**begin 自定义属性请在下面加 请加备注**/
-					
+				tableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -240,6 +240,10 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				
+				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				var subHeight=80/1000 * window.innerHeight; 
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				this.getXmProjectContracts();
         	}); 
 		}
diff --git a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
index ef7b09f6..4a9b4725 100644
--- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
+++ b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
@@ -9,7 +9,7 @@
 		</div>
 		<el-row class="app-container"> 
 			<!--列表 XmProjectEnvList xm_project_env_list-->
-			<el-table :data="xmProjectEnvLists" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :max-height="tableHeight" :data="xmProjectEnvLists" @sort-change="sortChange" 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="ipAddress" label="ip地址" min-width="80" ></el-table-column>
 				<el-table-column prop="port" label="访问端口" min-width="80" ></el-table-column>
@@ -135,6 +135,7 @@
 					name: this.selProject.name,
 				},
 
+				tableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -317,6 +318,10 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				
+				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				var subHeight=80/1000 * window.innerHeight; 
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				console.log(this.currProject);
 				this.getXmProjectEnvLists();
 			});
diff --git a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue
index 7f19705a..83a28a84 100644
--- a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue
+++ b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue
@@ -68,7 +68,7 @@
 				<el-button  v-else @click.stop="setTemplateVisible=false" icon="el-icon-back">返回</el-button>
 
 			</el-row>
-			<el-table ref="groupTable" @selection-change="addIsSels" @row-click.self="changesels" :data="convertXmProjectGroupFormworks"  v-loading="load.list">
+			<el-table ref="groupTable" :max-height="tableHeight" @selection-change="addIsSels" @row-click.self="changesels" :data="convertXmProjectGroupFormworks"  v-loading="load.list">
 				<el-table-column type="selection" aria-disabled width="55"></el-table-column>
 				<el-table-column align="center" prop="groupName" label="小组模板" width="200"></el-table-column>
 				<el-table-column   align="center" label="操作"> 
@@ -246,6 +246,7 @@
 				imGroupVisible:false,
 				groupRoleDescVisible:false,
 				setTemplateVisible:false,
+				tableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		}, //end data
@@ -552,6 +553,10 @@
 		},
 		mounted() {
 			this.$nextTick(() => {
+				
+				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				var subHeight=80/1000 * window.innerHeight; 
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				if(this.selGroups){
 					this.selGroups.forEach(i=>{
 						if(i.groupUsers){
diff --git a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkMng.vue b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkMng.vue
index c4de2231..3df456e0 100644
--- a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkMng.vue
+++ b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkMng.vue
@@ -8,7 +8,7 @@
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmProjectGroupFormwork xm_project_group_formwork-->
-			<el-table :data="xmProjectGroupFormworks" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :max-height="tableHeight" :data="xmProjectGroupFormworks" @sort-change="sortChange" 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 sortable type="index" width="40"></el-table-column>
 				<el-table-column prop="id" label="主键" min-width="80" ></el-table-column>
@@ -80,9 +80,10 @@
 				//编辑xmProjectGroupFormwork界面初始化数据
 				editForm: {
 					id:'',branchId:'',groupName:'',isPub:''
-				}
+				},
 				/**begin 自定义属性请在下面加 请加备注**/
-					
+				
+				tableHeight:300,	
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -222,6 +223,10 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				
+				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				var subHeight=80/1000 * window.innerHeight; 
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				this.getXmProjectGroupFormworks();
         	}); 
 		}
diff --git a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue
index bad1bcb5..c71abe55 100644
--- a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue
+++ b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue
@@ -7,7 +7,7 @@
  		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmProjectGroupState 功能状态表,无需前端维护，所有数据由汇总统计得出-->
-			<el-table :data="xmProjectGroupStates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :max-height="tableHeight" :data="xmProjectGroupStates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
  				<el-table-column sortable type="index" width="45"></el-table-column> 
   				<el-table-column prop="groupName" label="团队名称" min-width="80" ></el-table-column>   
 				<el-table-column prop="finishRate" label="总体进度" min-width="80" ></el-table-column>    
@@ -88,9 +88,10 @@
 				//编辑xmProjectGroupState界面初始化数据
 				editForm: {
 					id:'',planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',ctime:'',calcTime:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',testCases:'',execCases:'',designCases:'',finishCases:'',iterationCnt:'',taskCnt:'',finishTaskCnt:'',bizDate:'',bugCnt:'',groupId:'',projectId:'',projectName:'',groupName:''
-				}
+				},
 				/**begin 自定义属性请在下面加 请加备注**/
-					
+				
+				tableHeight:300,	
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -241,6 +242,10 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				
+				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				var subHeight=80/1000 * window.innerHeight; 
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				this.getXmProjectGroupStates();
         	}); 
         	/** 举例，
diff --git a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
index aaac89ba..d5e8ab8f 100644
--- a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
+++ b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
@@ -8,7 +8,7 @@
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmProjectGroupUser xm_project_group_user-->
-			<el-table :data="xmProjectGroupUsers" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :max-height="tableHeight" :data="xmProjectGroupUsers" @sort-change="sortChange" 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 sortable type="index" width="40"></el-table-column>
 				<el-table-column prop="id" label="主键" min-width="80" ></el-table-column>
@@ -80,9 +80,10 @@
 				//编辑xmProjectGroupUser界面初始化数据
 				editForm: {
 					id:'',groupId:'',userid:'',username:''
-				}
+				},
 				/**begin 自定义属性请在下面加 请加备注**/
-					
+				
+				tableHeight:300,	
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -222,6 +223,10 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				
+				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				var subHeight=80/1000 * window.innerHeight; 
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				this.getXmProjectGroupUsers();
         	}); 
 		}
diff --git a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue
index 3b6839c2..0f2d9704 100644
--- a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue
+++ b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue
@@ -8,7 +8,7 @@
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmProjectGroupUserCandidate xm_project_group_user_candidate-->
-			<el-table :data="xmProjectGroupUserCandidates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :max-height="tableHeight" :data="xmProjectGroupUserCandidates" @sort-change="sortChange" 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 sortable type="index" width="40"></el-table-column>
 				<el-table-column prop="id" label="主键" min-width="80" ></el-table-column>
@@ -84,9 +84,10 @@
 				//编辑xmProjectGroupUserCandidate界面初始化数据
 				editForm: {
 					id:'',groupId:'',userid:'',username:'',isHead:'',createTime:'',candidateStatus:'',outTime:''
-				}
+				},
 				/**begin 自定义属性请在下面加 请加备注**/
-					
+				
+				tableHeight:300,	
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -226,6 +227,10 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				
+				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				var subHeight=80/1000 * window.innerHeight; 
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				this.getXmProjectGroupUserCandidates();
         	}); 
 		}
diff --git a/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue b/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue
index f1bd9a58..fcdfcf10 100644
--- a/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue
+++ b/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue
@@ -9,7 +9,7 @@
 				</div>
 			</el-menu>  
 			<!--列表 XmProjectKpi xm_project_kpi-->
-			<el-table :data="xmProjectKpis" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :max-height="tableHeight" :data="xmProjectKpis" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column sortable type="index" width="40"></el-table-column> 
 				<el-table-column prop="kpiName" label="指标名称" min-width="80" ></el-table-column>
 				<el-table-column prop="minValue" label="正常值范围" min-width="80" >
@@ -102,9 +102,10 @@
 				//编辑xmProjectKpi界面初始化数据
 				editForm: {
 					projectId:'',branchId:'',kpiIndex:'',kpiName:'',maxValue:'',minValue:'',id:'',score:'',scoreDate:'',bizFlowState:'',bizProcInstId:'',kpiValue:'',remark:'',calcType:'',nextCalcDate:''
-				}
+				},
 				/**begin 自定义属性请在下面加 请加备注**/
-					
+				
+				tableHeight:300,	
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -249,6 +250,10 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				
+				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				var subHeight=80/1000 * window.innerHeight; 
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				this.getXmProjectKpis();
         	}); 
 		}
diff --git a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue
index 5d7d5ee8..bc2348f7 100644
--- a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue
+++ b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue
@@ -1,21 +1,26 @@
 <template>
 	<section>
 		<el-row class="app-container">
-			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
-			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectMBudgetCostNousers">查询</el-button>
-			<el-button type="primary" v-if="batchEditVisible==false"  @click="showAdd">+新增预算明细</el-button> 
-			<el-button type="primary" v-if="batchEditVisible==false" @click="batchEditVisible=true">批量修改</el-button> 
-			<el-button type="primary" v-if="batchEditVisible==true" @click="batchSave">批量保存</el-button>  
-			<el-button type="primary" v-if="batchEditVisible==true" @click="noBatchEdit">返回</el-button>  
-			<el-button type="danger"  v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> 
-			<span style="margin-left:10px;font-size:14px;">项目总预算：</span><el-tag type='success'> {{selProject.planTotalCost}}</el-tag> 
-			<span style="margin-left:10px;font-size:14px;">非人力总预算：</span><el-tag type='warning'>{{selProject.planNouserAt}}</el-tag>  
-			<span style="margin-left:10px;font-size:14px;">内部人力总预算：</span><el-tag type='warning'>{{selProject.planInnerUserAt}}</el-tag>  
-			<span style="margin-left:10px;font-size:14px;">外购人力总预算：</span><el-tag type='warning'>{{selProject.planOutUserAt}}</el-tag>  
+			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
+				<template slot="append">
+					<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectMBudgetCostNousers" icon="el-icon-search">查询</el-button>
+				</template>
+			</el-input>  
+			<el-button type="primary" v-if="batchEditVisible==false"  @click="showAdd" icon="el-icon-plus"></el-button> 
+			<el-button  v-if="batchEditVisible==false" @click="batchEditVisible=true" icon="el-icon-edit"></el-button> 
+			<el-button type="primary" v-if="batchEditVisible==true" @click="batchSave" icon="el-icon-finish">保存</el-button>  
+			<el-button  v-if="batchEditVisible==true" @click="noBatchEdit" icon="el-icon-back">返回</el-button>  
+			<el-button type="danger"  v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true" icon="el-icon-delete"></el-button> 
+			<font class="hidden-md-and-down">
+				<span style="margin-left:10px;font-size:14px;">项目总预算：</span><el-tag type='success'> {{selProject.planTotalCost}}</el-tag> 
+				<span style="margin-left:10px;font-size:14px;">非人力总预算：</span><el-tag type='warning'>{{selProject.planNouserAt}}</el-tag>  
+				<span style="margin-left:10px;font-size:14px;">内部人力总预算：</span><el-tag type='warning'>{{selProject.planInnerUserAt}}</el-tag>  
+				<span style="margin-left:10px;font-size:14px;">外购人力总预算：</span><el-tag type='warning'>{{selProject.planOutUserAt}}</el-tag>  
+			</font>
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmProjectMBudgetCostNouser xm_project_m_budget_cost_nouser-->
-			<el-table :data="xmProjectMBudgetCostNousers"     show-summary @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :max-height="tableHeight" :data="xmProjectMBudgetCostNousers"     show-summary @sort-change="sortChange" 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 sortable type="index" width="40"></el-table-column>   
 				<el-table-column prop="subjectId" label="预算科目编号" min-width="80" >
@@ -146,6 +151,7 @@
 				
 				batchEditVisible:false,	
 				valueChangeRows:[],	
+				tableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -338,6 +344,10 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				
+				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				var subHeight=100/1000 * window.innerHeight; 
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				this.getXmProjectMBudgetCostNousers();
 			}); 
 			
diff --git a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue
index c46619b0..5cec2a64 100644
--- a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue
+++ b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue
@@ -1,22 +1,27 @@
 <template>
 	<section>
 		<el-row class="app-container">
-			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
-			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectMBudgetCostUsers">查询</el-button>
-			<el-button type="primary" v-if="batchEditVisible==false"  @click="showAdd">+明细</el-button>
-			<el-button type="primary" v-if="batchEditVisible==false" @click="batchEditVisible=true">批量修改</el-button> 
-			<el-button type="primary" v-if="batchEditVisible==true" @click="batchSave">批量保存</el-button>  
-			<el-button type="primary" v-if="batchEditVisible==true" @click="noBatchEdit">返回</el-button> 
-			<el-button type="danger" v-if="batchEditVisible==false"  v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button>  
-				<span style="margin-left:10px;font-size:14px;">项目总预算：</span><el-tag type='success'> {{selProject.planTotalCost}}</el-tag> 
+			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
+				<template slot="append">
+					<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectMBudgetCostUsers" icon="el-icon-search">查询</el-button>
+				</template>
+			</el-input>  
+			<el-button type="primary" v-if="batchEditVisible==false"  @click="showAdd" icon="el-icon-plus"></el-button>
+			<el-button  v-if="batchEditVisible==false" @click="batchEditVisible=true" icon="el-icon-edit"></el-button> 
+			<el-button type="primary" v-if="batchEditVisible==true" @click="batchSave" icon="el-icon-finish">保存</el-button>  
+			<el-button   v-if="batchEditVisible==true" @click="noBatchEdit" icon="el-icon-back">返回</el-button> 
+			<el-button type="danger" v-if="batchEditVisible==false"  v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true"  icon="el-icon-delete"></el-button>  
+			<font class="hidden-md-and-down">
+				<span  style="margin-left:10px;font-size:14px;">项目总预算：</span><el-tag type='success'> {{selProject.planTotalCost}}</el-tag> 
 				<span style="margin-left:10px;font-size:14px;">非人力总预算：</span><el-tag type='warning'>{{selProject.planNouserAt}}</el-tag>  
 				<span style="margin-left:10px;font-size:14px;">内部人力总预算：</span><el-tag type='warning'>{{selProject.planInnerUserAt}}</el-tag>  
 				<span style="margin-left:10px;font-size:14px;">外购人力总预算：</span><el-tag type='warning'>{{selProject.planOutUserAt}}</el-tag>  
+			</font>
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmProjectMBudgetCostUser xm_project_m_budget_cost_user-->
-			<el-table :data="xmProjectMBudgetCostUsers" show-summary @sort-change="sortChange" 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 ref="table" :max-height="tableHeight" :data="xmProjectMBudgetCostUsers" show-summary @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+				<el-table-column sortable type="selection" width="60"></el-table-column>
 				<el-table-column sortable type="index" width="40"></el-table-column>   
 				<el-table-column prop="username" label="用户名" min-width="80" >
 					<template slot-scope="scope">
@@ -150,6 +155,7 @@
 				/**begin 自定义属性请在下面加 请加备注**/
 				batchEditVisible:false,	
 				valueChangeRows:[],
+				tableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -343,6 +349,10 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				debugger
+				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				var subHeight=100/1000 * window.innerHeight; 
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				this.getXmProjectMBudgetCostUsers();
 			}); 
 			
diff --git a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue
index e5046d40..6246ae1a 100644
--- a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue
+++ b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue
@@ -1,21 +1,25 @@
 <template>
 	<section>
 		<el-row class="app-container">
-			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
-			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectMCostNousers">查询</el-button>
-			<el-button type="primary" v-if="batchEditVisible==false"  @click="showAdd">+新增费用</el-button> 
-			<el-button type="primary" v-if="batchEditVisible==false" @click="batchEditVisible=true">批量修改</el-button> 
-			<el-button type="primary" v-if="batchEditVisible==true" @click="batchSave">批量保存</el-button>  
-			<el-button type="primary" v-if="batchEditVisible==true" @click="noBatchEdit">返回</el-button>  
-			<el-button type="danger"  v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> 
-			<span style="margin-left:10px;font-size:14px;">项目总成本：</span><el-tag type='success'> {{selProject.planTotalCost}}</el-tag> 
-			<span style="margin-left:10px;font-size:14px;">非人力总成本：</span><el-tag type='warning'>{{selProject.planNouserAt}}</el-tag>  
-			<span style="margin-left:10px;font-size:14px;">内部人力总成本：</span><el-tag type='warning'>{{selProject.planInnerUserAt}}</el-tag>  
-			<span style="margin-left:10px;font-size:14px;">外购人力总成本：</span><el-tag type='warning'>{{selProject.planOutUserAt}}</el-tag>  
+			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
+				<template slot="append">
+					<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectMCostNousers" icon="el-icon-search">查询</el-button>
+				</template></el-input> 
+ 			<el-button type="primary" v-if="batchEditVisible==false"  @click="showAdd"  icon="el-icon-plus"></el-button> 
+			<el-button type="primary" v-if="batchEditVisible==false" @click="batchEditVisible=true"  icon="el-icon-edit"></el-button> 
+			<el-button type="primary" v-if="batchEditVisible==true" @click="batchSave"  icon="el-icon-finish">保存</el-button>  
+			<el-button type="primary" v-if="batchEditVisible==true" @click="noBatchEdit"  icon="el-icon-back">返回</el-button>  
+			<el-button type="danger"  v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true"  icon="el-icon-delete"></el-button> 
+			<font class="hidden-md-and-down">
+				<span style="margin-left:10px;font-size:14px;">项目总成本：</span><el-tag type='success'> {{selProject.planTotalCost}}</el-tag> 
+				<span style="margin-left:10px;font-size:14px;">非人力总成本：</span><el-tag type='warning'>{{selProject.planNouserAt}}</el-tag>  
+				<span style="margin-left:10px;font-size:14px;">内部人力总成本：</span><el-tag type='warning'>{{selProject.planInnerUserAt}}</el-tag>  
+				<span style="margin-left:10px;font-size:14px;">外购人力总成本：</span><el-tag type='warning'>{{selProject.planOutUserAt}}</el-tag>  
+			</font>
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmProjectMCostNouser xm_project_m_budget_cost_nouser-->
-			<el-table :data="xmProjectMCostNousers"     show-summary @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :max-height="tableHeight" :data="xmProjectMCostNousers"     show-summary @sort-change="sortChange" 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 sortable type="index" width="40"></el-table-column>   
 				<el-table-column prop="subjectId" label="成本科目编号" min-width="80" >
@@ -148,6 +152,7 @@
 				
 				batchEditVisible:false,	
 				valueChangeRows:[],	
+				tableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -340,6 +345,10 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				
+				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				var subHeight=100/1000 * window.innerHeight; 
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				this.getXmProjectMCostNousers();
 			}); 
 			
diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue
index 10aacd2a..7d740182 100644
--- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue
+++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue
@@ -6,7 +6,7 @@
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmProjectMCostUser xm_project_m_budget_cost_user-->
-			<el-table :data="xmProjectMCostUsers" show-summary @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :max-height="tableHeight" :data="xmProjectMCostUsers" show-summary @sort-change="sortChange" 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 sortable type="index" width="40"></el-table-column>   
 				<el-table-column prop="username" label="用户名" min-width="80" >
@@ -127,6 +127,7 @@
 				editForm: {
 					subjectId:'',projectId:'',userid:'',createTime:'',sendCostTime:'',username:'',projectName:'',remark:'',id:'',taskId:'',taskName:'',actWorkload:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',projectPhaseId:'',actCostAmount:'',costType:'',bizMonth:'',bizDate:'',subjectName:'',projectPhaseName:''
 				},
+				tableHeight:300,
 				/**begin 自定义属性请在下面加 请加备注**/ 
 				/**end 自定义属性请在上面加 请加备注**/
 			}
@@ -238,6 +239,10 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				debugger
+				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				var subHeight=160/1000 * window.innerHeight; 
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				this.getXmProjectMCostUsers();
 			}); 
 			
diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue
index 5fe4ec5a..30846991 100644
--- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue
+++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue
@@ -1,21 +1,27 @@
 <template>
 	<section>
 		<el-row class="app-container">
-			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
-			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectMCostUsers">查询</el-button>
-			<el-button type="primary" v-if="batchEditVisible==false"  @click="showAdd">+明细</el-button>
-			<el-button type="primary" v-if="batchEditVisible==false" @click="batchEditVisible=true">批量修改</el-button> 
-			<el-button type="primary" v-if="batchEditVisible==true" @click="batchSave">批量保存</el-button>  
-			<el-button type="primary" v-if="batchEditVisible==true" @click="noBatchEdit">返回</el-button> 
-			<el-button type="danger" v-if="batchEditVisible==false"  v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button>  
+			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
+				<template slot="append">
+					<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectMCostUsers" icon="el-icon-search">查询</el-button>
+				</template>
+			</el-input> 
+			
+			<el-button type="primary" v-if="batchEditVisible==false"  @click="showAdd" icon="el-icon-plus"></el-button>
+			<el-button   v-if="batchEditVisible==false" @click="batchEditVisible=true" icon="el-icon-edit"></el-button> 
+			<el-button type="primary" v-if="batchEditVisible==true" @click="batchSave"> icon="el-icon-finish">保存</el-button>  
+			<el-button   v-if="batchEditVisible==true" @click="noBatchEdit" icon="el-icon-back">返回</el-button> 
+			<el-button type="danger" v-if="batchEditVisible==false"  v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true"  icon="el-icon-delete"></el-button>  
+			<font class="hidden-md-and-down">	
 				<span style="margin-left:10px;font-size:14px;">项目总成本：</span><el-tag type='success'> {{selProject.planTotalCost}}</el-tag> 
 				<span style="margin-left:10px;font-size:14px;">非人力总成本：</span><el-tag type='warning'>{{selProject.planNouserAt}}</el-tag>  
 				<span style="margin-left:10px;font-size:14px;">内部人力总成本：</span><el-tag type='warning'>{{selProject.planInnerUserAt}}</el-tag>  
 				<span style="margin-left:10px;font-size:14px;">外购人力总成本：</span><el-tag type='warning'>{{selProject.planOutUserAt}}</el-tag>  
+			</font>
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmProjectMCostUser xm_project_m_budget_cost_user-->
-			<el-table :data="xmProjectMCostUsers" show-summary @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :max-height="tableHeight" :data="xmProjectMCostUsers" show-summary @sort-change="sortChange" 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 sortable type="index" width="40"></el-table-column>   
 				<el-table-column prop="username" label="用户名" min-width="80" >
@@ -150,6 +156,7 @@
 				/**begin 自定义属性请在下面加 请加备注**/
 				batchEditVisible:false,	
 				valueChangeRows:[],
+				tableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -343,6 +350,9 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				var subHeight=100/1000 * window.innerHeight; 
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				this.getXmProjectMCostUsers();
 			}); 
 			
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
index d22f61dd..e4179073 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
@@ -24,7 +24,7 @@
  		</el-row> 
  		<el-row class="app-container" >   
 			<!--列表 XmProjectPhase xm_project_phase-->
-			<el-table  class="drag-table" default-expand-all :summary-method="getSummariesForBatchEdit" :data="projectPhaseTreeData"    :show-summary="true"  row-key="id" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :max-height="tableHeight" class="drag-table" default-expand-all :summary-method="getSummariesForBatchEdit" :data="projectPhaseTreeData"    :show-summary="true"  row-key="id" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @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="50"></el-table-column>
 				<el-table-column  prop="seqNo" label="序号" width="150">
 					<template  slot-scope="scope">
@@ -1210,7 +1210,9 @@
 		mounted() { 
        
 			this.$nextTick(() => {
-				this.tableHeight = window.innerHeight - 250; 
+				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				var subHeight=140/1000 * window.innerHeight; 
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				if(this.selProject){
 					this.getXmProjectPhases();
 				}
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
index 8ce1c941..a3904e55 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
@@ -1292,7 +1292,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
 			this.$nextTick(() => {
 				 
 				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=100/1000 * window.innerHeight; 
+				var subHeight=140/1000 * window.innerHeight; 
 				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				if(this.selProject){
 					this.getXmProjectPhases();
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index 7ee33c0d..62951620 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -680,7 +680,10 @@
 			}
 			this.$nextTick(() => {
 				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=65/1000 * window.innerHeight; 
+				var subHeight=50/1000 * window.innerHeight; 
+				if(this.selProject){
+					subHeight=100/1000 * window.innerHeight; 
+				}
 				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				this.getXmQuestions();
 			}); 
diff --git a/src/views/xm/core/xmRecord/XmRecord.vue b/src/views/xm/core/xmRecord/XmRecord.vue
index 407a55b6..078f1ec5 100644
--- a/src/views/xm/core/xmRecord/XmRecord.vue
+++ b/src/views/xm/core/xmRecord/XmRecord.vue
@@ -257,6 +257,10 @@
 			this.$nextTick(() => {
 				var clientRect=this.$refs.table.$el.getBoundingClientRect();
 				var subHeight=50/1000 * window.innerHeight; 
+				
+				if(this.projectId){
+					subHeight=100/1000 * window.innerHeight;
+				}
 				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				this.getXmRecords();
         	}); 
diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue
index 72cb0433..9e389959 100644
--- a/src/views/xm/core/xmTask/XmTaskList.vue
+++ b/src/views/xm/core/xmTask/XmTaskList.vue
@@ -439,7 +439,10 @@
 			this.filters.selProject=this.selProject
 			this.$nextTick(()=>{ 
 				var clientRect=this.$refs.taskTable.$el.getBoundingClientRect();
-				var subHeight=85; 
+				var subHeight=85/1000 * window.innerHeight;
+				if(this.selProject){
+					subHeight=100/1000 * window.innerHeight;
+				}
 				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.taskTable.$el.offsetTop-subHeight; 
 				this.getXmTasks(); 
 			});
diff --git a/src/views/xm/core/xmTask/XmTaskListForMenu.vue b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
index f72b1caa..e1be6499 100644
--- a/src/views/xm/core/xmTask/XmTaskListForMenu.vue
+++ b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
@@ -400,7 +400,7 @@
 		mounted() {
 			this.$nextTick(()=>{ 
 				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=85/1000 * window.innerHeight;
+				var subHeight=140/1000 * window.innerHeight;
 				if(this.isTaskCenter){
 					subHeight=50/1000 * window.innerHeight;
 				}
diff --git a/src/views/xm/core/xmTask/XmTaskListForProduct.vue b/src/views/xm/core/xmTask/XmTaskListForProduct.vue
index e607d3c4..2df0b793 100644
--- a/src/views/xm/core/xmTask/XmTaskListForProduct.vue
+++ b/src/views/xm/core/xmTask/XmTaskListForProduct.vue
@@ -460,7 +460,7 @@
 		mounted() { 
 			this.$nextTick(()=>{ 
 				var clientRect=this.$refs.taskTable.$el.getBoundingClientRect();
-				var subHeight=85/1000 * window.innerHeight;
+				var subHeight=140/1000 * window.innerHeight;
 				if(this.isTaskCenter){
 					subHeight=50/1000 * window.innerHeight;
 				}
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 89927620..48dcb87c 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -1664,7 +1664,7 @@ XmProjectGroupSelect
 			this.$nextTick(()=>{
 				this.getXmTasks();     
 				var clientRect=this.$refs.table.$el.getBoundingClientRect(); 
-				var subHeight=150/1000 * window.innerHeight;
+				var subHeight=140/1000 * window.innerHeight;
 				if(this.isTaskCenter){
 					subHeight=50/1000 * window.innerHeight;
 				}
diff --git a/src/views/xm/core/xmTask/XmTaskMngBatch.vue b/src/views/xm/core/xmTask/XmTaskMngBatch.vue
index af795111..572c085d 100644
--- a/src/views/xm/core/xmTask/XmTaskMngBatch.vue
+++ b/src/views/xm/core/xmTask/XmTaskMngBatch.vue
@@ -1272,7 +1272,7 @@
 			}
 			this.$nextTick(()=>{ 
 				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=85/1000 * window.innerHeight;
+				var subHeight=140/1000 * window.innerHeight;
 				if(this.isTaskCenter){
 					subHeight=50/1000 * window.innerHeight;
 				}
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
index 2c2641a7..42affd6a 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
@@ -783,7 +783,10 @@
 		mounted() { 
 			this.$nextTick(() => {
 				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=50; 
+				var subHeight=65/1000 * window.innerHeight;
+				if(this.selProject){
+					subHeight=100/1000 * window.innerHeight;
+				}
 				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				this.getXmTaskExecusers();
 				}); 
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
index 28ea30cf..5cf2c43f 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
@@ -299,7 +299,10 @@
 			this.$nextTick(() => {
 				this.getXmTestCases();
 				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=65; 
+				var subHeight=65;  
+				if(this.selProject){
+					subHeight=100/1000 * window.innerHeight;
+				}
 				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
         	}); 
         	/** 举例，
diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
index 5cacf1bf..742da48b 100644
--- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
+++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
@@ -633,7 +633,10 @@
 			this.filters.selProject=this.selProject; 
 			this.$nextTick(() => {
 				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
+				var subHeight=65/1000 * window.innerHeight; 
+				if(this.selProject){
+					subHeight=100/1000 * window.innerHeight;
+				}
 				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				this.getXmTestCaseExecs();
         	});