From 9749c7320a4d04e93b7c567fef351629566a08e9 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 23:26:35 +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

---
 .../core/xmBranchState/XmBranchStateMng.vue   |   6 +-
 src/views/xm/core/xmEnvList/XmEnvListMng.vue  |   6 +-
 .../xm/core/xmIteration/XmIterationMng.vue    |   8 +-
 .../xm/core/xmIteration/XmIterationSelect.vue |  10 +-
 .../xmIterationMenu/XmIterationMenuMng.vue    |   6 +-
 .../XmIterationProductLinkMng.vue             |   2 +-
 .../xmIterationState/XmIterationStateMng.vue  |   6 +-
 .../xmIterationState/XmIterationStateShow.vue |   5 +-
 src/views/xm/core/xmMenu/XmMenuMng.vue        |   8 +-
 src/views/xm/core/xmMenu/XmMenuMngBatch.vue   |  13 +-
 src/views/xm/core/xmMenu/XmMenuSelect.vue     |  10 +-
 src/views/xm/core/xmMenu/XmMenuWithPlan.vue   |  12 +-
 .../xm/core/xmMenuState/XmMenuStateMng.vue    |  10 +-
 .../core/xmMenuTemplate/XmMenuTemplateMng.vue |   4 +-
 src/views/xm/core/xmProduct/XmProductMng.vue  |  10 +-
 .../xm/core/xmProduct/XmProductSelect.vue     |  10 +-
 .../xm/core/xmProduct/XmProductTplMng.vue     |   4 +-
 .../core/xmProductState/XmProductStateMng.vue |   2 +-
 .../XmProductTemplateMng.vue                  |   7 +-
 .../xm/core/xmProject/XmProjectBudgetCost.vue |   8 +-
 src/views/xm/core/xmProject/XmProjectCost.vue |   8 +-
 .../xm/core/xmProject/XmProjectForLink.vue    |   6 +-
 src/views/xm/core/xmProject/XmProjectList.vue |   6 +-
 src/views/xm/core/xmProject/XmProjectMng.vue  |   2 +-
 .../xm/core/xmProject/XmProjectSelect.vue     |   6 +-
 .../xm/core/xmProject/XmProjectTplMng.vue     |  11 +-
 .../XmProjectBaselineAdd.vue                  | 225 ---------------
 .../XmProjectBaselineEdit.vue                 | 220 --------------
 .../XmProjectBaselineMng.vue                  | 270 ------------------
 .../XmProjectContractMng.vue                  |   5 +-
 .../xmProjectEnvList/XmProjectEnvListMng.vue  |   7 +-
 .../xmProjectOptions/XmProjectOptionsAdd.vue  | 117 --------
 .../xmProjectOptions/XmProjectOptionsEdit.vue | 112 --------
 .../xmProjectOptions/XmProjectOptionsMng.vue  | 234 ---------------
 .../xmProjectPhase/XmProjectPhaseBatch.vue    |   2 +-
 .../XmProjectPhaseBaselineAdd.vue             | 171 -----------
 .../XmProjectPhaseBaselineEdit.vue            | 166 -----------
 .../XmProjectPhaseBaselineMng.vue             | 252 ----------------
 .../XmProjectPhaseTemplateMng.vue             |   9 +-
 .../core/xmProjectState/XmProjectStateMng.vue |   4 +-
 .../XmProjectTaskTypeStateMng.vue             |   7 +-
 .../XmProjectTemplateList.vue                 |   9 +-
 .../XmProjectTemplateMng.vue                  |   9 +-
 .../xm/core/xmQuestion/XmQuestionMng.vue      |   2 +-
 .../xmQuestionHandle/XmQuestionHandleMng.vue  |   7 +-
 .../core/xmQuestionTag/XmQuestionTagAdd.vue   | 120 --------
 .../core/xmQuestionTag/XmQuestionTagEdit.vue  | 115 --------
 .../core/xmQuestionTag/XmQuestionTagMng.vue   | 235 ---------------
 src/views/xm/core/xmRecord/XmRecord.vue       |  10 +-
 .../xm/core/xmTask/XmTaskAgileKanban.vue      |   3 +
 src/views/xm/core/xmTask/XmTaskList.vue       |   2 +-
 .../xm/core/xmTask/XmTaskListForMenu.vue      |   2 +-
 src/views/xm/core/xmTask/XmTaskMng.vue        |   2 +-
 src/views/xm/core/xmTask/XmTaskMngBatch.vue   |   2 +-
 .../core/xmTaskExecuser/XmTaskExecuserMng.vue |   6 +-
 .../xm/core/xmTaskSkill/XmTaskSkillMng.vue    |   4 +-
 .../core/xmTaskTemplate/XmTaskTemplateMng.vue |   4 +-
 .../xm/core/xmTestCase/XmTestCaseMng.vue      |  15 +-
 .../core/xmTestCaseExec/XmTestCaseExecMng.vue |  15 +-
 59 files changed, 136 insertions(+), 2413 deletions(-)
 delete mode 100644 src/views/xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue
 delete mode 100644 src/views/xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue
 delete mode 100644 src/views/xm/core/xmProjectBaseline/XmProjectBaselineMng.vue
 delete mode 100644 src/views/xm/core/xmProjectOptions/XmProjectOptionsAdd.vue
 delete mode 100644 src/views/xm/core/xmProjectOptions/XmProjectOptionsEdit.vue
 delete mode 100644 src/views/xm/core/xmProjectOptions/XmProjectOptionsMng.vue
 delete mode 100644 src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue
 delete mode 100644 src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue
 delete mode 100644 src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue
 delete mode 100644 src/views/xm/core/xmQuestionTag/XmQuestionTagAdd.vue
 delete mode 100644 src/views/xm/core/xmQuestionTag/XmQuestionTagEdit.vue
 delete mode 100644 src/views/xm/core/xmQuestionTag/XmQuestionTagMng.vue

diff --git a/src/views/xm/core/xmBranchState/XmBranchStateMng.vue b/src/views/xm/core/xmBranchState/XmBranchStateMng.vue
index f7e92f8f..098a1fd3 100644
--- a/src/views/xm/core/xmBranchState/XmBranchStateMng.vue
+++ b/src/views/xm/core/xmBranchState/XmBranchStateMng.vue
@@ -7,7 +7,7 @@
  		</el-row>
 		<el-row class="page-main "> 
 			<!--列表 XmBranchState 机构内所有项目指标汇总-->
-			<el-table :data="xmBranchStates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="maxTableHeight" :data="xmBranchStates" @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="branchId" label="机构" min-width="120" >
 					<template scope="scope">
@@ -132,7 +132,8 @@
 				//编辑xmBranchState界面初始化数据
 				editForm: {
 					bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',id:'',totalStaffCnt:'',calcTime:'',calcStatus:'',totalCostNouserAmount:'',totalClosedBugCnt:'',totalResolvedBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetInnerUserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOutUserAmount:'',totalCompleteWorkload:'',totalCostInnerUserAmount:'',totalCostOutUserAmount:'',totalProgress:'',totalActiveBugCnt:'',totalConfirmedBugCnt:'',projectStatus:'',totalActWorkload:'',totalActOutWorkload:'',totalActInnerWorkload:'',totalTaskBudgetCostAt:'',totalTaskOutCnt:'',totalNeedPayCnt:'',totalFinishPayCnt:'',totalFinishPayUserCnt:'',totalNeedPayUserCnt:'',totalPlanInnerUserWorkload:'',totalPlanOutUserWorkload:'',testCases:'',execCases:'',designCases:'',finishCases:'',iterationCnt:'',productCnt:'',menuCnt:''
-				}
+				},
+				maxTableHeight:300,
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
@@ -290,6 +291,7 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 				this.getXmBranchStates();
         	}); 
         	/** 举例，
diff --git a/src/views/xm/core/xmEnvList/XmEnvListMng.vue b/src/views/xm/core/xmEnvList/XmEnvListMng.vue
index f458a22b..8b03f654 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="page-main "> 
 			<!--列表 XmEnvList xm_env_list-->
-			<el-table ref="table" :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 ref="table" :height="maxTableHeight" :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,7 +101,7 @@
 				/**begin 自定义属性请在下面加 请加备注**/
 				
 				envStateList:["不可用","已启用","已过期"],
-				tableHeight:300,
+				maxTableHeight:300,
 				// 	{
 				// 		value: "0",
 				// 		label: "不可用",
@@ -257,7 +257,7 @@
 		},
 		mounted() { 
 			this.$nextTick(() => { 
-				this.tableHeight =  util.calcTableMaxHeight(".el-table");  
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 				this.getXmEnvLists();
         	}); 
 		}
diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue
index db340208..4870f0f6 100644
--- a/src/views/xm/core/xmIteration/XmIterationMng.vue
+++ b/src/views/xm/core/xmIteration/XmIterationMng.vue
@@ -73,7 +73,7 @@
  		</el-row>
 		<el-row  class="page-main">
 			<!--列表 XmIteration 迭代定义-->
-			<el-table ref="table" :height="tableHeight" v-if="!gstcVisible" :data="xmIterationTreeData" row-key="id"  default-expand-all :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" :height="maxTableHeight" v-if="!gstcVisible" :data="xmIterationTreeData" row-key="id"  default-expand-all :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" aria-disabled width="55"></el-table-column>
 				<el-table-column prop="iterationName" label="迭代名称" min-width="260">
 					 <template slot-scope="scope">
@@ -216,7 +216,7 @@ import XmIterationSelect from './XmIterationSelect.vue';
 				iterationStateVisible:false,
 				iterationSelectVisible:false,
 				gstcVisible:false,
-				tableHeight:300,
+				maxTableHeight:300,
 				ganrrColumns: {
 				children: 'children',
 				name: 'iterationName',
@@ -525,9 +525,7 @@ import XmIterationSelect from './XmIterationSelect.vue';
 		},
 		mounted() {
 			this.$nextTick(() => {
-				
-				
-				this.tableHeight =  util.calcTableMaxHeight(".el-table");
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 				this.getXmIterations();
         	});
           // console.log(this.dateRanger,this.dateRangerOnline);
diff --git a/src/views/xm/core/xmIteration/XmIterationSelect.vue b/src/views/xm/core/xmIteration/XmIterationSelect.vue
index fe67f096..4d6885ef 100644
--- a/src/views/xm/core/xmIteration/XmIterationSelect.vue
+++ b/src/views/xm/core/xmIteration/XmIterationSelect.vue
@@ -2,7 +2,7 @@
 	<section> 
 		<el-row>
 			<!--列表 XmIteration 迭代定义-->
-			<el-table ref="table" :height="tableHeight" :data="xmIterationTreeData" row-key="id"  default-expand-all :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" :height="maxTableHeight" :data="xmIterationTreeData" row-key="id"  default-expand-all :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 prop="iterationName" label="迭代名称" min-width="160" >
 					<template slot="header" slot-scope="scope">
 					迭代名称 <el-popover v-if=" !menuId && !productId"
@@ -151,7 +151,7 @@
 				parentIteration:null,
 				iterationStateVisible:false,
 				gstcVisible:false,
-				tableHeight:300,
+				maxTableHeight:300,
 				ganrrColumns: {
 				children: 'children',
 				name: 'iterationName',
@@ -350,10 +350,8 @@
 		    //在下面添加其它组件
 		},
 		mounted() {
-			this.$nextTick(() => {
-				
-				
-				this.tableHeight =  util.calcTableMaxHeight(".el-table");
+			this.$nextTick(() => { 
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 				this.getXmIterations();
         	});
            
diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
index cc4ea664..f7a67bfc 100644
--- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
+++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
@@ -15,7 +15,7 @@
 				</el-row>
 				<el-row class="page-main padding-top padding-left">
 					<!--列表 XmIterationMenu 迭代定义-->
-					<el-table ref="table" :height="tableHeight" :data="xmIterationMenusTreeData"  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" :height="maxTableHeight" :data="xmIterationMenusTreeData"  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  type="selection" width="45"></el-table-column> 
 						<el-table-column prop="menuName" label="需求名称" min-width="140" > 
 							<template slot-scope="scope">
@@ -103,7 +103,7 @@
 				},
 				iteration:null,
 				menuVisible:false,
-				tableHeight:300,
+				maxTableHeight:300,
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
@@ -332,7 +332,7 @@
 			this.$nextTick(() => {
 				
 				
-				this.tableHeight =  util.calcTableMaxHeight(".el-table"); 
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 				this.getXmIterationMenus();
         	}); 
         	/** 举例，
diff --git a/src/views/xm/core/xmIterationProductLink/XmIterationProductLinkMng.vue b/src/views/xm/core/xmIterationProductLink/XmIterationProductLinkMng.vue
index 62105115..16c4e37e 100644
--- a/src/views/xm/core/xmIterationProductLink/XmIterationProductLinkMng.vue
+++ b/src/views/xm/core/xmIterationProductLink/XmIterationProductLinkMng.vue
@@ -275,7 +275,7 @@ import XmIterationSelect from '../xmIteration/XmIterationSelect.vue';
 		mounted() { 
 			this.$nextTick(() => {
 				this.getXmIterationProductLinks(); 
-                this.maxTableHeight =  util.calcTableMaxHeight(".el-table")
+                this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.xmIterationProductLink.$el)
         	}); 
         	/** 举例，
     		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
diff --git a/src/views/xm/core/xmIterationState/XmIterationStateMng.vue b/src/views/xm/core/xmIterationState/XmIterationStateMng.vue
index 418cc907..ba9e9b5e 100644
--- a/src/views/xm/core/xmIterationState/XmIterationStateMng.vue
+++ b/src/views/xm/core/xmIterationState/XmIterationStateMng.vue
@@ -6,7 +6,7 @@
   		</el-row>
 		<el-row class="page-main "> 
 			<!--列表 XmIterationState 迭代定义-->
-			<el-table :data="xmIterationStates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="maxTableHeight" :data="xmIterationStates" @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="iterationName" label="迭代名称" min-width="80" ></el-table-column>
 				<el-table-column prop="finishRate" label="进度" min-width="80">
@@ -98,7 +98,8 @@
 				//编辑xmIterationState界面初始化数据
 				editForm: {
 					id:'',distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',finishRate:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',productCnt:'',menuCnt:'',taskCnt:'',finishTaskCnt:'',calcTime:'',iterationName:'',budgetCost:'',budgetWorkload:'',iterationId:''
-				}
+				},
+				maxTableHeight:300,
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
@@ -242,6 +243,7 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 				this.getXmIterationStates();
         	}); 
         	/** 举例，
diff --git a/src/views/xm/core/xmIterationState/XmIterationStateShow.vue b/src/views/xm/core/xmIterationState/XmIterationStateShow.vue
index 418cc907..80345c89 100644
--- a/src/views/xm/core/xmIterationState/XmIterationStateShow.vue
+++ b/src/views/xm/core/xmIterationState/XmIterationStateShow.vue
@@ -6,7 +6,7 @@
   		</el-row>
 		<el-row class="page-main "> 
 			<!--列表 XmIterationState 迭代定义-->
-			<el-table :data="xmIterationStates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="maxTableHeight" :data="xmIterationStates" @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="iterationName" label="迭代名称" min-width="80" ></el-table-column>
 				<el-table-column prop="finishRate" label="进度" min-width="80">
@@ -98,7 +98,7 @@
 				//编辑xmIterationState界面初始化数据
 				editForm: {
 					id:'',distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',finishRate:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',productCnt:'',menuCnt:'',taskCnt:'',finishTaskCnt:'',calcTime:'',iterationName:'',budgetCost:'',budgetWorkload:'',iterationId:''
-				}
+				},maxTableHeight:300,
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
@@ -243,6 +243,7 @@
 		mounted() { 
 			this.$nextTick(() => {
 				this.getXmIterationStates();
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
         	}); 
         	/** 举例，
     		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index f572014a..1db4d788 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -91,7 +91,7 @@
 						</el-popover>  
 					 </el-row>  
 					<el-row class="padding-top">  
-						<el-table lazy :load="loadMenusLazy"  class="menu-mng-table" stripe fit border ref="table" :max-height="tableHeight" :data="xmMenusTreeData"  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick">
+						<el-table lazy :load="loadMenusLazy" stripe fit border ref="table" :max-height="maxTableHeight" :data="xmMenusTreeData"  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick">
 							<el-table-column sortable type="selection" width="40"></el-table-column> 
 							<el-table-column prop="menuName" label="需求名称" min-width="160"> 
 								<template slot-scope="scope">
@@ -342,7 +342,7 @@
 				iterationVisible:false,
 				userSelectVisible:false,
 				selectFiltersMmUserVisible:false,
-				tableHeight:300,
+				maxTableHeight:300,
 				dateRanger: [ ],  
 				pickerOptions:  util.pickerOptions('datarange'),
 				productVisible:false,
@@ -928,9 +928,7 @@
 				this.productVisible=false;
 			}
 			this.$nextTick(() => { 
-				
-				 
-				this.tableHeight =  util.calcTableMaxHeight(".menu-mng-table"); 
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 				this.getXmMenus();
           });  
 		}
diff --git a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
index 386d98ce..d3ba253c 100644
--- a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
@@ -93,7 +93,7 @@
 			
 			</el-row>
 			<el-row style="padding-top:12px;"> 
-				<el-table ref="table" :height="tableHeight" :data="xmMenusTreeData" class="drag-table" 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" :height="maxTableHeight" :data="xmMenusTreeData" class="drag-table" 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  type="selection" width="45"></el-table-column>
 					<el-table-column  prop="seqNo"  label="序号" min-width="100">
 						<template slot-scope="scope">
@@ -297,7 +297,7 @@
 				iterationVisible:false,
 				userSelectVisible:false,
 				selectFiltersMmUserVisible:false,
-				tableHeight:300,
+				maxTableHeight:300,
 				dateRanger: [ ],  
 				pickerOptions:  util.pickerOptions('datarange'),
  				/**begin 自定义属性请在下面加 请加备注**/
@@ -1080,13 +1080,8 @@
 		mounted() { 
 			this.$nextTick(() => { 
 				this.filters.product=this.product
-				this.getXmMenus();
-				
-				
-				if(this.selProject){
-					subHeight=110/1000 * window.innerHeight; 
-				} 
-				this.tableHeight =  util.calcTableMaxHeight(".el-table"); 
+				this.getXmMenus(); 
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 				
 				
           }); 
diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index 8b5fc362..6a674c35 100644
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@@ -76,7 +76,7 @@
 					<el-button   type="primary" v-if="multi"  v-on:click="multiSelectedConfirm">确认选择</el-button>
 				</el-row>
 				<el-row style="padding-top:12px;">
-					<el-table ref="table" class="menu-table"  lazy :load="loadMenusLazy" :height="tableHeight" :data="xmMenusTreeData" default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+					<el-table ref="table" class="menu-table"  lazy :load="loadMenusLazy" :height="maxTableHeight" :data="xmMenusTreeData" default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 						<el-table-column v-if="multi" type="selection" width="50"></el-table-column>  
 						<el-table-column prop="menuName" label="需求名称" min-width="140" > 
 							<template slot-scope="scope">
@@ -182,7 +182,7 @@
  				menuDetailVisible:false,
 				 selectFiltersMmUserVisible:false,
 				/**begin 自定义属性请在下面加 请加备注**/
-				tableHeight:300,
+				maxTableHeight:300,
 				dateRanger: [ ],  
 				pickerOptions:  util.pickerOptions('datarange'),
 				/**end 自定义属性请在上面加 请加备注**/
@@ -418,10 +418,8 @@
 				if(this.excludeIterationId){
 					this.filters.iterationFilterType='not-join'
 				}
-				this.getXmMenus(); 
-            	
-				
-				this.tableHeight =  util.calcTableMaxHeight(".menu-table"); 
+				this.getXmMenus();  
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
         	}); 
 		}
 	}
diff --git a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
index ae978584..e6c020d7 100644
--- a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
+++ b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
@@ -14,7 +14,7 @@
 			<el-button  v-if=" batchEditVisible==true "  @click="noBatchEdit" v-loading="load.edit" icon="el-icon-back">返回</el-button>  
   		</el-row>
 		<el-row class="page-main" v-show="!batchEditVisible">    
-				<el-table ref="table" class="menu-plan-table" :height="tableHeight" v-if="!gstcVisible" :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" :height="maxTableHeight" v-if="!gstcVisible" :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"> 
@@ -94,7 +94,7 @@
 				  
 		</el-row>
 		<el-row v-show="batchEditVisible">
-			<el-table  lazy :load="loadMenusLazy" :height="tableHeight" :data="xmMenusTreeData"   row-key="menuId" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table  lazy :load="loadMenusLazy" :height="maxTableHeight" :data="xmMenusTreeData"   row-key="menuId" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
  
  					<el-table-column prop="menuName" label="需求名称" min-width="150" >
 						<template slot-scope="scope">  
@@ -230,7 +230,7 @@
 				menuDetailVisible:false,
 				/**begin 自定义属性请在下面加 请加备注**/
 				gstcVisible:false,
-				tableHeight:300,
+				maxTableHeight:300,
 				ganrrColumns: {
           children: 'children',
           name: 'menuName',
@@ -574,10 +574,8 @@
 			XmGroupMng,XmTaskMng,XmMenuRichDetail,XmGantt
 		},
 		mounted() {  
-			this.$nextTick(() => {
-				
-				
-				this.tableHeight =  util.calcTableMaxHeight(".menu-plan-table");  
+			this.$nextTick(() => { 
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 				this.getXmMenus();
 			}); 
 				listOption([{categoryId:'all',itemCode:'xmMenuPlanStatus'} ]).then(res=>{
diff --git a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
index e0989439..3827a2e8 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="page-main" v-show="!batchEditVisible">    
-				<el-table ref="table" :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 ref="table" :height="maxTableHeight" :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"> 
@@ -216,7 +216,7 @@
 				valueChangeRows:[],
 				selGroups:null,
 				menuDetailVisible:false,
-				tableHeight:300,
+				maxTableHeight:300,
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
@@ -480,10 +480,8 @@
 			XmGroupMng,XmTaskMng,XmMenuRichDetail
 		},
 		mounted() {  
-			this.$nextTick(() => {
-				
-				
-				this.tableHeight =  util.calcTableMaxHeight(".el-table"); 
+			this.$nextTick(() => { 
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 				this.getXmMenus();
 			}); 
 				listOption([{categoryId:'all',itemCode:'xmMenuStateStatus'} ]).then(res=>{
diff --git a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
index cbcf8ac9..60a1fffc 100644
--- a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
+++ b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
@@ -15,7 +15,7 @@
 				<xm-product-template-mng @row-click="onProductSelected" ref="xmProductTemplateMng" :simple="true"></xm-product-template-mng>
 			</el-col>
 			<el-col v-show="!batchEditVisible" :span="batchEditVisible?24:18">
-				<el-table :data="xmMenuTemplatesTreeData" 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" :height="maxTableHeight" :data="xmMenuTemplatesTreeData" 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="120" > 
 						<template slot-scope="scope">
@@ -165,6 +165,7 @@
 				
 				batchEditVisible:false,
 				valueChangeRows:[],
+				maxTableHeight:300,
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
@@ -615,6 +616,7 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 				this.getXmMenuTemplates();
           }); 
       // 阻止默认行为
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index e95ae808..b631273b 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -126,7 +126,7 @@
 				</el-row>
 				<el-row  class="padding-top" v-show="!showType">
 					<!--列表 XmProduct 产品表-->
-					<el-table ref="table"  :height="tableHeight" :data="xmProducts" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+					<el-table ref="table"  :height="maxTableHeight" :data="xmProducts" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 						
 						<el-table-column type="index" width="60"> 
 						</el-table-column>
@@ -309,7 +309,7 @@ import XmProductSelect from './XmProductSelect.vue';
 				iterationSelectVisible:false,
 				productStateVisible:false,
 				selectFiltersPmUserVisible:false,
-				tableHeight:300,
+				maxTableHeight:300,
 				dateRanger: [ 
 				],
 				pickerOptions:  util.pickerOptions('datarange'),
@@ -650,10 +650,8 @@ import XmProductSelect from './XmProductSelect.vue';
 					this.options['xmProductPstatus']=res.data.data.xmProductPstatus   
 				}
 			});
-			this.$nextTick(() => {
-				
-				
-				this.tableHeight =  util.calcTableMaxHeight('.el-table');
+			this.$nextTick(() => { 
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 				this.getXmProducts();
         	});
 		}
diff --git a/src/views/xm/core/xmProduct/XmProductSelect.vue b/src/views/xm/core/xmProduct/XmProductSelect.vue
index 2c2e395d..d5caf0a1 100644
--- a/src/views/xm/core/xmProduct/XmProductSelect.vue
+++ b/src/views/xm/core/xmProduct/XmProductSelect.vue
@@ -2,7 +2,7 @@
 	<section>  
 		<el-row > 
 			<!--列表 XmProduct 产品表-->
-			<el-table  ref="table" :height="tableHeight" :data="xmProducts" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table  ref="table" :height="maxTableHeight" :data="xmProducts" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
  				 <el-table-column prop="productName"  label="产品名称" min-width="150" > 
 					 <template slot="header" slot-scope="scope"> 
 						 产品名称 
@@ -151,7 +151,7 @@
 				iterationVisible:false,
 				productStateVisible:false,
 				selectFiltersPmUserVisible:false,
-				tableHeight:300,
+				maxTableHeight:300,
 				dateRanger: [ ],  
 				pickerOptions:  util.pickerOptions('datarange'),
 				
@@ -304,10 +304,8 @@
 		    //在下面添加其它组件
 		},
 		mounted() { 
-			this.$nextTick(() => {
-				
-				
-				this.tableHeight =  util.calcTableMaxHeight(".el-table"); 
+			this.$nextTick(() => { 
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 				this.getXmProducts();
         	}); 
 		}
diff --git a/src/views/xm/core/xmProduct/XmProductTplMng.vue b/src/views/xm/core/xmProduct/XmProductTplMng.vue
index 69654815..5359e7d2 100644
--- a/src/views/xm/core/xmProduct/XmProductTplMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductTplMng.vue
@@ -425,8 +425,8 @@
 		    //在下面添加其它组件
 		},
 		mounted() {
-			this.$nextTick(() => {  
-                this.maxTableHeight = util.calcTableMaxHeight('.el-table');
+			this.$nextTick(() => {   
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 				this.getXmProducts();
         	});
 		}
diff --git a/src/views/xm/core/xmProductState/XmProductStateMng.vue b/src/views/xm/core/xmProductState/XmProductStateMng.vue
index fd911849..10b6b370 100644
--- a/src/views/xm/core/xmProductState/XmProductStateMng.vue
+++ b/src/views/xm/core/xmProductState/XmProductStateMng.vue
@@ -227,7 +227,7 @@
 				
 				
 				
-				this.tableHeight =  util.calcTableMaxHeight(".el-table"); 
+				this.tableHeight =  util.calcTableMaxHeight(this.$refs.table.$$el); 
 				this.getXmProductStates();
         	}); 
         	/** 举例，
diff --git a/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue b/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue
index a44ea50b..11fc508a 100644
--- a/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue
+++ b/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue
@@ -8,7 +8,7 @@
 		</el-row>
 		<el-row  v-show="simple!=true" class="page-main"> 
 			<!--列表 XmProductTemplate 产品表-->
-			<el-table   :data="xmProductTemplates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table  ref="table" :height="maxTableHeight" :data="xmProductTemplates" @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>
@@ -29,7 +29,7 @@
 		
 		<el-row  v-show="simple==true" > 
 			<!--列表 XmProductTemplate 产品表-->
-			<el-table   :data="xmProductTemplates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="maxTableHeight"  :data="xmProductTemplates" @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="id" label="产品编号" min-width="80" ></el-table-column>
 				<el-table-column prop="productName" label="产品名称" min-width="80" ></el-table-column> 
@@ -246,7 +246,8 @@
 		    //在下面添加其它组件
 		},
 		mounted() { 
-			this.$nextTick(() => {
+			this.$nextTick(() => { 
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 				this.getXmProductTemplates();
         	}); 
 		}
diff --git a/src/views/xm/core/xmProject/XmProjectBudgetCost.vue b/src/views/xm/core/xmProject/XmProjectBudgetCost.vue
index c70485c8..ddd9bde4 100644
--- a/src/views/xm/core/xmProject/XmProjectBudgetCost.vue
+++ b/src/views/xm/core/xmProject/XmProjectBudgetCost.vue
@@ -56,6 +56,7 @@
 				</el-table>
 
 				<el-table
+					ref="table"
 					:height="tableHeight"
 					v-if="showType == '非人力'"
 					:data="sumXmProjectMBudgetCostNousersConvert" 
@@ -305,10 +306,9 @@ import { months } from 'moment';
 		},
 		mounted() { 
 			this.showType = "人力";
-				this.$nextTick(() => { 
-					//
-					var subHeight=700/1000 * window.innerHeight; 
-					this.tableHeight =  window.innerHeight-subHeight; 
+				this.$nextTick(() => {  
+					
+				this.tableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 			  }); 
 			  this.selProjectBudget=Object.assign({},this.selProject);
 		}
diff --git a/src/views/xm/core/xmProject/XmProjectCost.vue b/src/views/xm/core/xmProject/XmProjectCost.vue
index a5c38e2b..85edf26f 100644
--- a/src/views/xm/core/xmProject/XmProjectCost.vue
+++ b/src/views/xm/core/xmProject/XmProjectCost.vue
@@ -27,7 +27,8 @@
 						:value="item">
 					</el-option>
 				</el-select> -->
-				<el-table
+				<el-table ref="table"
+					:height="maxTableHeight"
 					v-if="showType == '人力'"
 					:data="sumXmProjectMCostUsersConvert"
 					highlight-current-row
@@ -212,6 +213,7 @@ import { months } from 'moment';
 				sumXmProjectMCostNousers:[],
 				costNouser:null, 
 				costNouserVisible:false,
+				maxTableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -302,8 +304,10 @@ import { months } from 'moment';
 		},
 		mounted() { 
 			this.showType = "人力";
-				this.$nextTick(() => { 
+				this.$nextTick(() => {  
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 			  }); 
+			  
 			  this.selProjectBudget=Object.assign({},this.selProject);
 		}
 	}
diff --git a/src/views/xm/core/xmProject/XmProjectForLink.vue b/src/views/xm/core/xmProject/XmProjectForLink.vue
index ad1ab577..f5c5db27 100644
--- a/src/views/xm/core/xmProject/XmProjectForLink.vue
+++ b/src/views/xm/core/xmProject/XmProjectForLink.vue
@@ -211,10 +211,8 @@ XmProjectList
 		    //在下面添加其它组件
 		},
 		mounted() { 
-			this.$nextTick(() => {
-				
-				
-				this.tableHeight =  util.calcTableMaxHeight(".el-table"); 
+			this.$nextTick(() => { 
+				this.tableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 				this.showInfo = false;
 				this.getXmProjects();
       }); 
diff --git a/src/views/xm/core/xmProject/XmProjectList.vue b/src/views/xm/core/xmProject/XmProjectList.vue
index fbc69621..5ec5c4b1 100644
--- a/src/views/xm/core/xmProject/XmProjectList.vue
+++ b/src/views/xm/core/xmProject/XmProjectList.vue
@@ -152,10 +152,8 @@
 		    //在下面添加其它组件
 		},
 		mounted() { 
-			this.$nextTick(() => {
-				
-				
-				this.tableHeight =  util.calcTableMaxHeight(".el-table"); 
+			this.$nextTick(() => { 
+				this.tableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 				this.showInfo = false;
 				this.getXmProjects();
       }); 
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index 5b1f6e4e..abc9c3fd 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -744,7 +744,7 @@
 				this.filters.productName=this.$route.params.productName;
 			}
 			this.$nextTick(() => {  
-                this.maxTableHeight = util.calcTableMaxHeight('.el-table');
+                this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
 				this.showInfo = false;
 				this.getXmProjects();
 			}); 
diff --git a/src/views/xm/core/xmProject/XmProjectSelect.vue b/src/views/xm/core/xmProject/XmProjectSelect.vue
index f7f9f1e0..c2695773 100644
--- a/src/views/xm/core/xmProject/XmProjectSelect.vue
+++ b/src/views/xm/core/xmProject/XmProjectSelect.vue
@@ -156,10 +156,8 @@
 		    //在下面添加其它组件
 		},
 		mounted() { 
-			this.$nextTick(() => {  
-                
-                
-                this.maxTableHeight = window.innerHeight - top -100;
+			this.$nextTick(() => {    
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el);  
 				this.showInfo = false;
 				this.getXmProjects();
       }); 
diff --git a/src/views/xm/core/xmProject/XmProjectTplMng.vue b/src/views/xm/core/xmProject/XmProjectTplMng.vue
index efa27fab..14925ce7 100644
--- a/src/views/xm/core/xmProject/XmProjectTplMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectTplMng.vue
@@ -152,14 +152,13 @@
 				finishFlag: false,
 				xmRecordVisible: false,
 				productSelectVisible:false,
-				tableHeight:300,
+				maxTableHeight:300,
 				dateRanger: [ ],  
 				pickerOptions:  util.pickerOptions('datarange'),
 				xmProjectCopy:{
 					id:'',name:'',code:'',isTpl:'',copyPhase:'1',copyTask:'1',copyGrup:'0'
 				},
-				copyToVisible:false,
-				maxTableHeight:300,
+				copyToVisible:false, 
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -550,11 +549,9 @@
 				this.filters.productId=this.$route.params.productId;
 				this.filters.productName=this.$route.params.productName;
 			}
-			this.$nextTick(() => {
+			this.$nextTick(() => {  
 				
-                
-                
-                this.maxTableHeight = window.innerHeight - top -100;
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el);  
 				this.showInfo = false;
 				this.getXmProjects();
 			}); 
diff --git a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue
deleted file mode 100644
index a32998bc..00000000
--- a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue
+++ /dev/null
@@ -1,225 +0,0 @@
-<template>
-	<section class="page-container  padding border">
-		<el-row>
-			<!--新增界面 XmProjectBaseline xm_project_baseline--> 
-			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
-				<el-form-item label="基线表主键" prop="id">
-					<el-input v-model="addForm.id" placeholder="基线表主键" ></el-input>
-				</el-form-item> 
-				<el-form-item label="项目代号" prop="code">
-					<el-input v-model="addForm.code" placeholder="项目代号" ></el-input>
-				</el-form-item> 
-				<el-form-item label="项目名称" prop="name">
-					<el-input v-model="addForm.name" placeholder="项目名称" ></el-input>
-				</el-form-item> 
-				<el-form-item label="项目类型" prop="xmType">
-					<el-input v-model="addForm.xmType" placeholder="项目类型" ></el-input>
-				</el-form-item> 
-				<el-form-item label="项目开始时间" prop="startTime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.startTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
-				<el-form-item label="项目结束时间" prop="endTime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.endTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
-				<el-form-item label="紧急程度" prop="urgent">
-					<el-input v-model="addForm.urgent" placeholder="紧急程度" ></el-input>
-				</el-form-item> 
-				<el-form-item label="优先程度" prop="priority">
-					<el-input v-model="addForm.priority" placeholder="优先程度" ></el-input>
-				</el-form-item> 
-				<el-form-item label="项目描述" prop="description">
-					<el-input v-model="addForm.description" placeholder="项目描述" ></el-input>
-				</el-form-item> 
-				<el-form-item label="项目创建人编号" prop="createUserid">
-					<el-input v-model="addForm.createUserid" placeholder="项目创建人编号" ></el-input>
-				</el-form-item> 
-				<el-form-item label="项目创建人" prop="createUsername">
-					<el-input v-model="addForm.createUsername" placeholder="项目创建人" ></el-input>
-				</el-form-item> 
-				<el-form-item label="创建时间" prop="createTime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.createTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
-				<el-form-item label="项目考核" prop="assess">
-					<el-input v-model="addForm.assess" placeholder="项目考核" ></el-input>
-				</el-form-item> 
-				<el-form-item label="考核备注" prop="assessRemarks">
-					<el-input v-model="addForm.assessRemarks" placeholder="考核备注" ></el-input>
-				</el-form-item> 
-				<el-form-item label="项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停" prop="status">
-					<el-input v-model="addForm.status" placeholder="项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停" ></el-input>
-				</el-form-item> 
-				<el-form-item label="机构编号" prop="branchId">
-					<el-input v-model="addForm.branchId" placeholder="机构编号" ></el-input>
-				</el-form-item> 
-				<el-form-item label="总预算" prop="planTotalCost">
-					<el-input v-model="addForm.planTotalCost" placeholder="总预算"></el-input>
-				</el-form-item> 
-				<el-form-item label="当前流程实例编号" prop="bizProcInstId">
-					<el-input v-model="addForm.bizProcInstId" placeholder="当前流程实例编号" ></el-input>
-				</el-form-item> 
-				<el-form-item label="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除" prop="bizFlowState">
-					<el-input v-model="addForm.bizFlowState" placeholder="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除" ></el-input>
-				</el-form-item> 
-				<el-form-item label="非人力成本总预算-应该大于或等于计划非人力总成本" prop="planNouserAt">
-					<el-input v-model="addForm.planNouserAt" placeholder="非人力成本总预算-应该大于或等于计划非人力总成本"></el-input>
-				</el-form-item> 
-				<el-form-item label="内部人力成本总预算-应该大于或等于计划内部人力总成本" prop="planInnerUserAt">
-					<el-input v-model="addForm.planInnerUserAt" placeholder="内部人力成本总预算-应该大于或等于计划内部人力总成本"></el-input>
-				</el-form-item> 
-				<el-form-item label="外购人力成本总预算-应该大于或等于计划外购人力总成本" prop="planOutUserAt">
-					<el-input v-model="addForm.planOutUserAt" placeholder="外购人力成本总预算-应该大于或等于计划外购人力总成本"></el-input>
-				</el-form-item> 
-				<el-form-item label="是否锁定整个项目不允许变化0否1是" prop="locked">
-					<el-input v-model="addForm.locked" placeholder="是否锁定整个项目不允许变化0否1是" ></el-input>
-				</el-form-item> 
-				<el-form-item label="基线时间" prop="baseTime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.baseTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
-				<el-form-item label="基线备注" prop="baseRemark">
-					<el-input v-model="addForm.baseRemark" placeholder="基线备注" ></el-input>
-				</el-form-item> 
-				<el-form-item label="基线主键" prop="baselineId">
-					<el-input v-model="addForm.baselineId" placeholder="基线主键" ></el-input>
-				</el-form-item> 
-				<el-form-item label="总预算工作量-应该大于或等于计划总工作量" prop="planWorkload">
-					<el-input v-model="addForm.planWorkload" placeholder="总预算工作量-应该大于或等于计划总工作量"></el-input>
-				</el-form-item> 
-				<el-form-item label="总预计收款金额" prop="totalReceivables">
-					<el-input v-model="addForm.totalReceivables" placeholder="总预计收款金额"></el-input>
-				</el-form-item> 
-				<el-form-item label="预估毛利率" prop="budgetMarginRate">
-					<el-input v-model="addForm.budgetMarginRate" placeholder="预估毛利率"></el-input>
-				</el-form-item> 
-				<el-form-item label="合同总金额" prop="contractAmt">
-					<el-input v-model="addForm.contractAmt" placeholder="合同总金额"></el-input>
-				</el-form-item> 
-				<el-form-item label="内部人力成本单价元/人时" prop="planInnerUserPrice">
-					<el-input v-model="addForm.planInnerUserPrice" placeholder="内部人力成本单价元/人时"></el-input>
-				</el-form-item> 
-				<el-form-item label="外购人力成本单价元/人时" prop="planOutUserPrice">
-					<el-input v-model="addForm.planOutUserPrice" placeholder="外购人力成本单价元/人时"></el-input>
-				</el-form-item> 
-				<el-form-item label="外购人数" prop="planOutUserCnt">
-					<el-input-number v-model="addForm.planOutUserCnt" :min="0" :max="200"></el-input-number>
-				</el-form-item> 
-				<el-form-item label="内部人数" prop="planInnerUserCnt">
-					<el-input-number v-model="addForm.planInnerUserCnt" :min="0" :max="200"></el-input-number>
-				</el-form-item> 
-				<el-form-item label="预计工作小时数目" prop="planWorkingHours">
-					<el-input-number v-model="addForm.planWorkingHours" :min="0" :max="200"></el-input-number>
-				</el-form-item> 
-				<el-form-item label="税率" prop="taxRate">
-					<el-input v-model="addForm.taxRate" placeholder="税率"></el-input>
-				</el-form-item> 
-				<el-form-item label="内部人力总工作量-应该大于或等于计划内部人力总成本" prop="planInnerUserWorkload">
-					<el-input v-model="addForm.planInnerUserWorkload" placeholder="内部人力总工作量-应该大于或等于计划内部人力总成本"></el-input>
-				</el-form-item> 
-				<el-form-item label="外购人力总工作量-应该大于或等于计划外购人力总成本" prop="planOutUserWorkload">
-					<el-input v-model="addForm.planOutUserWorkload" placeholder="外购人力总工作量-应该大于或等于计划外购人力总成本"></el-input>
-				</el-form-item> 
-				<el-form-item label="项目编号" prop="projectId">
-					<el-input v-model="addForm.projectId" placeholder="项目编号" ></el-input>
-				</el-form-item> 
-				<el-form-item label="创建时间" prop="ctime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.ctime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
-				<el-form-item>
-					<el-col :span="24" :offset="8"> 
-						<el-button @click.native="handleCancel">取消</el-button>  
-						<el-button v-loading="load.add" type="primary" @click.native="addSubmit" :disabled="load.add==true">提交</el-button>  
-					</el-col>
-				</el-form-item> 
-			</el-form>
-		</el-row>
-	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
-	import { addXmProjectBaseline } from '@/api/xm/core/xmProjectBaseline';
-	import { mapGetters } from 'vuex'
-	
-	export default { 
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ])
-		},
-		props:['xmProjectBaseline','visible'],
-		watch: {
-	      'xmProjectBaseline':function( xmProjectBaseline ) {
-	        this.addForm = xmProjectBaseline;
-	      },
-	      'visible':function(visible) { 
-	      	if(visible==true){
-	      		//从新打开页面时某些数据需要重新加载，可以在这里添加
-	      	}
-	      } 
-	    },
-		data() {
-			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
-				load:{ list: false, edit: false, del: false, add: false },//查询中...
-				addFormRules: {
-					id: [
-						//{ required: true, message: '基线表主键不能为空', trigger: 'blur' }
-					]
-				},
-				//新增界面数据 xm_project_baseline
-				addForm: {
-					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:'',projectId:'',ctime:''
-				}
-				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
-				
-				/**end 在上面加自定义属性**/
-			}//end return
-		},//end data
-		methods: {
-			// 取消按钮点击 父组件监听@cancel="addFormVisible=false" 监听
-			handleCancel:function(){
-				this.$refs['addForm'].resetFields();
-				this.$emit('cancel');
-			},
-			//新增提交XmProjectBaseline xm_project_baseline 父组件监听@submit="afterAddSubmit"
-			addSubmit: function () {
-				
-				this.$refs.addForm.validate((valid) => {
-					if (valid) {
-						
-						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
-							this.load.add=true
-							let params = Object.assign({}, this.addForm); 
-							addXmProjectBaseline(params).then((res) => {
-								this.load.add=false
-								var tips=res.data.tips;
-								if(tips.isOk){
-									this.$refs['addForm'].resetFields();
-									this.$emit('submit');//  @submit="afterAddSubmit"
-								}
-								this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
-							}).catch( err  => this.load.add=false);
-						});
-					}
-				});
-			}
-			/**begin 在下面加自定义方法,记得补上面的一个逗号**/
-				
-			/**end 在上面加自定义方法**/
-			
-		},//end method
-		components: {  
-		    //在下面添加其它组件 'xm-project-baseline-edit':XmProjectBaselineEdit
-		},
-		mounted() {
-			this.addForm=Object.assign(this.addForm, this.xmProjectBaseline);  
-			/**在下面写其它函数***/
-			
-		}//end mounted
-	}
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue
deleted file mode 100644
index ff5f6691..00000000
--- a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue
+++ /dev/null
@@ -1,220 +0,0 @@
-<template>
-	<section class="page-container  padding border">
-		<el-row> 
-		<!--编辑界面 XmProjectBaseline xm_project_baseline--> 
-			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
-				<el-form-item label="基线表主键" prop="id">
-					<el-input v-model="editForm.id" placeholder="基线表主键"></el-input>
-				</el-form-item> 
-				<el-form-item label="项目代号" prop="code">
-					<el-input v-model="editForm.code" placeholder="项目代号"></el-input>
-				</el-form-item> 
-				<el-form-item label="项目名称" prop="name">
-					<el-input v-model="editForm.name" placeholder="项目名称"></el-input>
-				</el-form-item> 
-				<el-form-item label="项目类型" prop="xmType">
-					<el-input v-model="editForm.xmType" placeholder="项目类型"></el-input>
-				</el-form-item> 
-				<el-form-item label="项目开始时间" prop="startTime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.startTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
-				<el-form-item label="项目结束时间" prop="endTime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.endTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
-				<el-form-item label="紧急程度" prop="urgent">
-					<el-input v-model="editForm.urgent" placeholder="紧急程度"></el-input>
-				</el-form-item> 
-				<el-form-item label="优先程度" prop="priority">
-					<el-input v-model="editForm.priority" placeholder="优先程度"></el-input>
-				</el-form-item> 
-				<el-form-item label="项目描述" prop="description">
-					<el-input v-model="editForm.description" placeholder="项目描述"></el-input>
-				</el-form-item> 
-				<el-form-item label="项目创建人编号" prop="createUserid">
-					<el-input v-model="editForm.createUserid" placeholder="项目创建人编号"></el-input>
-				</el-form-item> 
-				<el-form-item label="项目创建人" prop="createUsername">
-					<el-input v-model="editForm.createUsername" placeholder="项目创建人"></el-input>
-				</el-form-item> 
-				<el-form-item label="创建时间" prop="createTime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.createTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
-				<el-form-item label="项目考核" prop="assess">
-					<el-input v-model="editForm.assess" placeholder="项目考核"></el-input>
-				</el-form-item> 
-				<el-form-item label="考核备注" prop="assessRemarks">
-					<el-input v-model="editForm.assessRemarks" placeholder="考核备注"></el-input>
-				</el-form-item> 
-				<el-form-item label="项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停" prop="status">
-					<el-input v-model="editForm.status" placeholder="项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停"></el-input>
-				</el-form-item> 
-				<el-form-item label="机构编号" prop="branchId">
-					<el-input v-model="editForm.branchId" placeholder="机构编号"></el-input>
-				</el-form-item> 
-				<el-form-item label="总预算" prop="planTotalCost">
-					<el-input v-model="editForm.planTotalCost" placeholder="总预算"></el-input>
-				</el-form-item> 
-				<el-form-item label="当前流程实例编号" prop="bizProcInstId">
-					<el-input v-model="editForm.bizProcInstId" placeholder="当前流程实例编号"></el-input>
-				</el-form-item> 
-				<el-form-item label="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除" prop="bizFlowState">
-					<el-input v-model="editForm.bizFlowState" placeholder="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除"></el-input>
-				</el-form-item> 
-				<el-form-item label="非人力成本总预算-应该大于或等于计划非人力总成本" prop="planNouserAt">
-					<el-input v-model="editForm.planNouserAt" placeholder="非人力成本总预算-应该大于或等于计划非人力总成本"></el-input>
-				</el-form-item> 
-				<el-form-item label="内部人力成本总预算-应该大于或等于计划内部人力总成本" prop="planInnerUserAt">
-					<el-input v-model="editForm.planInnerUserAt" placeholder="内部人力成本总预算-应该大于或等于计划内部人力总成本"></el-input>
-				</el-form-item> 
-				<el-form-item label="外购人力成本总预算-应该大于或等于计划外购人力总成本" prop="planOutUserAt">
-					<el-input v-model="editForm.planOutUserAt" placeholder="外购人力成本总预算-应该大于或等于计划外购人力总成本"></el-input>
-				</el-form-item> 
-				<el-form-item label="是否锁定整个项目不允许变化0否1是" prop="locked">
-					<el-input v-model="editForm.locked" placeholder="是否锁定整个项目不允许变化0否1是"></el-input>
-				</el-form-item> 
-				<el-form-item label="基线时间" prop="baseTime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.baseTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
-				<el-form-item label="基线备注" prop="baseRemark">
-					<el-input v-model="editForm.baseRemark" placeholder="基线备注"></el-input>
-				</el-form-item> 
-				<el-form-item label="基线主键" prop="baselineId">
-					<el-input v-model="editForm.baselineId" placeholder="基线主键"></el-input>
-				</el-form-item> 
-				<el-form-item label="总预算工作量-应该大于或等于计划总工作量" prop="planWorkload">
-					<el-input v-model="editForm.planWorkload" placeholder="总预算工作量-应该大于或等于计划总工作量"></el-input>
-				</el-form-item> 
-				<el-form-item label="总预计收款金额" prop="totalReceivables">
-					<el-input v-model="editForm.totalReceivables" placeholder="总预计收款金额"></el-input>
-				</el-form-item> 
-				<el-form-item label="预估毛利率" prop="budgetMarginRate">
-					<el-input v-model="editForm.budgetMarginRate" placeholder="预估毛利率"></el-input>
-				</el-form-item> 
-				<el-form-item label="合同总金额" prop="contractAmt">
-					<el-input v-model="editForm.contractAmt" placeholder="合同总金额"></el-input>
-				</el-form-item> 
-				<el-form-item label="内部人力成本单价元/人时" prop="planInnerUserPrice">
-					<el-input v-model="editForm.planInnerUserPrice" placeholder="内部人力成本单价元/人时"></el-input>
-				</el-form-item> 
-				<el-form-item label="外购人力成本单价元/人时" prop="planOutUserPrice">
-					<el-input v-model="editForm.planOutUserPrice" placeholder="外购人力成本单价元/人时"></el-input>
-				</el-form-item> 
-				<el-form-item label="外购人数" prop="planOutUserCnt">
-					<el-input-number v-model="editForm.planOutUserCnt" :min="0" :max="200"></el-input-number>
-				</el-form-item> 
-				<el-form-item label="内部人数" prop="planInnerUserCnt">
-					<el-input-number v-model="editForm.planInnerUserCnt" :min="0" :max="200"></el-input-number>
-				</el-form-item> 
-				<el-form-item label="预计工作小时数目" prop="planWorkingHours">
-					<el-input-number v-model="editForm.planWorkingHours" :min="0" :max="200"></el-input-number>
-				</el-form-item> 
-				<el-form-item label="税率" prop="taxRate">
-					<el-input v-model="editForm.taxRate" placeholder="税率"></el-input>
-				</el-form-item> 
-				<el-form-item label="内部人力总工作量-应该大于或等于计划内部人力总成本" prop="planInnerUserWorkload">
-					<el-input v-model="editForm.planInnerUserWorkload" placeholder="内部人力总工作量-应该大于或等于计划内部人力总成本"></el-input>
-				</el-form-item> 
-				<el-form-item label="外购人力总工作量-应该大于或等于计划外购人力总成本" prop="planOutUserWorkload">
-					<el-input v-model="editForm.planOutUserWorkload" placeholder="外购人力总工作量-应该大于或等于计划外购人力总成本"></el-input>
-				</el-form-item> 
-				<el-form-item label="项目编号" prop="projectId">
-					<el-input v-model="editForm.projectId" placeholder="项目编号"></el-input>
-				</el-form-item> 
-				<el-form-item label="创建时间" prop="ctime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.ctime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
-				<el-form-item> 
-					<el-col :span="24" :offset="8"> 
-						<el-button @click.native="handleCancel">取消</el-button>  
-						<el-button v-loading="load.edit" type="primary" @click.native="editSubmit" :disabled="load.edit==true">提交</el-button>  
-					</el-col> 
-				</el-form-item> 
-			</el-form>
-		</el-row>
-	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
-	import { editXmProjectBaseline } from '@/api/xm/core/xmProjectBaseline';
-	import { mapGetters } from 'vuex'
-	
-	export default { 
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ])
-		},
-		props:['xmProjectBaseline','visible'],
-		watch: {
-	      'xmProjectBaseline':function( xmProjectBaseline ) {
-	        this.editForm = xmProjectBaseline;
-	      },
-	      'visible':function(visible) { 
-	      	if(visible==true){
-	      		//从新打开页面时某些数据需要重新加载，可以在这里添加
-	      	}
-	      } 
-	    },
-		data() {
-			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
-				load:{ list: false, edit: false, del: false, add: false },//查询中...
-				editFormRules: {
-					id: [
-						//{ required: true, message: '基线表主键不能为空', trigger: 'blur' }
-					]
-				},
-				//编辑界面数据  XmProjectBaseline xm_project_baseline
-				editForm: {
-					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:'',projectId:'',ctime:''
-				}
-				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
-				
-				/**end 在上面加自定义属性**/
-			}//end return
-		},//end data
-		methods: {
-			// 取消按钮点击 父组件监听@cancel="editFormVisible=false" 监听
-			handleCancel:function(){
-				this.$refs['editForm'].resetFields();
-				this.$emit('cancel');
-			},
-			//编辑提交XmProjectBaseline xm_project_baseline父组件监听@submit="afterEditSubmit"
-			editSubmit: function () {
-				this.$refs.editForm.validate((valid) => {
-					if (valid) {
-						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
-							this.load.edit=true
-							let params = Object.assign({}, this.editForm); 
-							editXmProjectBaseline(params).then((res) => {
-								this.load.edit=false
-								var tips=res.data.tips;
-								if(tips.isOk){
-									this.$refs['editForm'].resetFields();
-									this.$emit('submit');//  @submit="afterEditSubmit"
-								}
-								this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
-							}).catch( err =>this.load.edit=false);
-						});
-					}
-				});
-			}
-			/**begin 在下面加自定义方法,记得补上面的一个逗号**/
-				
-			/**end 在上面加自定义方法**/
-		},//end method
-		components: {  
-		    //在下面添加其它组件 'xm-project-baseline-edit':XmProjectBaselineEdit
-		},
-		mounted() {
-			this.editForm=Object.assign(this.editForm, this.xmProjectBaseline);  
-		}
-	}
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineMng.vue b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineMng.vue
deleted file mode 100644
index 15ddc57c..00000000
--- a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineMng.vue
+++ /dev/null
@@ -1,270 +0,0 @@
-<template>
-	<section class="page-container  padding border">
-		<el-row>
-			<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="searchXmProjectBaselines">查询</el-button>
-			<el-button type="primary" @click="showAdd">+xm_project_baseline</el-button>
-			<el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> 
-		</el-row>
-		<el-row class="page-main "> 
-			<!--列表 XmProjectBaseline xm_project_baseline-->
-			<el-table :data="xmProjectBaselines" @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>
-				<el-table-column prop="code" label="项目代号" min-width="80" ></el-table-column>
-				<el-table-column prop="name" label="项目名称" min-width="80" ></el-table-column>
-				<el-table-column prop="xmType" label="项目类型" min-width="80" ></el-table-column>
-				<el-table-column prop="startTime" label="项目开始时间" min-width="80" ></el-table-column>
-				<el-table-column prop="endTime" label="项目结束时间" min-width="80" ></el-table-column>
-				<el-table-column prop="urgent" label="紧急程度" min-width="80" ></el-table-column>
-				<el-table-column prop="priority" label="优先程度" min-width="80" ></el-table-column>
-				<el-table-column prop="description" label="项目描述" min-width="80" ></el-table-column>
-				<el-table-column prop="createUserid" label="项目创建人编号" min-width="80" ></el-table-column>
-				<el-table-column prop="createUsername" label="项目创建人" min-width="80" ></el-table-column>
-				<el-table-column prop="createTime" label="创建时间" min-width="80" ></el-table-column>
-				<el-table-column prop="assess" label="项目考核" min-width="80" ></el-table-column>
-				<el-table-column prop="assessRemarks" label="考核备注" min-width="80" ></el-table-column>
-				<el-table-column prop="status" label="项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停" min-width="80" ></el-table-column>
-				<el-table-column prop="branchId" label="机构编号" min-width="80" ></el-table-column>
-				<el-table-column prop="planTotalCost" label="总预算" min-width="80" ></el-table-column>
-				<el-table-column prop="bizProcInstId" label="当前流程实例编号" min-width="80" ></el-table-column>
-				<el-table-column prop="bizFlowState" label="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除" min-width="80" ></el-table-column>
-				<el-table-column prop="planNouserAt" label="非人力成本总预算-应该大于或等于计划非人力总成本" min-width="80" ></el-table-column>
-				<el-table-column prop="planInnerUserAt" label="内部人力成本总预算-应该大于或等于计划内部人力总成本" min-width="80" ></el-table-column>
-				<el-table-column prop="planOutUserAt" label="外购人力成本总预算-应该大于或等于计划外购人力总成本" min-width="80" ></el-table-column>
-				<el-table-column prop="locked" label="是否锁定整个项目不允许变化0否1是" min-width="80" ></el-table-column>
-				<el-table-column prop="baseTime" label="基线时间" min-width="80" ></el-table-column>
-				<el-table-column prop="baseRemark" label="基线备注" min-width="80" ></el-table-column>
-				<el-table-column prop="baselineId" label="基线主键" min-width="80" ></el-table-column>
-				<el-table-column prop="planWorkload" label="总预算工作量-应该大于或等于计划总工作量" min-width="80" ></el-table-column>
-				<el-table-column prop="totalReceivables" label="总预计收款金额" min-width="80" ></el-table-column>
-				<el-table-column prop="budgetMarginRate" label="预估毛利率" min-width="80" ></el-table-column>
-				<el-table-column prop="contractAmt" label="合同总金额" min-width="80" ></el-table-column>
-				<el-table-column prop="planInnerUserPrice" label="内部人力成本单价元/人时" min-width="80" ></el-table-column>
-				<el-table-column prop="planOutUserPrice" label="外购人力成本单价元/人时" min-width="80" ></el-table-column>
-				<el-table-column prop="planOutUserCnt" label="外购人数" min-width="80" ></el-table-column>
-				<el-table-column prop="planInnerUserCnt" label="内部人数" min-width="80" ></el-table-column>
-				<el-table-column prop="planWorkingHours" label="预计工作小时数目" min-width="80" ></el-table-column>
-				<el-table-column prop="taxRate" label="税率" min-width="80" ></el-table-column>
-				<el-table-column prop="planInnerUserWorkload" label="内部人力总工作量-应该大于或等于计划内部人力总成本" min-width="80" ></el-table-column>
-				<el-table-column prop="planOutUserWorkload" label="外购人力总工作量-应该大于或等于计划外购人力总成本" min-width="80" ></el-table-column>
-				<el-table-column prop="projectId" label="项目编号" min-width="80" ></el-table-column>
-				<el-table-column prop="ctime" label="创建时间" min-width="80" ></el-table-column>
-				<el-table-column label="操作" width="160" fixed="right"  >
-					<template slot-scope="scope">
-						<el-button  @click="showEdit( scope.row,scope.$index)">改</el-button>
-						<el-button type="danger" @click="handleDel(scope.row,scope.$index)">删</el-button>
-					</template>
-				</el-table-column>
-			</el-table>
-			<el-pagination  layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination> 
-		
-			<!--编辑 XmProjectBaseline xm_project_baseline界面-->
-			<el-drawer title="编辑xm_project_baseline" :visible.sync="editFormVisible"  size="50%"  append-to-body   :close-on-click-modal="false">
-				  <xm-project-baseline-edit :xm-project-baseline="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-project-baseline-edit>
-			</el-drawer>
-	
-			<!--新增 XmProjectBaseline xm_project_baseline界面-->
-			<el-drawer title="新增xm_project_baseline" :visible.sync="addFormVisible"  size="50%"  append-to-body  :close-on-click-modal="false">
-				<xm-project-baseline-add :xm-project-baseline="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-project-baseline-add>
-			</el-drawer> 
-		</el-row>
-	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
-	import { listXmProjectBaseline, delXmProjectBaseline, batchDelXmProjectBaseline } from '@/api/xm/core/xmProjectBaseline';
-	import  XmProjectBaselineAdd from './XmProjectBaselineAdd';//新增界面
-	import  XmProjectBaselineEdit from './XmProjectBaselineEdit';//修改界面
-	import { mapGetters } from 'vuex'
-	
-	export default { 
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ])
-		},
-		data() {
-			return {
-				filters: {
-					key: ''
-				},
-				xmProjectBaselines: [],//查询结果
-				pageInfo:{//分页数据
-					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
-					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
-					pageNum:1,//当前页码、从1开始计算
-					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
-					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
-				},
-				load:{ list: false, edit: false, del: false, add: false },//查询中...
-				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
-				
-				addFormVisible: false,//新增xmProjectBaseline界面是否显示
-				//新增xmProjectBaseline界面初始化数据
-				addForm: {
-					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:'',projectId:'',ctime:''
-				},
-				
-				editFormVisible: false,//编辑界面是否显示
-				//编辑xmProjectBaseline界面初始化数据
-				editForm: {
-					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:'',projectId:'',ctime:''
-				}
-				/**begin 自定义属性请在下面加 请加备注**/
-					
-				/**end 自定义属性请在上面加 请加备注**/
-			}
-		},//end data
-		methods: { 
-			handleSizeChange(pageSize) { 
-				this.pageInfo.pageSize=pageSize; 
-				this.getXmProjectBaselines();
-			},
-			handleCurrentChange(pageNum) {
-				this.pageInfo.pageNum = pageNum;
-				this.getXmProjectBaselines();
-			},
-			// 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名
-			sortChange( obj ){
-				var dir='asc';
-				if(obj.order=='ascending'){
-					dir='asc'
-				}else{
-					dir='desc';
-				}
-				if(obj.prop=='xxx'){
-					this.pageInfo.orderFields=['xxx'];
-					this.pageInfo.orderDirs=[dir];
-				}
-				this.getXmProjectBaselines();
-			},
-			searchXmProjectBaselines(){
-				 this.pageInfo.count=true; 
-				 this.getXmProjectBaselines();
-			},
-			//获取列表 XmProjectBaseline xm_project_baseline
-			getXmProjectBaselines() {
-				let params = {
-					pageSize: this.pageInfo.pageSize,
-					pageNum: this.pageInfo.pageNum,
-					total: this.pageInfo.total,
-					count:this.pageInfo.count
-				};
-				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
-					let orderBys=[];
-					for(var i=0;i<this.pageInfo.orderFields.length;i++){ 
-						orderBys.push(this.pageInfo.orderFields[i]+" "+this.pageInfo.orderDirs[i])
-					}  
-					params.orderBy= orderBys.join(",")
-				}
-				if(this.filters.key!==""){
-					//params.xxx=this.filters.key
-				}else{
-					//params.xxx=xxxxx
-				}
-				this.load.list = true;
-				listXmProjectBaseline(params).then((res) => {
-					var tips=res.data.tips;
-					if(tips.isOk){ 
-						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
-						this.xmProjectBaselines = res.data.data;
-					}else{
-						this.$notify({showClose: true, message: tips.msg, type: 'error' });
-					} 
-					this.load.list = false;
-				}).catch( err => this.load.list = false );
-			},
-
-			//显示编辑界面 XmProjectBaseline xm_project_baseline
-			showEdit: function ( row,index ) {
-				this.editFormVisible = true;
-				this.editForm = Object.assign({}, row);
-			},
-			//显示新增界面 XmProjectBaseline xm_project_baseline
-			showAdd: function () {
-				this.addFormVisible = true;
-				//this.addForm=Object.assign({}, this.editForm);
-			},
-			afterAddSubmit(){
-				this.addFormVisible=false;
-				this.pageInfo.count=true;
-				this.getXmProjectBaselines();
-			},
-			afterEditSubmit(){
-				this.editFormVisible=false;
-			},
-			//选择行xmProjectBaseline
-			selsChange: function (sels) {
-				this.sels = sels;
-			}, 
-			//删除xmProjectBaseline
-			handleDel: function (row,index) { 
-				this.$confirm('确认删除该记录吗?', '提示', {
-					type: 'warning'
-				}).then(() => { 
-					this.load.del=true;
-					let params = { id: row.id };
-					delXmProjectBaseline(params).then((res) => {
-						this.load.del=false;
-						var tips=res.data.tips;
-						if(tips.isOk){ 
-							this.pageInfo.count=true;
-							this.getXmProjectBaselines();
-						}
-						this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
-					}).catch( err  => this.load.del=false );
-				});
-			},
-			//批量删除xmProjectBaseline
-			batchDel: function () {
-				
-				this.$confirm('确认删除选中记录吗？', '提示', {
-					type: 'warning'
-				}).then(() => { 
-					this.load.del=true;
-					batchDelXmProjectBaseline(this.sels).then((res) => {
-						this.load.del=false;
-						var tips=res.data.tips;
-						if( tips.isOk ){ 
-							this.pageInfo.count=true;
-							this.getXmProjectBaselines(); 
-						}
-						this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'});
-					}).catch( err  => this.load.del=false );
-				});
-			},
-			rowClick: function(row, event, column){
-				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
-			}
-			/**begin 自定义函数请在下面加**/
-			
-				
-			/**end 自定义函数请在上面加**/
-			
-		},//end methods
-		components: { 
-		    'xm-project-baseline-add':XmProjectBaselineAdd,
-		    'xm-project-baseline-edit':XmProjectBaselineEdit,
-		    
-		    //在下面添加其它组件
-		},
-		mounted() { 
-			this.$nextTick(() => {
-				this.getXmProjectBaselines();
-        	}); 
-		}
-	}
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue b/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
index 37b55481..32b91aaa 100644
--- a/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
+++ b/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
@@ -240,10 +240,7 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
-				
-				
-				
-				this.tableHeight =  util.calcTableMaxHeight(".el-table"); 
+				this.tableHeight =  util.calcTableMaxHeight(this.$refs.table.$el);  
 				this.getXmProjectContracts();
         	}); 
 		}
diff --git a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
index 8523a8d2..96a826ab 100644
--- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
+++ b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
@@ -317,11 +317,8 @@
 		    //在下面添加其它组件
 		},
 		mounted() { 
-			this.$nextTick(() => {
-				
-				
-				
-				this.tableHeight =  util.calcTableMaxHeight(".el-table"); 
+			this.$nextTick(() => { 
+				this.tableHeight =  util.calcTableMaxHeight(this.$refs.table.$el);  
 				console.log(this.currProject);
 				this.getXmProjectEnvLists();
 			});
diff --git a/src/views/xm/core/xmProjectOptions/XmProjectOptionsAdd.vue b/src/views/xm/core/xmProjectOptions/XmProjectOptionsAdd.vue
deleted file mode 100644
index 895f9ca8..00000000
--- a/src/views/xm/core/xmProjectOptions/XmProjectOptionsAdd.vue
+++ /dev/null
@@ -1,117 +0,0 @@
-<template>
-	<section class="page-container  padding border">
-		<el-row>
-			<!--新增界面 XmProjectOptions xm_project_options--> 
-			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
-				<el-form-item label="主键" prop="id">
-					<el-input v-model="addForm.id" placeholder="主键" ></el-input>
-				</el-form-item> 
-				<el-form-item label="机构编号" prop="branchId">
-					<el-input v-model="addForm.branchId" placeholder="机构编号" ></el-input>
-				</el-form-item> 
-				<el-form-item label="选项类型，0项目类型，1紧急程度，2优先程度" prop="optionType">
-					<el-input v-model="addForm.optionType" placeholder="选项类型，0项目类型，1紧急程度，2优先程度" ></el-input>
-				</el-form-item> 
-				<el-form-item label="选项名字" prop="name">
-					<el-input v-model="addForm.name" placeholder="选项名字" ></el-input>
-				</el-form-item> 
-				<el-form-item>
-					<el-col :span="24" :offset="8"> 
-						<el-button @click.native="handleCancel">取消</el-button>  
-						<el-button v-loading="load.add" type="primary" @click.native="addSubmit" :disabled="load.add==true">提交</el-button>  
-					</el-col>
-				</el-form-item> 
-			</el-form>
-		</el-row>
-	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
-	import { addXmProjectOptions } from '@/api/xm/core/xmProjectOptions';
-	import { mapGetters } from 'vuex'
-	
-	export default { 
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ])
-		},
-		props:['xmProjectOptions','visible'],
-		watch: {
-	      'xmProjectOptions':function( xmProjectOptions ) {
-	        this.addForm = xmProjectOptions;
-	      },
-	      'visible':function(visible) { 
-	      	if(visible==true){
-	      		//从新打开页面时某些数据需要重新加载，可以在这里添加
-	      	}
-	      } 
-	    },
-		data() {
-			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
-				load:{ list: false, edit: false, del: false, add: false },//查询中...
-				addFormRules: {
-					id: [
-						//{ required: true, message: '主键不能为空', trigger: 'blur' }
-					]
-				},
-				//新增界面数据 xm_project_options
-				addForm: {
-					id:'',branchId:'',optionType:'',name:''
-				}
-				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
-				
-				/**end 在上面加自定义属性**/
-			}//end return
-		},//end data
-		methods: {
-			// 取消按钮点击 父组件监听@cancel="addFormVisible=false" 监听
-			handleCancel:function(){
-				this.$refs['addForm'].resetFields();
-				this.$emit('cancel');
-			},
-			//新增提交XmProjectOptions xm_project_options 父组件监听@submit="afterAddSubmit"
-			addSubmit: function () {
-				
-				this.$refs.addForm.validate((valid) => {
-					if (valid) {
-						
-						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
-							this.load.add=true
-							let params = Object.assign({}, this.addForm); 
-							addXmProjectOptions(params).then((res) => {
-								this.load.add=false
-								var tips=res.data.tips;
-								if(tips.isOk){
-									this.$refs['addForm'].resetFields();
-									this.$emit('submit');//  @submit="afterAddSubmit"
-								}
-								this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
-							}).catch( err  => this.load.add=false);
-						});
-					}
-				});
-			}
-			/**begin 在下面加自定义方法,记得补上面的一个逗号**/
-				
-			/**end 在上面加自定义方法**/
-			
-		},//end method
-		components: {  
-		    //在下面添加其它组件 'xm-project-options-edit':XmProjectOptionsEdit
-		},
-		mounted() {
-			this.addForm=Object.assign(this.addForm, this.xmProjectOptions);  
-			/**在下面写其它函数***/
-			
-		}//end mounted
-	}
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectOptions/XmProjectOptionsEdit.vue b/src/views/xm/core/xmProjectOptions/XmProjectOptionsEdit.vue
deleted file mode 100644
index 7ef880ed..00000000
--- a/src/views/xm/core/xmProjectOptions/XmProjectOptionsEdit.vue
+++ /dev/null
@@ -1,112 +0,0 @@
-<template>
-	<section class="page-container  padding border">
-		<el-row> 
-		<!--编辑界面 XmProjectOptions xm_project_options--> 
-			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
-				<el-form-item label="主键" prop="id">
-					<el-input v-model="editForm.id" placeholder="主键"></el-input>
-				</el-form-item> 
-				<el-form-item label="机构编号" prop="branchId">
-					<el-input v-model="editForm.branchId" placeholder="机构编号"></el-input>
-				</el-form-item> 
-				<el-form-item label="选项类型，0项目类型，1紧急程度，2优先程度" prop="optionType">
-					<el-input v-model="editForm.optionType" placeholder="选项类型，0项目类型，1紧急程度，2优先程度"></el-input>
-				</el-form-item> 
-				<el-form-item label="选项名字" prop="name">
-					<el-input v-model="editForm.name" placeholder="选项名字"></el-input>
-				</el-form-item> 
-				<el-form-item> 
-					<el-col :span="24" :offset="8"> 
-						<el-button @click.native="handleCancel">取消</el-button>  
-						<el-button v-loading="load.edit" type="primary" @click.native="editSubmit" :disabled="load.edit==true">提交</el-button>  
-					</el-col> 
-				</el-form-item> 
-			</el-form>
-		</el-row>
-	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
-	import { editXmProjectOptions } from '@/api/xm/core/xmProjectOptions';
-	import { mapGetters } from 'vuex'
-	
-	export default { 
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ])
-		},
-		props:['xmProjectOptions','visible'],
-		watch: {
-	      'xmProjectOptions':function( xmProjectOptions ) {
-	        this.editForm = xmProjectOptions;
-	      },
-	      'visible':function(visible) { 
-	      	if(visible==true){
-	      		//从新打开页面时某些数据需要重新加载，可以在这里添加
-	      	}
-	      } 
-	    },
-		data() {
-			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
-				load:{ list: false, edit: false, del: false, add: false },//查询中...
-				editFormRules: {
-					id: [
-						//{ required: true, message: '主键不能为空', trigger: 'blur' }
-					]
-				},
-				//编辑界面数据  XmProjectOptions xm_project_options
-				editForm: {
-					id:'',branchId:'',optionType:'',name:''
-				}
-				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
-				
-				/**end 在上面加自定义属性**/
-			}//end return
-		},//end data
-		methods: {
-			// 取消按钮点击 父组件监听@cancel="editFormVisible=false" 监听
-			handleCancel:function(){
-				this.$refs['editForm'].resetFields();
-				this.$emit('cancel');
-			},
-			//编辑提交XmProjectOptions xm_project_options父组件监听@submit="afterEditSubmit"
-			editSubmit: function () {
-				this.$refs.editForm.validate((valid) => {
-					if (valid) {
-						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
-							this.load.edit=true
-							let params = Object.assign({}, this.editForm); 
-							editXmProjectOptions(params).then((res) => {
-								this.load.edit=false
-								var tips=res.data.tips;
-								if(tips.isOk){
-									this.$refs['editForm'].resetFields();
-									this.$emit('submit');//  @submit="afterEditSubmit"
-								}
-								this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
-							}).catch( err =>this.load.edit=false);
-						});
-					}
-				});
-			}
-			/**begin 在下面加自定义方法,记得补上面的一个逗号**/
-				
-			/**end 在上面加自定义方法**/
-		},//end method
-		components: {  
-		    //在下面添加其它组件 'xm-project-options-edit':XmProjectOptionsEdit
-		},
-		mounted() {
-			this.editForm=Object.assign(this.editForm, this.xmProjectOptions);  
-		}
-	}
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectOptions/XmProjectOptionsMng.vue b/src/views/xm/core/xmProjectOptions/XmProjectOptionsMng.vue
deleted file mode 100644
index 5f9a59c1..00000000
--- a/src/views/xm/core/xmProjectOptions/XmProjectOptionsMng.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-	<section class="page-container  padding border">
-		<el-row>
-			<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="searchXmProjectOptionss">查询</el-button>
-			<el-button type="primary" @click="showAdd">+xm_project_options</el-button>
-			<el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> 
-		</el-row>
-		<el-row class="page-main "> 
-			<!--列表 XmProjectOptions xm_project_options-->
-			<el-table :data="xmProjectOptionss" @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>
-				<el-table-column prop="branchId" label="机构编号" min-width="80" ></el-table-column>
-				<el-table-column prop="optionType" label="选项类型，0项目类型，1紧急程度，2优先程度" min-width="80" ></el-table-column>
-				<el-table-column prop="name" label="选项名字" min-width="80" ></el-table-column>
-				<el-table-column label="操作" width="160" fixed="right"  >
-					<template slot-scope="scope">
-						<el-button  @click="showEdit( scope.row,scope.$index)">改</el-button>
-						<el-button type="danger" @click="handleDel(scope.row,scope.$index)">删</el-button>
-					</template>
-				</el-table-column>
-			</el-table>
-			<el-pagination  layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination> 
-		
-			<!--编辑 XmProjectOptions xm_project_options界面-->
-			<el-drawer title="编辑xm_project_options" :visible.sync="editFormVisible"  size="50%"  append-to-body   :close-on-click-modal="false">
-				  <xm-project-options-edit :xm-project-options="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-project-options-edit>
-			</el-drawer>
-	
-			<!--新增 XmProjectOptions xm_project_options界面-->
-			<el-drawer title="新增xm_project_options" :visible.sync="addFormVisible"  size="50%"  append-to-body   :close-on-click-modal="false">
-				<xm-project-options-add :xm-project-options="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-project-options-add>
-			</el-drawer> 
-		</el-row>
-	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
-	import { listXmProjectOptions, delXmProjectOptions, batchDelXmProjectOptions } from '@/api/xm/core/xmProjectOptions';
-	import  XmProjectOptionsAdd from './XmProjectOptionsAdd';//新增界面
-	import  XmProjectOptionsEdit from './XmProjectOptionsEdit';//修改界面
-	import { mapGetters } from 'vuex'
-	
-	export default { 
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ])
-		},
-		data() {
-			return {
-				filters: {
-					key: ''
-				},
-				xmProjectOptionss: [],//查询结果
-				pageInfo:{//分页数据
-					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
-					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
-					pageNum:1,//当前页码、从1开始计算
-					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
-					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
-				},
-				load:{ list: false, edit: false, del: false, add: false },//查询中...
-				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
-				
-				addFormVisible: false,//新增xmProjectOptions界面是否显示
-				//新增xmProjectOptions界面初始化数据
-				addForm: {
-					id:'',branchId:'',optionType:'',name:''
-				},
-				
-				editFormVisible: false,//编辑界面是否显示
-				//编辑xmProjectOptions界面初始化数据
-				editForm: {
-					id:'',branchId:'',optionType:'',name:''
-				}
-				/**begin 自定义属性请在下面加 请加备注**/
-					
-				/**end 自定义属性请在上面加 请加备注**/
-			}
-		},//end data
-		methods: { 
-			handleSizeChange(pageSize) { 
-				this.pageInfo.pageSize=pageSize; 
-				this.getXmProjectOptionss();
-			},
-			handleCurrentChange(pageNum) {
-				this.pageInfo.pageNum = pageNum;
-				this.getXmProjectOptionss();
-			},
-			// 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名
-			sortChange( obj ){
-				var dir='asc';
-				if(obj.order=='ascending'){
-					dir='asc'
-				}else{
-					dir='desc';
-				}
-				if(obj.prop=='xxx'){
-					this.pageInfo.orderFields=['xxx'];
-					this.pageInfo.orderDirs=[dir];
-				}
-				this.getXmProjectOptionss();
-			},
-			searchXmProjectOptionss(){
-				 this.pageInfo.count=true; 
-				 this.getXmProjectOptionss();
-			},
-			//获取列表 XmProjectOptions xm_project_options
-			getXmProjectOptionss() {
-				let params = {
-					pageSize: this.pageInfo.pageSize,
-					pageNum: this.pageInfo.pageNum,
-					total: this.pageInfo.total,
-					count:this.pageInfo.count
-				};
-				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
-					let orderBys=[];
-					for(var i=0;i<this.pageInfo.orderFields.length;i++){ 
-						orderBys.push(this.pageInfo.orderFields[i]+" "+this.pageInfo.orderDirs[i])
-					}  
-					params.orderBy= orderBys.join(",")
-				}
-				if(this.filters.key!==""){
-					//params.xxx=this.filters.key
-				}else{
-					//params.xxx=xxxxx
-				}
-				this.load.list = true;
-				listXmProjectOptions(params).then((res) => {
-					var tips=res.data.tips;
-					if(tips.isOk){ 
-						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
-						this.xmProjectOptionss = res.data.data;
-					}else{
-						this.$notify({showClose: true, message: tips.msg, type: 'error' });
-					} 
-					this.load.list = false;
-				}).catch( err => this.load.list = false );
-			},
-
-			//显示编辑界面 XmProjectOptions xm_project_options
-			showEdit: function ( row,index ) {
-				this.editFormVisible = true;
-				this.editForm = Object.assign({}, row);
-			},
-			//显示新增界面 XmProjectOptions xm_project_options
-			showAdd: function () {
-				this.addFormVisible = true;
-				//this.addForm=Object.assign({}, this.editForm);
-			},
-			afterAddSubmit(){
-				this.addFormVisible=false;
-				this.pageInfo.count=true;
-				this.getXmProjectOptionss();
-			},
-			afterEditSubmit(){
-				this.editFormVisible=false;
-			},
-			//选择行xmProjectOptions
-			selsChange: function (sels) {
-				this.sels = sels;
-			}, 
-			//删除xmProjectOptions
-			handleDel: function (row,index) { 
-				this.$confirm('确认删除该记录吗?', '提示', {
-					type: 'warning'
-				}).then(() => { 
-					this.load.del=true;
-					let params = { id: row.id };
-					delXmProjectOptions(params).then((res) => {
-						this.load.del=false;
-						var tips=res.data.tips;
-						if(tips.isOk){ 
-							this.pageInfo.count=true;
-							this.getXmProjectOptionss();
-						}
-						this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
-					}).catch( err  => this.load.del=false );
-				});
-			},
-			//批量删除xmProjectOptions
-			batchDel: function () {
-				
-				this.$confirm('确认删除选中记录吗？', '提示', {
-					type: 'warning'
-				}).then(() => { 
-					this.load.del=true;
-					batchDelXmProjectOptions(this.sels).then((res) => {
-						this.load.del=false;
-						var tips=res.data.tips;
-						if( tips.isOk ){ 
-							this.pageInfo.count=true;
-							this.getXmProjectOptionss(); 
-						}
-						this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'});
-					}).catch( err  => this.load.del=false );
-				});
-			},
-			rowClick: function(row, event, column){
-				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
-			}
-			/**begin 自定义函数请在下面加**/
-			
-				
-			/**end 自定义函数请在上面加**/
-			
-		},//end methods
-		components: { 
-		    'xm-project-options-add':XmProjectOptionsAdd,
-		    'xm-project-options-edit':XmProjectOptionsEdit,
-		    
-		    //在下面添加其它组件
-		},
-		mounted() { 
-			this.$nextTick(() => {
-				this.getXmProjectOptionss();
-        	}); 
-		}
-	}
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
index dd486660..5f98b631 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
@@ -1769,7 +1769,7 @@ export default {
   },
   mounted() {
     this.$nextTick(() => { 
-      this.tableHeight = util.calcTableMaxHeight(this.$refs.selectPhaseTable.$el)
+      this.tableHeight = util.calcTableMaxHeight(this.$refs.table.$el)
       if (this.selProject) {
         this.getXmProjectPhases();
       }
diff --git a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue
deleted file mode 100644
index 08130fcb..00000000
--- a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue
+++ /dev/null
@@ -1,171 +0,0 @@
-<template>
-	<section class="page-container  padding border">
-		<el-row>
-			<!--新增界面 XmProjectPhaseBaseline xm_project_phase_baseline--> 
-			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
-				<el-form-item label="基线建立时间" prop="baseCtime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.baseCtime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
-				<el-form-item label="计划主键" prop="projectPhaseId">
-					<el-input v-model="addForm.projectPhaseId" placeholder="计划主键" ></el-input>
-				</el-form-item> 
-				<el-form-item label="计划名称" prop="phaseName">
-					<el-input v-model="addForm.phaseName" placeholder="计划名称" ></el-input>
-				</el-form-item> 
-				<el-form-item label="备注" prop="remark">
-					<el-input v-model="addForm.remark" placeholder="备注" ></el-input>
-				</el-form-item> 
-				<el-form-item label="上级计划编号" prop="parentPhaseId">
-					<el-input v-model="addForm.parentPhaseId" placeholder="上级计划编号" ></el-input>
-				</el-form-item> 
-				<el-form-item label="机构编号" prop="branchId">
-					<el-input v-model="addForm.branchId" placeholder="机构编号" ></el-input>
-				</el-form-item> 
-				<el-form-item label="当前项目编号" prop="projectId">
-					<el-input v-model="addForm.projectId" placeholder="当前项目编号" ></el-input>
-				</el-form-item> 
-				<el-form-item label="开始时间" prop="beginDate">
-					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.beginDate" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
-				<el-form-item label="结束时间" prop="endDate">
-					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.endDate" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
-				<el-form-item label="工时" prop="planWorkingHours">
-					<el-input v-model="addForm.planWorkingHours" placeholder="工时"></el-input>
-				</el-form-item> 
-				<el-form-item label="投入人员数" prop="planWorkingStaffNu">
-					<el-input v-model="addForm.planWorkingStaffNu" placeholder="投入人员数"></el-input>
-				</el-form-item> 
-				<el-form-item label="创建时间" prop="ctime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.ctime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
-				<el-form-item label="非人力成本总预算" prop="totalBudgetNouser">
-					<el-input v-model="addForm.totalBudgetNouser" placeholder="非人力成本总预算"></el-input>
-				</el-form-item> 
-				<el-form-item label="内部人力成本总预算" prop="totalBudgetInnerUser">
-					<el-input v-model="addForm.totalBudgetInnerUser" placeholder="内部人力成本总预算"></el-input>
-				</el-form-item> 
-				<el-form-item label="外购人力成本总预算" prop="totalBudgetOutUser">
-					<el-input v-model="addForm.totalBudgetOutUser" placeholder="外购人力成本总预算"></el-input>
-				</el-form-item> 
-				<el-form-item label="基线主键" prop="id">
-					<el-input v-model="addForm.id" placeholder="基线主键" ></el-input>
-				</el-form-item> 
-				<el-form-item label="基线备注" prop="baseRemark">
-					<el-input v-model="addForm.baseRemark" placeholder="基线备注" ></el-input>
-				</el-form-item> 
-				<el-form-item label="项目级基线" prop="projectBaselineId">
-					<el-input v-model="addForm.projectBaselineId" placeholder="项目级基线" ></el-input>
-				</el-form-item> 
-				<el-form-item label="当前流程实例编号" prop="bizProcInstId">
-					<el-input v-model="addForm.bizProcInstId" placeholder="当前流程实例编号" ></el-input>
-				</el-form-item> 
-				<el-form-item label="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除" prop="bizFlowState">
-					<el-input v-model="addForm.bizFlowState" placeholder="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除" ></el-input>
-				</el-form-item> 
-				<el-form-item label="总工作量单位人时" prop="totalBudgetWorkload">
-					<el-input v-model="addForm.totalBudgetWorkload" placeholder="总工作量单位人时"></el-input>
-				</el-form-item> 
-				<el-form-item label="已完成工作量单位人时" prop="totalActWorkload">
-					<el-input v-model="addForm.totalActWorkload" placeholder="已完成工作量单位人时"></el-input>
-				</el-form-item> 
-				<el-form-item>
-					<el-col :span="24" :offset="8"> 
-						<el-button @click.native="handleCancel">取消</el-button>  
-						<el-button v-loading="load.add" type="primary" @click.native="addSubmit" :disabled="load.add==true">提交</el-button>  
-					</el-col>
-				</el-form-item> 
-			</el-form>
-		</el-row>
-	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
-	import { addXmProjectPhaseBaseline } from '@/api/xm/core/xmProjectPhaseBaseline';
-	import { mapGetters } from 'vuex'
-	
-	export default { 
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ])
-		},
-		props:['xmProjectPhaseBaseline','visible'],
-		watch: {
-	      'xmProjectPhaseBaseline':function( xmProjectPhaseBaseline ) {
-	        this.addForm = xmProjectPhaseBaseline;
-	      },
-	      'visible':function(visible) { 
-	      	if(visible==true){
-	      		//从新打开页面时某些数据需要重新加载，可以在这里添加
-	      	}
-	      } 
-	    },
-		data() {
-			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
-				load:{ list: false, edit: false, del: false, add: false },//查询中...
-				addFormRules: {
-					id: [
-						//{ required: true, message: '基线主键不能为空', trigger: 'blur' }
-					]
-				},
-				//新增界面数据 xm_project_phase_baseline
-				addForm: {
-					baseCtime:'',projectPhaseId:'',phaseName:'',remark:'',parentPhaseId:'',branchId:'',projectId:'',beginDate:'',endDate:'',planWorkingHours:'',planWorkingStaffNu:'',ctime:'',totalBudgetNouser:'',totalBudgetInnerUser:'',totalBudgetOutUser:'',id:'',baseRemark:'',projectBaselineId:'',bizProcInstId:'',bizFlowState:'',totalBudgetWorkload:'',totalActWorkload:''
-				}
-				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
-				
-				/**end 在上面加自定义属性**/
-			}//end return
-		},//end data
-		methods: {
-			// 取消按钮点击 父组件监听@cancel="addFormVisible=false" 监听
-			handleCancel:function(){
-				this.$refs['addForm'].resetFields();
-				this.$emit('cancel');
-			},
-			//新增提交XmProjectPhaseBaseline xm_project_phase_baseline 父组件监听@submit="afterAddSubmit"
-			addSubmit: function () {
-				
-				this.$refs.addForm.validate((valid) => {
-					if (valid) {
-						
-						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
-							this.load.add=true
-							let params = Object.assign({}, this.addForm); 
-							addXmProjectPhaseBaseline(params).then((res) => {
-								this.load.add=false
-								var tips=res.data.tips;
-								if(tips.isOk){
-									this.$refs['addForm'].resetFields();
-									this.$emit('submit');//  @submit="afterAddSubmit"
-								}
-								this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
-							}).catch( err  => this.load.add=false);
-						});
-					}
-				});
-			}
-			/**begin 在下面加自定义方法,记得补上面的一个逗号**/
-				
-			/**end 在上面加自定义方法**/
-			
-		},//end method
-		components: {  
-		    //在下面添加其它组件 'xm-project-phase-baseline-edit':XmProjectPhaseBaselineEdit
-		},
-		mounted() {
-			this.addForm=Object.assign(this.addForm, this.xmProjectPhaseBaseline);  
-			/**在下面写其它函数***/
-			
-		}//end mounted
-	}
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue
deleted file mode 100644
index 7be86f4b..00000000
--- a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue
+++ /dev/null
@@ -1,166 +0,0 @@
-<template>
-	<section class="page-container  padding border">
-		<el-row> 
-		<!--编辑界面 XmProjectPhaseBaseline xm_project_phase_baseline--> 
-			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
-				<el-form-item label="基线建立时间" prop="baseCtime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.baseCtime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
-				<el-form-item label="计划主键" prop="projectPhaseId">
-					<el-input v-model="editForm.projectPhaseId" placeholder="计划主键"></el-input>
-				</el-form-item> 
-				<el-form-item label="计划名称" prop="phaseName">
-					<el-input v-model="editForm.phaseName" placeholder="计划名称"></el-input>
-				</el-form-item> 
-				<el-form-item label="备注" prop="remark">
-					<el-input v-model="editForm.remark" placeholder="备注"></el-input>
-				</el-form-item> 
-				<el-form-item label="上级计划编号" prop="parentPhaseId">
-					<el-input v-model="editForm.parentPhaseId" placeholder="上级计划编号"></el-input>
-				</el-form-item> 
-				<el-form-item label="机构编号" prop="branchId">
-					<el-input v-model="editForm.branchId" placeholder="机构编号"></el-input>
-				</el-form-item> 
-				<el-form-item label="当前项目编号" prop="projectId">
-					<el-input v-model="editForm.projectId" placeholder="当前项目编号"></el-input>
-				</el-form-item> 
-				<el-form-item label="开始时间" prop="beginDate">
-					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.beginDate"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
-				<el-form-item label="结束时间" prop="endDate">
-					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.endDate"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
-				<el-form-item label="工时" prop="planWorkingHours">
-					<el-input v-model="editForm.planWorkingHours" placeholder="工时"></el-input>
-				</el-form-item> 
-				<el-form-item label="投入人员数" prop="planWorkingStaffNu">
-					<el-input v-model="editForm.planWorkingStaffNu" placeholder="投入人员数"></el-input>
-				</el-form-item> 
-				<el-form-item label="创建时间" prop="ctime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.ctime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
-				<el-form-item label="非人力成本总预算" prop="totalBudgetNouser">
-					<el-input v-model="editForm.totalBudgetNouser" placeholder="非人力成本总预算"></el-input>
-				</el-form-item> 
-				<el-form-item label="内部人力成本总预算" prop="totalBudgetInnerUser">
-					<el-input v-model="editForm.totalBudgetInnerUser" placeholder="内部人力成本总预算"></el-input>
-				</el-form-item> 
-				<el-form-item label="外购人力成本总预算" prop="totalBudgetOutUser">
-					<el-input v-model="editForm.totalBudgetOutUser" placeholder="外购人力成本总预算"></el-input>
-				</el-form-item> 
-				<el-form-item label="基线主键" prop="id">
-					<el-input v-model="editForm.id" placeholder="基线主键"></el-input>
-				</el-form-item> 
-				<el-form-item label="基线备注" prop="baseRemark">
-					<el-input v-model="editForm.baseRemark" placeholder="基线备注"></el-input>
-				</el-form-item> 
-				<el-form-item label="项目级基线" prop="projectBaselineId">
-					<el-input v-model="editForm.projectBaselineId" placeholder="项目级基线"></el-input>
-				</el-form-item> 
-				<el-form-item label="当前流程实例编号" prop="bizProcInstId">
-					<el-input v-model="editForm.bizProcInstId" placeholder="当前流程实例编号"></el-input>
-				</el-form-item> 
-				<el-form-item label="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除" prop="bizFlowState">
-					<el-input v-model="editForm.bizFlowState" placeholder="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除"></el-input>
-				</el-form-item> 
-				<el-form-item label="总工作量单位人时" prop="totalBudgetWorkload">
-					<el-input v-model="editForm.totalBudgetWorkload" placeholder="总工作量单位人时"></el-input>
-				</el-form-item> 
-				<el-form-item label="已完成工作量单位人时" prop="totalActWorkload">
-					<el-input v-model="editForm.totalActWorkload" placeholder="已完成工作量单位人时"></el-input>
-				</el-form-item> 
-				<el-form-item> 
-					<el-col :span="24" :offset="8"> 
-						<el-button @click.native="handleCancel">取消</el-button>  
-						<el-button v-loading="load.edit" type="primary" @click.native="editSubmit" :disabled="load.edit==true">提交</el-button>  
-					</el-col> 
-				</el-form-item> 
-			</el-form>
-		</el-row>
-	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
-	import { editXmProjectPhaseBaseline } from '@/api/xm/core/xmProjectPhaseBaseline';
-	import { mapGetters } from 'vuex'
-	
-	export default { 
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ])
-		},
-		props:['xmProjectPhaseBaseline','visible'],
-		watch: {
-	      'xmProjectPhaseBaseline':function( xmProjectPhaseBaseline ) {
-	        this.editForm = xmProjectPhaseBaseline;
-	      },
-	      'visible':function(visible) { 
-	      	if(visible==true){
-	      		//从新打开页面时某些数据需要重新加载，可以在这里添加
-	      	}
-	      } 
-	    },
-		data() {
-			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
-				load:{ list: false, edit: false, del: false, add: false },//查询中...
-				editFormRules: {
-					id: [
-						//{ required: true, message: '基线主键不能为空', trigger: 'blur' }
-					]
-				},
-				//编辑界面数据  XmProjectPhaseBaseline xm_project_phase_baseline
-				editForm: {
-					baseCtime:'',projectPhaseId:'',phaseName:'',remark:'',parentPhaseId:'',branchId:'',projectId:'',beginDate:'',endDate:'',planWorkingHours:'',planWorkingStaffNu:'',ctime:'',totalBudgetNouser:'',totalBudgetInnerUser:'',totalBudgetOutUser:'',id:'',baseRemark:'',projectBaselineId:'',bizProcInstId:'',bizFlowState:'',totalBudgetWorkload:'',totalActWorkload:''
-				}
-				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
-				
-				/**end 在上面加自定义属性**/
-			}//end return
-		},//end data
-		methods: {
-			// 取消按钮点击 父组件监听@cancel="editFormVisible=false" 监听
-			handleCancel:function(){
-				this.$refs['editForm'].resetFields();
-				this.$emit('cancel');
-			},
-			//编辑提交XmProjectPhaseBaseline xm_project_phase_baseline父组件监听@submit="afterEditSubmit"
-			editSubmit: function () {
-				this.$refs.editForm.validate((valid) => {
-					if (valid) {
-						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
-							this.load.edit=true
-							let params = Object.assign({}, this.editForm); 
-							editXmProjectPhaseBaseline(params).then((res) => {
-								this.load.edit=false
-								var tips=res.data.tips;
-								if(tips.isOk){
-									this.$refs['editForm'].resetFields();
-									this.$emit('submit');//  @submit="afterEditSubmit"
-								}
-								this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
-							}).catch( err =>this.load.edit=false);
-						});
-					}
-				});
-			}
-			/**begin 在下面加自定义方法,记得补上面的一个逗号**/
-				
-			/**end 在上面加自定义方法**/
-		},//end method
-		components: {  
-		    //在下面添加其它组件 'xm-project-phase-baseline-edit':XmProjectPhaseBaselineEdit
-		},
-		mounted() {
-			this.editForm=Object.assign(this.editForm, this.xmProjectPhaseBaseline);  
-		}
-	}
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue
deleted file mode 100644
index 93ffd7d3..00000000
--- a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue
+++ /dev/null
@@ -1,252 +0,0 @@
-<template>
-	<section class="page-container  padding border">
-		<el-row>
-			<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="searchXmProjectPhaseBaselines">查询</el-button>
-			<el-button type="primary" @click="showAdd">+xm_project_phase_baseline</el-button>
-			<el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> 
-		</el-row>
-		<el-row class="page-main "> 
-			<!--列表 XmProjectPhaseBaseline xm_project_phase_baseline-->
-			<el-table :data="xmProjectPhaseBaselines" @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="baseCtime" label="基线建立时间" min-width="80" ></el-table-column>
-				<el-table-column prop="projectPhaseId" label="计划主键" min-width="80" ></el-table-column>
-				<el-table-column prop="phaseName" label="计划名称" min-width="80" ></el-table-column>
-				<el-table-column prop="remark" label="备注" min-width="80" ></el-table-column>
-				<el-table-column prop="parentPhaseId" label="上级计划编号" min-width="80" ></el-table-column>
-				<el-table-column prop="branchId" label="机构编号" min-width="80" ></el-table-column>
-				<el-table-column prop="projectId" label="当前项目编号" min-width="80" ></el-table-column>
-				<el-table-column prop="beginDate" label="开始时间" min-width="80" ></el-table-column>
-				<el-table-column prop="endDate" label="结束时间" min-width="80" ></el-table-column>
-				<el-table-column prop="planWorkingHours" label="工时" min-width="80" ></el-table-column>
-				<el-table-column prop="planWorkingStaffNu" label="投入人员数" min-width="80" ></el-table-column>
-				<el-table-column prop="ctime" label="创建时间" min-width="80" ></el-table-column>
-				<el-table-column prop="totalBudgetNouser" label="非人力成本总预算" min-width="80" ></el-table-column>
-				<el-table-column prop="totalBudgetInnerUser" label="内部人力成本总预算" min-width="80" ></el-table-column>
-				<el-table-column prop="totalBudgetOutUser" label="外购人力成本总预算" min-width="80" ></el-table-column>
-				<el-table-column prop="id" label="基线主键" min-width="80" ></el-table-column>
-				<el-table-column prop="baseRemark" label="基线备注" min-width="80" ></el-table-column>
-				<el-table-column prop="projectBaselineId" label="项目级基线" min-width="80" ></el-table-column>
-				<el-table-column prop="bizProcInstId" label="当前流程实例编号" min-width="80" ></el-table-column>
-				<el-table-column prop="bizFlowState" label="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除" min-width="80" ></el-table-column>
-				<el-table-column prop="totalBudgetWorkload" label="总工作量单位人时" min-width="80" ></el-table-column>
-				<el-table-column prop="totalActWorkload" label="已完成工作量单位人时" min-width="80" ></el-table-column>
-				<el-table-column label="操作" width="160" fixed="right"  >
-					<template slot-scope="scope">
-						<el-button  @click="showEdit( scope.row,scope.$index)">改</el-button>
-						<el-button type="danger" @click="handleDel(scope.row,scope.$index)">删</el-button>
-					</template>
-				</el-table-column>
-			</el-table>
-			<el-pagination  layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination> 
-		
-			<!--编辑 XmProjectPhaseBaseline xm_project_phase_baseline界面-->
-			<el-drawer title="编辑xm_project_phase_baseline" :visible.sync="editFormVisible"  size="50%"  append-to-body   :close-on-click-modal="false">
-				  <xm-project-phase-baseline-edit :xm-project-phase-baseline="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-project-phase-baseline-edit>
-			</el-drawer>
-	
-			<!--新增 XmProjectPhaseBaseline xm_project_phase_baseline界面-->
-			<el-drawer title="新增xm_project_phase_baseline" :visible.sync="addFormVisible"  size="50%"  append-to-body   :close-on-click-modal="false">
-				<xm-project-phase-baseline-add :xm-project-phase-baseline="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-project-phase-baseline-add>
-			</el-drawer> 
-		</el-row>
-	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
-	import { listXmProjectPhaseBaseline, delXmProjectPhaseBaseline, batchDelXmProjectPhaseBaseline } from '@/api/xm/core/xmProjectPhaseBaseline';
-	import  XmProjectPhaseBaselineAdd from './XmProjectPhaseBaselineAdd';//新增界面
-	import  XmProjectPhaseBaselineEdit from './XmProjectPhaseBaselineEdit';//修改界面
-	import { mapGetters } from 'vuex'
-	
-	export default { 
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ])
-		},
-		data() {
-			return {
-				filters: {
-					key: ''
-				},
-				xmProjectPhaseBaselines: [],//查询结果
-				pageInfo:{//分页数据
-					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
-					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
-					pageNum:1,//当前页码、从1开始计算
-					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
-					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
-				},
-				load:{ list: false, edit: false, del: false, add: false },//查询中...
-				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
-				
-				addFormVisible: false,//新增xmProjectPhaseBaseline界面是否显示
-				//新增xmProjectPhaseBaseline界面初始化数据
-				addForm: {
-					baseCtime:'',projectPhaseId:'',phaseName:'',remark:'',parentPhaseId:'',branchId:'',projectId:'',beginDate:'',endDate:'',planWorkingHours:'',planWorkingStaffNu:'',ctime:'',totalBudgetNouser:'',totalBudgetInnerUser:'',totalBudgetOutUser:'',id:'',baseRemark:'',projectBaselineId:'',bizProcInstId:'',bizFlowState:'',totalBudgetWorkload:'',totalActWorkload:''
-				},
-				
-				editFormVisible: false,//编辑界面是否显示
-				//编辑xmProjectPhaseBaseline界面初始化数据
-				editForm: {
-					baseCtime:'',projectPhaseId:'',phaseName:'',remark:'',parentPhaseId:'',branchId:'',projectId:'',beginDate:'',endDate:'',planWorkingHours:'',planWorkingStaffNu:'',ctime:'',totalBudgetNouser:'',totalBudgetInnerUser:'',totalBudgetOutUser:'',id:'',baseRemark:'',projectBaselineId:'',bizProcInstId:'',bizFlowState:'',totalBudgetWorkload:'',totalActWorkload:''
-				}
-				/**begin 自定义属性请在下面加 请加备注**/
-					
-				/**end 自定义属性请在上面加 请加备注**/
-			}
-		},//end data
-		methods: { 
-			handleSizeChange(pageSize) { 
-				this.pageInfo.pageSize=pageSize; 
-				this.getXmProjectPhaseBaselines();
-			},
-			handleCurrentChange(pageNum) {
-				this.pageInfo.pageNum = pageNum;
-				this.getXmProjectPhaseBaselines();
-			},
-			// 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名
-			sortChange( obj ){
-				var dir='asc';
-				if(obj.order=='ascending'){
-					dir='asc'
-				}else{
-					dir='desc';
-				}
-				if(obj.prop=='xxx'){
-					this.pageInfo.orderFields=['xxx'];
-					this.pageInfo.orderDirs=[dir];
-				}
-				this.getXmProjectPhaseBaselines();
-			},
-			searchXmProjectPhaseBaselines(){
-				 this.pageInfo.count=true; 
-				 this.getXmProjectPhaseBaselines();
-			},
-			//获取列表 XmProjectPhaseBaseline xm_project_phase_baseline
-			getXmProjectPhaseBaselines() {
-				let params = {
-					pageSize: this.pageInfo.pageSize,
-					pageNum: this.pageInfo.pageNum,
-					total: this.pageInfo.total,
-					count:this.pageInfo.count
-				};
-				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
-					let orderBys=[];
-					for(var i=0;i<this.pageInfo.orderFields.length;i++){ 
-						orderBys.push(this.pageInfo.orderFields[i]+" "+this.pageInfo.orderDirs[i])
-					}  
-					params.orderBy= orderBys.join(",")
-				}
-				if(this.filters.key!==""){
-					//params.xxx=this.filters.key
-				}else{
-					//params.xxx=xxxxx
-				}
-				this.load.list = true;
-				listXmProjectPhaseBaseline(params).then((res) => {
-					var tips=res.data.tips;
-					if(tips.isOk){ 
-						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
-						this.xmProjectPhaseBaselines = res.data.data;
-					}else{
-						this.$notify({showClose: true, message: tips.msg, type: 'error' });
-					} 
-					this.load.list = false;
-				}).catch( err => this.load.list = false );
-			},
-
-			//显示编辑界面 XmProjectPhaseBaseline xm_project_phase_baseline
-			showEdit: function ( row,index ) {
-				this.editFormVisible = true;
-				this.editForm = Object.assign({}, row);
-			},
-			//显示新增界面 XmProjectPhaseBaseline xm_project_phase_baseline
-			showAdd: function () {
-				this.addFormVisible = true;
-				//this.addForm=Object.assign({}, this.editForm);
-			},
-			afterAddSubmit(){
-				this.addFormVisible=false;
-				this.pageInfo.count=true;
-				this.getXmProjectPhaseBaselines();
-			},
-			afterEditSubmit(){
-				this.editFormVisible=false;
-			},
-			//选择行xmProjectPhaseBaseline
-			selsChange: function (sels) {
-				this.sels = sels;
-			}, 
-			//删除xmProjectPhaseBaseline
-			handleDel: function (row,index) { 
-				this.$confirm('确认删除该记录吗?', '提示', {
-					type: 'warning'
-				}).then(() => { 
-					this.load.del=true;
-					let params = { id: row.id };
-					delXmProjectPhaseBaseline(params).then((res) => {
-						this.load.del=false;
-						var tips=res.data.tips;
-						if(tips.isOk){ 
-							this.pageInfo.count=true;
-							this.getXmProjectPhaseBaselines();
-						}
-						this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
-					}).catch( err  => this.load.del=false );
-				});
-			},
-			//批量删除xmProjectPhaseBaseline
-			batchDel: function () {
-				
-				this.$confirm('确认删除选中记录吗？', '提示', {
-					type: 'warning'
-				}).then(() => { 
-					this.load.del=true;
-					batchDelXmProjectPhaseBaseline(this.sels).then((res) => {
-						this.load.del=false;
-						var tips=res.data.tips;
-						if( tips.isOk ){ 
-							this.pageInfo.count=true;
-							this.getXmProjectPhaseBaselines(); 
-						}
-						this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'});
-					}).catch( err  => this.load.del=false );
-				});
-			},
-			rowClick: function(row, event, column){
-				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
-			}
-			/**begin 自定义函数请在下面加**/
-			
-				
-			/**end 自定义函数请在上面加**/
-			
-		},//end methods
-		components: { 
-		    'xm-project-phase-baseline-add':XmProjectPhaseBaselineAdd,
-		    'xm-project-phase-baseline-edit':XmProjectPhaseBaselineEdit,
-		    
-		    //在下面添加其它组件
-		},
-		mounted() { 
-			this.$nextTick(() => {
-				this.getXmProjectPhaseBaselines();
-        	}); 
-		}
-	}
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue
index e7bec999..7993d22f 100644
--- a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue
+++ b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue
@@ -9,7 +9,7 @@
 		
 		<el-row class="page-main" v-if="!simple"> 
 			<!--列表 XmProjectPhaseTemplate xm_phase_template-->
-			<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 ref="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" >
 					
@@ -297,11 +297,8 @@
 			if(this.selProjectTemplate){
 				this.filters.projectTemplate=this.selProjectTemplate
 			}
-			this.$nextTick(() => {
-				
-                
-                
-                this.maxTableHeight = util.calcTableMaxHeight('.el-table');
+			this.$nextTick(() => { 
+                this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
 				this.getXmProjectPhases();   
 			}); 
 			
diff --git a/src/views/xm/core/xmProjectState/XmProjectStateMng.vue b/src/views/xm/core/xmProjectState/XmProjectStateMng.vue
index 07ee98dc..777c3c0a 100644
--- a/src/views/xm/core/xmProjectState/XmProjectStateMng.vue
+++ b/src/views/xm/core/xmProjectState/XmProjectStateMng.vue
@@ -432,8 +432,8 @@
 						this.options['projectStatus']=res.data.data.projectStatus 
 						//this.editForm.projectStatus=this.options['projectStatus'][0].optionValue
 					}
-				}); 
-                this.maxTableHeight = util.calcTableMaxHeight('.el-table');
+				});  
+                this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
         	}); 
         	/** 举例，
     		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
diff --git a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue
index ec17748f..1bab1068 100644
--- a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue
+++ b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue
@@ -8,7 +8,7 @@
 		</el-row>
 		<el-row class="page-main "> 
 			<!--列表 XmProjectTaskTypeState 按任务类型汇总-->
-			<el-table :data="xmProjectTaskTypeStates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="maxTableHeight" :data="xmProjectTaskTypeStates" @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>
@@ -99,7 +99,8 @@
 				//编辑xmProjectTaskTypeState界面初始化数据
 				editForm: {
 					projectId:'',projectName:'',taskType:'',planWorkload:'',planAmount:'',actWorkload:'',actAmount:'',branchId:'',bizDate:'',calcTime:'',planOutUserAt:'',planInnerUserAt:'',actOutUserAt:'',actInnerUserAt:'',planOutUserWorkload:'',planInnerUserWorkload:'',actOutUserWorkload:'',actInnerUserWorkload:'',planNouserAt:'',actNouserAt:'',id:''
-				}
+				},
+				maxTableHeight:300,
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
@@ -240,6 +241,8 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				
+                this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
 				this.getXmProjectTaskTypeStates();
         	}); 
         	/** 举例，
diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue
index 7f7a3af6..f18179a1 100644
--- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue
+++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue
@@ -9,7 +9,7 @@
   		</el-row>
 		<el-row class="page-main"> 
 			<!--列表 XmProjectTemplate xm_project_template-->
-			<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 ref="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> 
@@ -211,11 +211,8 @@
  		    //在下面添加其它组件
 		},
 		mounted() { 
-			this.$nextTick(() => {
-				
-                
-                
-                this.maxTableHeight = util.calcTableMaxHeight('.el-table');
+			this.$nextTick(() => { 
+                this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
 				this.getXmProjectTemplates();
 				listOption([{categoryId:'all',itemCode:'projectType'}] ).then(res=>{
 					if(res.data.tips.isOk){ 
diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue
index c8184537..be8b174e 100644
--- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue
+++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue
@@ -12,7 +12,7 @@
 		</el-row>
 		<el-row class="page-main"> 
 			<!--列表 XmProjectTemplate xm_project_template-->
-			<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 ref="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="80" ></el-table-column> 
@@ -257,11 +257,8 @@
  		    //在下面添加其它组件
 		},
 		mounted() { 
-			this.$nextTick(() => {
-				
-                
-                
-                this.maxTableHeight = util.calcTableMaxHeight('.el-table');
+			this.$nextTick(() => { 
+                this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
 				this.getXmProjectTemplates();
 				listOption([{categoryId:'all',itemCode:'projectType'}] ).then(res=>{
 					if(res.data.tips.isOk){ 
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index ee87cad0..1f9264de 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -943,7 +943,7 @@
 			this.$nextTick(() => {
 				
 				
-				this.tableHeight =  util.calcTableMaxHeight(".el-table");
+				this.tableHeight =  util.calcTableMaxHeight(this.$refs.table.$el);
 				this.getXmQuestions();
 			});
 				listOption([{categoryId:'all',itemCode:'bugSeverity'},{categoryId:'all',itemCode:'bugSolution'},{categoryId:'all',itemCode:'bugStatus'},{categoryId:'all',itemCode:'bugType'},{categoryId:'all',itemCode:'urgencyLevel'}] ).then(res=>{
diff --git a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue
index 55e7b5c9..19da4a0a 100644
--- a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue
+++ b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue
@@ -2,7 +2,7 @@
 	<section class="page-container padding border">
 		<el-row class="page-main"> 
 			<!--列表 XmQuestionHandle xm_question_handle-->
-			<el-table :data="xmQuestionHandles" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="tableHeight" :data="xmQuestionHandles" @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="60"></el-table-column>
  				<el-table-column prop="handlerUsername" label="指派" min-width="80" >
 					<template slot-scope="scope">
@@ -85,7 +85,8 @@
 				//编辑xmQuestionHandle界面初始化数据
 				editForm: {
 					id:'',handlerUserid:'',handlerUsername:'',handleSolution:'',receiptMessage:'',receiptTime:'',handleStatus:'',bizProcInstId:'',bizFlowState:'',questionId:'',lastUpdateTime:'',createTime:'',actWorkload:'',actCostAmount:'',urls:'',targetUserid:'',targetUsername:''
-				}
+				},
+				tableHeight:300,
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
@@ -228,6 +229,8 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				
+				this.tableHeight = util.calcTableMaxHeight(this.$refs.table.$el); 
 				this.getXmQuestionHandles();
         	}); 
 		}
diff --git a/src/views/xm/core/xmQuestionTag/XmQuestionTagAdd.vue b/src/views/xm/core/xmQuestionTag/XmQuestionTagAdd.vue
deleted file mode 100644
index cfc99142..00000000
--- a/src/views/xm/core/xmQuestionTag/XmQuestionTagAdd.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-<template>
-	<section class="page-container  padding border">
-		<el-row>
-			<!--新增界面 XmQuestionTag 缺陷标签关联表--> 
-			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
-				<el-form-item label="缺陷编号" prop="questionId">
-					<el-input v-model="addForm.questionId" placeholder="缺陷编号" ></el-input>
-				</el-form-item> 
-				<el-form-item label="标签编号" prop="tagId">
-					<el-input v-model="addForm.tagId" placeholder="标签编号" ></el-input>
-				</el-form-item> 
-				<el-form-item label="标签名称" prop="tagName">
-					<el-input v-model="addForm.tagName" placeholder="标签名称" ></el-input>
-				</el-form-item> 
-				<el-form-item label="添加时间" prop="ctime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.ctime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
-				<el-form-item label="主键" prop="id">
-					<el-input v-model="addForm.id" placeholder="主键" ></el-input>
-				</el-form-item> 
-				<el-form-item>
-					<el-col :span="24" :offset="8"> 
-						<el-button @click.native="handleCancel">取消</el-button>  
-						<el-button v-loading="load.add" type="primary" @click.native="addSubmit" :disabled="load.add==true">提交</el-button>  
-					</el-col>
-				</el-form-item> 
-			</el-form>
-		</el-row>
-	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
-	import { addXmQuestionTag } from '@/api/xm/core/xmQuestionTag';
-	import { mapGetters } from 'vuex'
-	
-	export default { 
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ])
-		},
-		props:['xmQuestionTag','visible'],
-		watch: {
-	      'xmQuestionTag':function( xmQuestionTag ) {
-	        this.addForm = xmQuestionTag;
-	      },
-	      'visible':function(visible) { 
-	      	if(visible==true){
-	      		//从新打开页面时某些数据需要重新加载，可以在这里添加
-	      	}
-	      } 
-	    },
-		data() {
-			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
-				load:{ list: false, edit: false, del: false, add: false },//查询中...
-				addFormRules: {
-					id: [
-						//{ required: true, message: '主键不能为空', trigger: 'blur' }
-					]
-				},
-				//新增界面数据 缺陷标签关联表
-				addForm: {
-					questionId:'',tagId:'',tagName:'',ctime:'',id:''
-				}
-				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
-				
-				/**end 在上面加自定义属性**/
-			}//end return
-		},//end data
-		methods: {
-			// 取消按钮点击 父组件监听@cancel="addFormVisible=false" 监听
-			handleCancel:function(){
-				this.$refs['addForm'].resetFields();
-				this.$emit('cancel');
-			},
-			//新增提交XmQuestionTag 缺陷标签关联表 父组件监听@submit="afterAddSubmit"
-			addSubmit: function () {
-				
-				this.$refs.addForm.validate((valid) => {
-					if (valid) {
-						
-						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
-							this.load.add=true
-							let params = Object.assign({}, this.addForm); 
-							addXmQuestionTag(params).then((res) => {
-								this.load.add=false
-								var tips=res.data.tips;
-								if(tips.isOk){
-									this.$refs['addForm'].resetFields();
-									this.$emit('submit');//  @submit="afterAddSubmit"
-								}
-								this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
-							}).catch( err  => this.load.add=false);
-						});
-					}
-				});
-			}
-			/**begin 在下面加自定义方法,记得补上面的一个逗号**/
-				
-			/**end 在上面加自定义方法**/
-			
-		},//end method
-		components: {  
-		    //在下面添加其它组件 'xm-question-tag-edit':XmQuestionTagEdit
-		},
-		mounted() {
-			this.addForm=Object.assign(this.addForm, this.xmQuestionTag);  
-			/**在下面写其它函数***/
-			
-		}//end mounted
-	}
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmQuestionTag/XmQuestionTagEdit.vue b/src/views/xm/core/xmQuestionTag/XmQuestionTagEdit.vue
deleted file mode 100644
index 99db7a4a..00000000
--- a/src/views/xm/core/xmQuestionTag/XmQuestionTagEdit.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<template>
-	<section class="page-container  padding border">
-		<el-row> 
-		<!--编辑界面 XmQuestionTag 缺陷标签关联表--> 
-			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
-				<el-form-item label="缺陷编号" prop="questionId">
-					<el-input v-model="editForm.questionId" placeholder="缺陷编号"></el-input>
-				</el-form-item> 
-				<el-form-item label="标签编号" prop="tagId">
-					<el-input v-model="editForm.tagId" placeholder="标签编号"></el-input>
-				</el-form-item> 
-				<el-form-item label="标签名称" prop="tagName">
-					<el-input v-model="editForm.tagName" placeholder="标签名称"></el-input>
-				</el-form-item> 
-				<el-form-item label="添加时间" prop="ctime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.ctime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
-				<el-form-item label="主键" prop="id">
-					<el-input v-model="editForm.id" placeholder="主键"></el-input>
-				</el-form-item> 
-				<el-form-item> 
-					<el-col :span="24" :offset="8"> 
-						<el-button @click.native="handleCancel">取消</el-button>  
-						<el-button v-loading="load.edit" type="primary" @click.native="editSubmit" :disabled="load.edit==true">提交</el-button>  
-					</el-col> 
-				</el-form-item> 
-			</el-form>
-		</el-row>
-	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
-	import { editXmQuestionTag } from '@/api/xm/core/xmQuestionTag';
-	import { mapGetters } from 'vuex'
-	
-	export default { 
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ])
-		},
-		props:['xmQuestionTag','visible'],
-		watch: {
-	      'xmQuestionTag':function( xmQuestionTag ) {
-	        this.editForm = xmQuestionTag;
-	      },
-	      'visible':function(visible) { 
-	      	if(visible==true){
-	      		//从新打开页面时某些数据需要重新加载，可以在这里添加
-	      	}
-	      } 
-	    },
-		data() {
-			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
-				load:{ list: false, edit: false, del: false, add: false },//查询中...
-				editFormRules: {
-					id: [
-						//{ required: true, message: '主键不能为空', trigger: 'blur' }
-					]
-				},
-				//编辑界面数据  XmQuestionTag 缺陷标签关联表
-				editForm: {
-					questionId:'',tagId:'',tagName:'',ctime:'',id:''
-				}
-				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
-				
-				/**end 在上面加自定义属性**/
-			}//end return
-		},//end data
-		methods: {
-			// 取消按钮点击 父组件监听@cancel="editFormVisible=false" 监听
-			handleCancel:function(){
-				this.$refs['editForm'].resetFields();
-				this.$emit('cancel');
-			},
-			//编辑提交XmQuestionTag 缺陷标签关联表父组件监听@submit="afterEditSubmit"
-			editSubmit: function () {
-				this.$refs.editForm.validate((valid) => {
-					if (valid) {
-						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
-							this.load.edit=true
-							let params = Object.assign({}, this.editForm); 
-							editXmQuestionTag(params).then((res) => {
-								this.load.edit=false
-								var tips=res.data.tips;
-								if(tips.isOk){
-									this.$refs['editForm'].resetFields();
-									this.$emit('submit');//  @submit="afterEditSubmit"
-								}
-								this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
-							}).catch( err =>this.load.edit=false);
-						});
-					}
-				});
-			}
-			/**begin 在下面加自定义方法,记得补上面的一个逗号**/
-				
-			/**end 在上面加自定义方法**/
-		},//end method
-		components: {  
-		    //在下面添加其它组件 'xm-question-tag-edit':XmQuestionTagEdit
-		},
-		mounted() {
-			this.editForm=Object.assign(this.editForm, this.xmQuestionTag);  
-		}
-	}
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmQuestionTag/XmQuestionTagMng.vue b/src/views/xm/core/xmQuestionTag/XmQuestionTagMng.vue
deleted file mode 100644
index 35807bf8..00000000
--- a/src/views/xm/core/xmQuestionTag/XmQuestionTagMng.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<template>
-	<section class="page-container  padding border">
-		<el-row>
-			<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="searchXmQuestionTags">查询</el-button>
-			<el-button type="primary" @click="showAdd">+缺陷标签关联表</el-button>
-			<el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> 
-		</el-row>
-		<el-row class="page-main "> 
-			<!--列表 XmQuestionTag 缺陷标签关联表-->
-			<el-table :data="xmQuestionTags" @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="questionId" label="缺陷编号" min-width="80" ></el-table-column>
-				<el-table-column prop="tagId" label="标签编号" min-width="80" ></el-table-column>
-				<el-table-column prop="tagName" label="标签名称" min-width="80" ></el-table-column>
-				<el-table-column prop="ctime" label="添加时间" min-width="80" ></el-table-column>
-				<el-table-column prop="id" label="主键" min-width="80" ></el-table-column>
-				<el-table-column label="操作" width="160" fixed="right"  >
-					<template slot-scope="scope">
-						<el-button  @click="showEdit( scope.row,scope.$index)">改</el-button>
-						<el-button type="danger" @click="handleDel(scope.row,scope.$index)">删</el-button>
-					</template>
-				</el-table-column>
-			</el-table>
-			<el-pagination  layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination> 
-		
-			<!--编辑 XmQuestionTag 缺陷标签关联表界面-->
-			<el-drawer title="编辑缺陷标签关联表" :visible.sync="editFormVisible"  size="50%"  append-to-body   :close-on-click-modal="false">
-				  <xm-question-tag-edit :xm-question-tag="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-question-tag-edit>
-			</el-drawer>
-	
-			<!--新增 XmQuestionTag 缺陷标签关联表界面-->
-			<el-drawer title="新增缺陷标签关联表" :visible.sync="addFormVisible"  size="50%"  append-to-body  :close-on-click-modal="false">
-				<xm-question-tag-add :xm-question-tag="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-question-tag-add>
-			</el-drawer> 
-		</el-row>
-	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
-	import { listXmQuestionTag, delXmQuestionTag, batchDelXmQuestionTag } from '@/api/xm/core/xmQuestionTag';
-	import  XmQuestionTagAdd from './XmQuestionTagAdd';//新增界面
-	import  XmQuestionTagEdit from './XmQuestionTagEdit';//修改界面
-	import { mapGetters } from 'vuex'
-	
-	export default { 
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ])
-		},
-		data() {
-			return {
-				filters: {
-					key: ''
-				},
-				xmQuestionTags: [],//查询结果
-				pageInfo:{//分页数据
-					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
-					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
-					pageNum:1,//当前页码、从1开始计算
-					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
-					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
-				},
-				load:{ list: false, edit: false, del: false, add: false },//查询中...
-				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
-				
-				addFormVisible: false,//新增xmQuestionTag界面是否显示
-				//新增xmQuestionTag界面初始化数据
-				addForm: {
-					questionId:'',tagId:'',tagName:'',ctime:'',id:''
-				},
-				
-				editFormVisible: false,//编辑界面是否显示
-				//编辑xmQuestionTag界面初始化数据
-				editForm: {
-					questionId:'',tagId:'',tagName:'',ctime:'',id:''
-				}
-				/**begin 自定义属性请在下面加 请加备注**/
-					
-				/**end 自定义属性请在上面加 请加备注**/
-			}
-		},//end data
-		methods: { 
-			handleSizeChange(pageSize) { 
-				this.pageInfo.pageSize=pageSize; 
-				this.getXmQuestionTags();
-			},
-			handleCurrentChange(pageNum) {
-				this.pageInfo.pageNum = pageNum;
-				this.getXmQuestionTags();
-			},
-			// 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名
-			sortChange( obj ){
-				var dir='asc';
-				if(obj.order=='ascending'){
-					dir='asc'
-				}else{
-					dir='desc';
-				}
-				if(obj.prop=='xxx'){
-					this.pageInfo.orderFields=['xxx'];
-					this.pageInfo.orderDirs=[dir];
-				}
-				this.getXmQuestionTags();
-			},
-			searchXmQuestionTags(){
-				 this.pageInfo.count=true; 
-				 this.getXmQuestionTags();
-			},
-			//获取列表 XmQuestionTag 缺陷标签关联表
-			getXmQuestionTags() {
-				let params = {
-					pageSize: this.pageInfo.pageSize,
-					pageNum: this.pageInfo.pageNum,
-					total: this.pageInfo.total,
-					count:this.pageInfo.count
-				};
-				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
-					let orderBys=[];
-					for(var i=0;i<this.pageInfo.orderFields.length;i++){ 
-						orderBys.push(this.pageInfo.orderFields[i]+" "+this.pageInfo.orderDirs[i])
-					}  
-					params.orderBy= orderBys.join(",")
-				}
-				if(this.filters.key!==""){
-					//params.xxx=this.filters.key
-				}else{
-					//params.xxx=xxxxx
-				}
-				this.load.list = true;
-				listXmQuestionTag(params).then((res) => {
-					var tips=res.data.tips;
-					if(tips.isOk){ 
-						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
-						this.xmQuestionTags = res.data.data;
-					}else{
-						this.$notify({showClose: true, message: tips.msg, type: 'error' });
-					} 
-					this.load.list = false;
-				}).catch( err => this.load.list = false );
-			},
-
-			//显示编辑界面 XmQuestionTag 缺陷标签关联表
-			showEdit: function ( row,index ) {
-				this.editFormVisible = true;
-				this.editForm = Object.assign({}, row);
-			},
-			//显示新增界面 XmQuestionTag 缺陷标签关联表
-			showAdd: function () {
-				this.addFormVisible = true;
-				//this.addForm=Object.assign({}, this.editForm);
-			},
-			afterAddSubmit(){
-				this.addFormVisible=false;
-				this.pageInfo.count=true;
-				this.getXmQuestionTags();
-			},
-			afterEditSubmit(){
-				this.editFormVisible=false;
-			},
-			//选择行xmQuestionTag
-			selsChange: function (sels) {
-				this.sels = sels;
-			}, 
-			//删除xmQuestionTag
-			handleDel: function (row,index) { 
-				this.$confirm('确认删除该记录吗?', '提示', {
-					type: 'warning'
-				}).then(() => { 
-					this.load.del=true;
-					let params = { id: row.id };
-					delXmQuestionTag(params).then((res) => {
-						this.load.del=false;
-						var tips=res.data.tips;
-						if(tips.isOk){ 
-							this.pageInfo.count=true;
-							this.getXmQuestionTags();
-						}
-						this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
-					}).catch( err  => this.load.del=false );
-				});
-			},
-			//批量删除xmQuestionTag
-			batchDel: function () {
-				
-				this.$confirm('确认删除选中记录吗？', '提示', {
-					type: 'warning'
-				}).then(() => { 
-					this.load.del=true;
-					batchDelXmQuestionTag(this.sels).then((res) => {
-						this.load.del=false;
-						var tips=res.data.tips;
-						if( tips.isOk ){ 
-							this.pageInfo.count=true;
-							this.getXmQuestionTags(); 
-						}
-						this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'});
-					}).catch( err  => this.load.del=false );
-				});
-			},
-			rowClick: function(row, event, column){
-				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
-			}
-			/**begin 自定义函数请在下面加**/
-			
-				
-			/**end 自定义函数请在上面加**/
-			
-		},//end methods
-		components: { 
-		    'xm-question-tag-add':XmQuestionTagAdd,
-		    'xm-question-tag-edit':XmQuestionTagEdit,
-		    
-		    //在下面添加其它组件
-		},
-		mounted() { 
-			this.$nextTick(() => {
-				this.getXmQuestionTags();
-        	}); 
-		}
-	}
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmRecord/XmRecord.vue b/src/views/xm/core/xmRecord/XmRecord.vue
index 4772118b..63d2c646 100644
--- a/src/views/xm/core/xmRecord/XmRecord.vue
+++ b/src/views/xm/core/xmRecord/XmRecord.vue
@@ -259,14 +259,8 @@
 				this.filters.objType=this.objType
 			}
 			
-			this.$nextTick(() => {
-				
-				
-				
-				if(this.projectId){
-					subHeight=100/1000 * window.innerHeight;
-				}
-				this.tableHeight =  util.calcTableMaxHeight(".el-table"); 
+			this.$nextTick(() => { 
+				this.tableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 				this.getXmRecords();
         	}); 
 		}
diff --git a/src/views/xm/core/xmTask/XmTaskAgileKanban.vue b/src/views/xm/core/xmTask/XmTaskAgileKanban.vue
index 5282697f..8c88efce 100644
--- a/src/views/xm/core/xmTask/XmTaskAgileKanban.vue
+++ b/src/views/xm/core/xmTask/XmTaskAgileKanban.vue
@@ -1,6 +1,7 @@
 <template>
   <section class="menu-box">
 		<el-table 
+			ref="table"
 			:data="menus"
 			header-cell-class-name="head-row"
 			border
@@ -255,6 +256,8 @@ export default {
 			return respons
 		}
   },
+  mounted(){ 	
+  }
 };
 </script>
 <style lang='scss' scoped>
diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue
index 104296ac..05727632 100644
--- a/src/views/xm/core/xmTask/XmTaskList.vue
+++ b/src/views/xm/core/xmTask/XmTaskList.vue
@@ -469,7 +469,7 @@
 		mounted() {
 			this.filters.selProject=this.selProject
 			this.$nextTick(()=>{  
-				this.tableHeight = util.calcTableMaxHeight(".el-table"); 
+				this.tableHeight = util.calcTableMaxHeight(this.$refs.taskTable.$el); 
 				this.getXmTasks(); 
 			});
 				listOption([{categoryId:'all',itemCode:'planType'},{categoryId:'all',itemCode:'taskType'},{categoryId:'all',itemCode:'urgencyLevel'},{categoryId:'all',itemCode:'priority'}]).then(res=>{
diff --git a/src/views/xm/core/xmTask/XmTaskListForMenu.vue b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
index ad81f791..e8431491 100644
--- a/src/views/xm/core/xmTask/XmTaskListForMenu.vue
+++ b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
@@ -402,7 +402,7 @@
 		},
 		mounted() {
 			this.$nextTick(()=>{  
-				this.tableHeight =  util.calcTableMaxHeight(".el-table"); 
+				this.tableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 				this.getXmTasks(); 
 			});
 				listOption([{categoryId:'all',itemCode:'planType'},{categoryId:'all',itemCode:'taskType'},{categoryId:'all',itemCode:'urgencyLevel'},{categoryId:'all',itemCode:'priority'}]).then(res=>{
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index bafdf9ce..82c50d82 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -2441,7 +2441,7 @@ export default {
     }
     this.$nextTick(() => {
       this.getXmTasks(); 
-      this.tableHeight = util.calcTableMaxHeight(".task-table");  
+      this.tableHeight = util.calcTableMaxHeight(this.$refs.table.$el);  
       listOption([
         { categoryId: "all", itemCode: "planType" },
         { categoryId: "all", itemCode: "taskType" },
diff --git a/src/views/xm/core/xmTask/XmTaskMngBatch.vue b/src/views/xm/core/xmTask/XmTaskMngBatch.vue
index a27b306e..9769f029 100644
--- a/src/views/xm/core/xmTask/XmTaskMngBatch.vue
+++ b/src/views/xm/core/xmTask/XmTaskMngBatch.vue
@@ -1667,7 +1667,7 @@ export default {
       this.getXmTasks();
     }
     this.$nextTick(() => { 
-      this.tableHeight = util.calcTableMaxHeight(".el-table"); 
+      this.tableHeight = util.calcTableMaxHeight(this.$refs.table.$el); 
       listOption([
         { categoryId: "all", itemCode: "planType" },
         { categoryId: "all", itemCode: "taskType" },
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
index 0311cbd3..bcc726f1 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
@@ -816,10 +816,8 @@
 		    //在下面添加其它组件
 		},
 		mounted() {
-			this.$nextTick(() => {
-				
-				 
-				this.tableHeight =  util.calcTableMaxHeight(".el-table");
+			this.$nextTick(() => { 
+				this.tableHeight =  util.calcTableMaxHeight(this.$refs.table.$el);
 				this.getXmTaskExecusers();
 				});
 
diff --git a/src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue b/src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue
index 2ee867c3..470adee2 100644
--- a/src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue
+++ b/src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue
@@ -8,7 +8,7 @@
 		</el-row>
 		<el-row class="page-main "> 
 			<!--列表 XmTaskSkill xm_task_skill-->
-			<el-table :data="xmTaskSkills" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="tableHeight" :data="xmTaskSkills" @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>
@@ -99,6 +99,7 @@
 				/**begin 自定义属性请在下面加 请加备注**/
 				skillVisible: false,
 				skillIds: [],
+				tableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -273,6 +274,7 @@
 		mounted() { 
 			this.$nextTick(() => {
 				this.getXmTaskSkills();
+				this.tableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
         	}); 
 		}
 	}
diff --git a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue
index 775554a8..b9b728cd 100644
--- a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue
+++ b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue
@@ -13,7 +13,7 @@
 				</el-row>
 				<el-row class="page-main">  
 						<!--列表 XmTaskTemplate xm_task_template select-confirm-->
-						<el-table :height="maxTableHeight" :data="xmTaskTemplatesTreeData" 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" :height="maxTableHeight" :data="xmTaskTemplatesTreeData" row-key="id" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @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="name" label="任务名称" min-width="150" >						
 								<template slot-scope="scope">
@@ -281,7 +281,7 @@
 			this.$nextTick(() => { 
                 
                 
-                this.maxTableHeight = util.calcTableMaxHeight('.el-table');
+                this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
 				//this.getXmTaskTemplates();
         	}); 
 		}
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
index e22c9eb3..e9fdfee5 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
@@ -68,7 +68,7 @@
 		</el-row>
 		<el-row class="page-main "> 
 			<!--列表 XmTestCase 测试用例-->
-			<el-table ref="table" :height="tableHeight" :data="xmTestCases" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="maxTableHeight" :data="xmTestCases" @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="caseName" label="标题" min-width="100" show-overflow-tooltip>
@@ -79,7 +79,7 @@
  				<el-table-column prop="caseRemark" label="备注" min-width="80" show-overflow-tooltip></el-table-column> 
  				<el-table-column  prop="menuName" label="需求名" min-width="80" show-overflow-tooltip> 
 					<template slot="header">
-						需求<el-button @click="showMenu"  icon="el-icon-search" ></el-button>
+						需求<el-button type="text" @click="showMenu"  icon="el-icon-search" ></el-button>
  					</template>
 				 </el-table-column>
 				<el-table-column v-if="!multiSelect" prop="ctime" label="创建时间" min-width="80" show-overflow-tooltip></el-table-column>
@@ -186,7 +186,7 @@
 				},
 				/**begin 自定义属性请在下面加 请加备注**/ 
 				menuVisible:false,
-				tableHeight:300,
+				maxTableHeight:300,
 				
 				selectProjectVisible:false,    
 				selectUserForFiltersVisible:false,   
@@ -454,13 +454,8 @@
 		mounted() { 
 			this.$nextTick(() => {
 				this.filters.luser=this.userInfo; 
-				this.getXmTestCases();
-				
-				var subHeight=70;  
-				if(this.selProject){
-					subHeight=100/1000 * window.innerHeight;
-				}
-				this.tableHeight =  util.calcTableMaxHeight(".el-table"); 
+				this.getXmTestCases(); 
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
         	}); 
         	/** 举例，
     		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
index de5a5e0d..0433b5c7 100644
--- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
+++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
@@ -78,12 +78,12 @@
 		</el-row>
 		<el-row class="page-main "> 
 			<!--列表 XmTestCaseExec xm_test_case_exec-->
-			<el-table ref="table"  :height="tableHeight" v-if="!gstcVisible" :data="xmTestCaseExecs" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table"  :height="maxTableHeight" v-if="!gstcVisible" :data="xmTestCaseExecs" @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="projectName" label="项目名称" min-width="100" show-overflow-tooltip>
 					<template slot="header" v-if="!selProject">
-						项目<el-button @click="showProjectList"  icon="el-icon-search" ></el-button>
+						项目<el-button type="text" @click="showProjectList"  icon="el-icon-search" ></el-button>
  					</template>
 				</el-table-column> 
 				<el-table-column prop="caseName" label="用例(点击详情)" min-width="100" show-overflow-tooltip>
@@ -93,7 +93,7 @@
 				</el-table-column>
 				<el-table-column prop="menuName" label="需求" min-width="100" show-overflow-tooltip>
 					<template slot="header" slot-scope="scope">
-						需求<el-button @click="showMenu"  icon="el-icon-search" ></el-button>
+						需求<el-button type="text" @click="showMenu"  icon="el-icon-search" ></el-button>
  					</template>
 
 				</el-table-column>
@@ -308,7 +308,7 @@
 					endDate: 'endTime',
 
 				},
-				tableHeight:300,
+				maxTableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -763,12 +763,7 @@
 			this.filters.selProject=this.selProject; 
 			this.filters.execUser=this.userInfo;
 			this.$nextTick(() => {
-				
-				
-				if(this.selProject){
-					subHeight=100/1000 * window.innerHeight;
-				}
-				this.tableHeight =  util.calcTableMaxHeight(".el-table"); 
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 				this.getXmTestCaseExecs();
         	}); 
         	/** 举例，