diff --git a/src/views/xm/core/xmEnvList/XmEnvListMng.vue b/src/views/xm/core/xmEnvList/XmEnvListMng.vue
index 948d4096..77e1ed51 100644
--- a/src/views/xm/core/xmEnvList/XmEnvListMng.vue
+++ b/src/views/xm/core/xmEnvList/XmEnvListMng.vue
@@ -8,7 +8,7 @@
-
+
@@ -101,6 +101,7 @@
/**begin 自定义属性请在下面加 请加备注**/
envStateList:["不可用","已启用","已过期"],
+ tableHeight:300,
// {
// value: "0",
// label: "不可用",
@@ -256,6 +257,9 @@
},
mounted() {
this.$nextTick(() => {
+ var clientRect=this.$refs.table.$el.getBoundingClientRect();
+ var subHeight=100/1000 * window.innerHeight;
+ this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
this.getXmEnvLists();
});
}
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 3da060d9..a5db21da 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -1043,7 +1043,7 @@
},
mounted() {
this.$nextTick(() => {
- var subHeight=300/1000 * window.innerHeight
+ var subHeight=350/1000 * window.innerHeight
if(this.selProject){
subHeight=400/1000 * window.innerHeight
}
diff --git a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
index 31f5697d..1fc6d33d 100644
--- a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
+++ b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
@@ -514,7 +514,7 @@
mounted() {
this.$nextTick(() => {
var clientRect=this.$refs.table.$el.getBoundingClientRect();
- var subHeight=65/1000 * window.innerHeight;
+ var subHeight=100/1000 * window.innerHeight;
this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
this.getXmMenus();
});
diff --git a/src/views/xm/core/xmMenuPlan/XmMenuPlanMng.vue b/src/views/xm/core/xmMenuPlan/XmMenuPlanMng.vue
index 93ae319b..024070e6 100644
--- a/src/views/xm/core/xmMenuPlan/XmMenuPlanMng.vue
+++ b/src/views/xm/core/xmMenuPlan/XmMenuPlanMng.vue
@@ -8,7 +8,7 @@
-
+
@@ -124,9 +124,9 @@
//编辑xmMenuPlan界面初始化数据
editForm: {
projectId:'',id:'',projectName:'',menuId:'',planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',onlineStatus:'',onlineTime:'',planStatus:'',chargeUserid:'',chargeUsername:'',menuStatus:'',ctime:'',ltime:'',cuserid:'',cusername:'',calcTime:'',menuName:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',testCases:'',execCases:'',designCases:'',finishCases:'',iterationCnt:'',taskCnt:'',finishTaskCnt:'',productId:'',productName:'',bugCnt:''
- }
+ },
/**begin 自定义属性请在下面加 请加备注**/
-
+ tableHeight:300,
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@@ -265,6 +265,9 @@
},
mounted() {
this.$nextTick(() => {
+ var clientRect=this.$refs.table.$el.getBoundingClientRect();
+ var subHeight=80/1000 * window.innerHeight;
+ this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
this.getXmMenuPlans();
});
/** 举例，
diff --git a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
index ef77da6c..0b6c7c99 100644
--- a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
+++ b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
@@ -9,7 +9,7 @@
返回
-
+
diff --git a/src/views/xm/core/xmProductState/XmProductStateMng.vue b/src/views/xm/core/xmProductState/XmProductStateMng.vue
index 0d4eb6cc..b160833d 100644
--- a/src/views/xm/core/xmProductState/XmProductStateMng.vue
+++ b/src/views/xm/core/xmProductState/XmProductStateMng.vue
@@ -6,7 +6,7 @@
-
+
@@ -82,9 +82,9 @@
//编辑xmProductState界面初始化数据
editForm: {
id:'',planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',ctime:'',ltime:'',cuserid:'',cusername:'',calcTime:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',productId:'',productName:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',iterationCnt:'',taskCnt:'',finishTaskCnt:''
- }
+ },
/**begin 自定义属性请在下面加 请加备注**/
-
+ tableHeight:300,
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@@ -224,6 +224,10 @@
},
mounted() {
this.$nextTick(() => {
+
+ var clientRect=this.$refs.table.$el.getBoundingClientRect();
+ var subHeight=80/1000 * window.innerHeight;
+ this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
this.getXmProductStates();
});
/** 举例，
diff --git a/src/views/xm/core/xmProject/XmProjectBudgetCost.vue b/src/views/xm/core/xmProject/XmProjectBudgetCost.vue
index 3b734f70..79dbbbb1 100644
--- a/src/views/xm/core/xmProject/XmProjectBudgetCost.vue
+++ b/src/views/xm/core/xmProject/XmProjectBudgetCost.vue
@@ -28,6 +28,7 @@
-->
{
+ //var clientRect=this.$refs.table.$el.getBoundingClientRect();
+ var subHeight=500/1000 * window.innerHeight;
+ this.tableHeight = window.innerHeight-subHeight;
});
this.selProjectBudget=Object.assign({},this.selProject);
}
diff --git a/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue b/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
index b9d84c33..2c8e22df 100644
--- a/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
+++ b/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
@@ -12,7 +12,7 @@
-
+
@@ -94,7 +94,7 @@
htId:'',draftId:'',cpId:'',cpName:'',linkName:'',linkPhone:'',cpAddress:'',cpOpenBank:'',cpBankAccount:'',htName:'',htSn:'',htGrossAmount:'',htKaiPiaoAmount:'',htReceivedAmount:'',htReceivableAmount:'',htPayedAmount:'',htPayableAmount:'',htFile:'',htEffectDate:'',htFzUserid:'',htFzUsername:'',htParentType:'',htType:'',htSignDate:'',htExpireDate:'',htStatus:'',htDemand:'',htParty:'',htPartyName:'',htImportantClause:'',branchId:'',createTime:'',createUserId:'',createUserName:''
},
/**begin 自定义属性请在下面加 请加备注**/
-
+ tableHeight:300,
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@@ -240,6 +240,10 @@
},
mounted() {
this.$nextTick(() => {
+
+ var clientRect=this.$refs.table.$el.getBoundingClientRect();
+ var subHeight=80/1000 * window.innerHeight;
+ this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
this.getXmProjectContracts();
});
}
diff --git a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
index ef7b09f6..4a9b4725 100644
--- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
+++ b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
@@ -9,7 +9,7 @@
-
+
@@ -135,6 +135,7 @@
name: this.selProject.name,
},
+ tableHeight:300,
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@@ -317,6 +318,10 @@
},
mounted() {
this.$nextTick(() => {
+
+ var clientRect=this.$refs.table.$el.getBoundingClientRect();
+ var subHeight=80/1000 * window.innerHeight;
+ this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
console.log(this.currProject);
this.getXmProjectEnvLists();
});
diff --git a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue
index 7f19705a..83a28a84 100644
--- a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue
+++ b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue
@@ -68,7 +68,7 @@
返回
-
+
@@ -246,6 +246,7 @@
imGroupVisible:false,
groupRoleDescVisible:false,
setTemplateVisible:false,
+ tableHeight:300,
/**end 自定义属性请在上面加 请加备注**/
}
}, //end data
@@ -552,6 +553,10 @@
},
mounted() {
this.$nextTick(() => {
+
+ var clientRect=this.$refs.table.$el.getBoundingClientRect();
+ var subHeight=80/1000 * window.innerHeight;
+ this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
if(this.selGroups){
this.selGroups.forEach(i=>{
if(i.groupUsers){
diff --git a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkMng.vue b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkMng.vue
index c4de2231..3df456e0 100644
--- a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkMng.vue
+++ b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkMng.vue
@@ -8,7 +8,7 @@
-
+
@@ -80,9 +80,10 @@
//编辑xmProjectGroupFormwork界面初始化数据
editForm: {
id:'',branchId:'',groupName:'',isPub:''
- }
+ },
/**begin 自定义属性请在下面加 请加备注**/
-
+
+ tableHeight:300,
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@@ -222,6 +223,10 @@
},
mounted() {
this.$nextTick(() => {
+
+ var clientRect=this.$refs.table.$el.getBoundingClientRect();
+ var subHeight=80/1000 * window.innerHeight;
+ this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
this.getXmProjectGroupFormworks();
});
}
diff --git a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue
index bad1bcb5..c71abe55 100644
--- a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue
+++ b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue
@@ -7,7 +7,7 @@
-
+
@@ -88,9 +88,10 @@
//编辑xmProjectGroupState界面初始化数据
editForm: {
id:'',planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',ctime:'',calcTime:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',testCases:'',execCases:'',designCases:'',finishCases:'',iterationCnt:'',taskCnt:'',finishTaskCnt:'',bizDate:'',bugCnt:'',groupId:'',projectId:'',projectName:'',groupName:''
- }
+ },
/**begin 自定义属性请在下面加 请加备注**/
-
+
+ tableHeight:300,
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@@ -241,6 +242,10 @@
},
mounted() {
this.$nextTick(() => {
+
+ var clientRect=this.$refs.table.$el.getBoundingClientRect();
+ var subHeight=80/1000 * window.innerHeight;
+ this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
this.getXmProjectGroupStates();
});
/** 举例，
diff --git a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
index aaac89ba..d5e8ab8f 100644
--- a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
+++ b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
@@ -8,7 +8,7 @@
-
+
@@ -80,9 +80,10 @@
//编辑xmProjectGroupUser界面初始化数据
editForm: {
id:'',groupId:'',userid:'',username:''
- }
+ },
/**begin 自定义属性请在下面加 请加备注**/
-
+
+ tableHeight:300,
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@@ -222,6 +223,10 @@
},
mounted() {
this.$nextTick(() => {
+
+ var clientRect=this.$refs.table.$el.getBoundingClientRect();
+ var subHeight=80/1000 * window.innerHeight;
+ this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
this.getXmProjectGroupUsers();
});
}
diff --git a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue
index 3b6839c2..0f2d9704 100644
--- a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue
+++ b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue
@@ -8,7 +8,7 @@
-
+
@@ -84,9 +84,10 @@
//编辑xmProjectGroupUserCandidate界面初始化数据
editForm: {
id:'',groupId:'',userid:'',username:'',isHead:'',createTime:'',candidateStatus:'',outTime:''
- }
+ },
/**begin 自定义属性请在下面加 请加备注**/
-
+
+ tableHeight:300,
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@@ -226,6 +227,10 @@
},
mounted() {
this.$nextTick(() => {
+
+ var clientRect=this.$refs.table.$el.getBoundingClientRect();
+ var subHeight=80/1000 * window.innerHeight;
+ this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
this.getXmProjectGroupUserCandidates();
});
}
diff --git a/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue b/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue
index f1bd9a58..fcdfcf10 100644
--- a/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue
+++ b/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue
@@ -9,7 +9,7 @@
-
+
@@ -102,9 +102,10 @@
//编辑xmProjectKpi界面初始化数据
editForm: {
projectId:'',branchId:'',kpiIndex:'',kpiName:'',maxValue:'',minValue:'',id:'',score:'',scoreDate:'',bizFlowState:'',bizProcInstId:'',kpiValue:'',remark:'',calcType:'',nextCalcDate:''
- }
+ },
/**begin 自定义属性请在下面加 请加备注**/
-
+
+ tableHeight:300,
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@@ -249,6 +250,10 @@
},
mounted() {
this.$nextTick(() => {
+
+ var clientRect=this.$refs.table.$el.getBoundingClientRect();
+ var subHeight=80/1000 * window.innerHeight;
+ this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
this.getXmProjectKpis();
});
}
diff --git a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue
index 5d7d5ee8..bc2348f7 100644
--- a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue
+++ b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue
@@ -1,21 +1,26 @@
-
- 查询
- +新增预算明细
- 批量修改
- 批量保存
- 返回
- 批量删除
- 项目总预算： {{selProject.planTotalCost}}
- 非人力总预算：{{selProject.planNouserAt}}
- 内部人力总预算：{{selProject.planInnerUserAt}}
- 外购人力总预算：{{selProject.planOutUserAt}}
+
+
+ 查询
+
+
+
+
+ 保存
+ 返回
+
+
+ 项目总预算： {{selProject.planTotalCost}}
+ 非人力总预算：{{selProject.planNouserAt}}
+ 内部人力总预算：{{selProject.planInnerUserAt}}
+ 外购人力总预算：{{selProject.planOutUserAt}}
+
-
+
@@ -146,6 +151,7 @@
batchEditVisible:false,
valueChangeRows:[],
+ tableHeight:300,
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@@ -338,6 +344,10 @@
},
mounted() {
this.$nextTick(() => {
+
+ var clientRect=this.$refs.table.$el.getBoundingClientRect();
+ var subHeight=100/1000 * window.innerHeight;
+ this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
this.getXmProjectMBudgetCostNousers();
});
diff --git a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue
index c46619b0..5cec2a64 100644
--- a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue
+++ b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue
@@ -1,22 +1,27 @@
-
- 查询
- +明细
- 批量修改
- 批量保存
- 返回
- 批量删除
- 项目总预算： {{selProject.planTotalCost}}
+
+
+ 查询
+
+
+
+
+ 保存
+ 返回
+
+
+ 项目总预算： {{selProject.planTotalCost}}
非人力总预算：{{selProject.planNouserAt}}
内部人力总预算：{{selProject.planInnerUserAt}}
外购人力总预算：{{selProject.planOutUserAt}}
+
-
-
+
+
@@ -150,6 +155,7 @@
/**begin 自定义属性请在下面加 请加备注**/
batchEditVisible:false,
valueChangeRows:[],
+ tableHeight:300,
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@@ -343,6 +349,10 @@
},
mounted() {
this.$nextTick(() => {
+ debugger
+ var clientRect=this.$refs.table.$el.getBoundingClientRect();
+ var subHeight=100/1000 * window.innerHeight;
+ this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
this.getXmProjectMBudgetCostUsers();
});
diff --git a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue
index e5046d40..6246ae1a 100644
--- a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue
+++ b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue
@@ -1,21 +1,25 @@
-
- 查询
- +新增费用
- 批量修改
- 批量保存
- 返回
- 批量删除
- 项目总成本： {{selProject.planTotalCost}}
- 非人力总成本：{{selProject.planNouserAt}}
- 内部人力总成本：{{selProject.planInnerUserAt}}
- 外购人力总成本：{{selProject.planOutUserAt}}
+
+
+ 查询
+
+
+
+ 保存
+ 返回
+
+
+ 项目总成本： {{selProject.planTotalCost}}
+ 非人力总成本：{{selProject.planNouserAt}}
+ 内部人力总成本：{{selProject.planInnerUserAt}}
+ 外购人力总成本：{{selProject.planOutUserAt}}
+
-
+
@@ -148,6 +152,7 @@
batchEditVisible:false,
valueChangeRows:[],
+ tableHeight:300,
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@@ -340,6 +345,10 @@
},
mounted() {
this.$nextTick(() => {
+
+ var clientRect=this.$refs.table.$el.getBoundingClientRect();
+ var subHeight=100/1000 * window.innerHeight;
+ this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
this.getXmProjectMCostNousers();
});
diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue
index 10aacd2a..7d740182 100644
--- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue
+++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue
@@ -6,7 +6,7 @@
-
+
@@ -127,6 +127,7 @@
editForm: {
subjectId:'',projectId:'',userid:'',createTime:'',sendCostTime:'',username:'',projectName:'',remark:'',id:'',taskId:'',taskName:'',actWorkload:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',projectPhaseId:'',actCostAmount:'',costType:'',bizMonth:'',bizDate:'',subjectName:'',projectPhaseName:''
},
+ tableHeight:300,
/**begin 自定义属性请在下面加 请加备注**/
/**end 自定义属性请在上面加 请加备注**/
}
@@ -238,6 +239,10 @@
},
mounted() {
this.$nextTick(() => {
+ debugger
+ var clientRect=this.$refs.table.$el.getBoundingClientRect();
+ var subHeight=160/1000 * window.innerHeight;
+ this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
this.getXmProjectMCostUsers();
});
diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue
index 5fe4ec5a..30846991 100644
--- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue
+++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue
@@ -1,21 +1,27 @@
-
- 查询
- +明细
- 批量修改
- 批量保存
- 返回
- 批量删除
+
+
+ 查询
+
+
+
+
+
+ icon="el-icon-finish">保存
+ 返回
+
+
项目总成本： {{selProject.planTotalCost}}
非人力总成本：{{selProject.planNouserAt}}
内部人力总成本：{{selProject.planInnerUserAt}}
外购人力总成本：{{selProject.planOutUserAt}}
+
-
+
@@ -150,6 +156,7 @@
/**begin 自定义属性请在下面加 请加备注**/
batchEditVisible:false,
valueChangeRows:[],
+ tableHeight:300,
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@@ -343,6 +350,9 @@
},
mounted() {
this.$nextTick(() => {
+ var clientRect=this.$refs.table.$el.getBoundingClientRect();
+ var subHeight=100/1000 * window.innerHeight;
+ this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
this.getXmProjectMCostUsers();
});
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
index d22f61dd..e4179073 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
@@ -24,7 +24,7 @@
-
+
@@ -1210,7 +1210,9 @@
mounted() {
this.$nextTick(() => {
- this.tableHeight = window.innerHeight - 250;
+ var clientRect=this.$refs.table.$el.getBoundingClientRect();
+ var subHeight=140/1000 * window.innerHeight;
+ this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
if(this.selProject){
this.getXmProjectPhases();
}
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
index 8ce1c941..a3904e55 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
@@ -1292,7 +1292,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
this.$nextTick(() => {
var clientRect=this.$refs.table.$el.getBoundingClientRect();
- var subHeight=100/1000 * window.innerHeight;
+ var subHeight=140/1000 * window.innerHeight;
this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
if(this.selProject){
this.getXmProjectPhases();
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index 7ee33c0d..62951620 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -680,7 +680,10 @@
}
this.$nextTick(() => {
var clientRect=this.$refs.table.$el.getBoundingClientRect();
- var subHeight=65/1000 * window.innerHeight;
+ var subHeight=50/1000 * window.innerHeight;
+ if(this.selProject){
+ subHeight=100/1000 * window.innerHeight;
+ }
this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
this.getXmQuestions();
});
diff --git a/src/views/xm/core/xmRecord/XmRecord.vue b/src/views/xm/core/xmRecord/XmRecord.vue
index 407a55b6..078f1ec5 100644
--- a/src/views/xm/core/xmRecord/XmRecord.vue
+++ b/src/views/xm/core/xmRecord/XmRecord.vue
@@ -257,6 +257,10 @@
this.$nextTick(() => {
var clientRect=this.$refs.table.$el.getBoundingClientRect();
var subHeight=50/1000 * window.innerHeight;
+
+ if(this.projectId){
+ subHeight=100/1000 * window.innerHeight;
+ }
this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
this.getXmRecords();
});
diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue
index 72cb0433..9e389959 100644
--- a/src/views/xm/core/xmTask/XmTaskList.vue
+++ b/src/views/xm/core/xmTask/XmTaskList.vue
@@ -439,7 +439,10 @@
this.filters.selProject=this.selProject
this.$nextTick(()=>{
var clientRect=this.$refs.taskTable.$el.getBoundingClientRect();
- var subHeight=85;
+ var subHeight=85/1000 * window.innerHeight;
+ if(this.selProject){
+ subHeight=100/1000 * window.innerHeight;
+ }
this.tableHeight = window.innerHeight -clientRect.y - this.$refs.taskTable.$el.offsetTop-subHeight;
this.getXmTasks();
});
diff --git a/src/views/xm/core/xmTask/XmTaskListForMenu.vue b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
index f72b1caa..e1be6499 100644
--- a/src/views/xm/core/xmTask/XmTaskListForMenu.vue
+++ b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
@@ -400,7 +400,7 @@
mounted() {
this.$nextTick(()=>{
var clientRect=this.$refs.table.$el.getBoundingClientRect();
- var subHeight=85/1000 * window.innerHeight;
+ var subHeight=140/1000 * window.innerHeight;
if(this.isTaskCenter){
subHeight=50/1000 * window.innerHeight;
}
diff --git a/src/views/xm/core/xmTask/XmTaskListForProduct.vue b/src/views/xm/core/xmTask/XmTaskListForProduct.vue
index e607d3c4..2df0b793 100644
--- a/src/views/xm/core/xmTask/XmTaskListForProduct.vue
+++ b/src/views/xm/core/xmTask/XmTaskListForProduct.vue
@@ -460,7 +460,7 @@
mounted() {
this.$nextTick(()=>{
var clientRect=this.$refs.taskTable.$el.getBoundingClientRect();
- var subHeight=85/1000 * window.innerHeight;
+ var subHeight=140/1000 * window.innerHeight;
if(this.isTaskCenter){
subHeight=50/1000 * window.innerHeight;
}
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 89927620..48dcb87c 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -1664,7 +1664,7 @@ XmProjectGroupSelect
this.$nextTick(()=>{
this.getXmTasks();
var clientRect=this.$refs.table.$el.getBoundingClientRect();
- var subHeight=150/1000 * window.innerHeight;
+ var subHeight=140/1000 * window.innerHeight;
if(this.isTaskCenter){
subHeight=50/1000 * window.innerHeight;
}
diff --git a/src/views/xm/core/xmTask/XmTaskMngBatch.vue b/src/views/xm/core/xmTask/XmTaskMngBatch.vue
index af795111..572c085d 100644
--- a/src/views/xm/core/xmTask/XmTaskMngBatch.vue
+++ b/src/views/xm/core/xmTask/XmTaskMngBatch.vue
@@ -1272,7 +1272,7 @@
}
this.$nextTick(()=>{
var clientRect=this.$refs.table.$el.getBoundingClientRect();
- var subHeight=85/1000 * window.innerHeight;
+ var subHeight=140/1000 * window.innerHeight;
if(this.isTaskCenter){
subHeight=50/1000 * window.innerHeight;
}
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
index 2c2641a7..42affd6a 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
@@ -783,7 +783,10 @@
mounted() {
this.$nextTick(() => {
var clientRect=this.$refs.table.$el.getBoundingClientRect();
- var subHeight=50;
+ var subHeight=65/1000 * window.innerHeight;
+ if(this.selProject){
+ subHeight=100/1000 * window.innerHeight;
+ }
this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
this.getXmTaskExecusers();
});
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
index 28ea30cf..5cf2c43f 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
@@ -299,7 +299,10 @@
this.$nextTick(() => {
this.getXmTestCases();
var clientRect=this.$refs.table.$el.getBoundingClientRect();
- var subHeight=65;
+ var subHeight=65;
+ if(this.selProject){
+ subHeight=100/1000 * window.innerHeight;
+ }
this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
});
/** 举例，
diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
index 5cacf1bf..742da48b 100644
--- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
+++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
@@ -633,7 +633,10 @@
this.filters.selProject=this.selProject;
this.$nextTick(() => {
var clientRect=this.$refs.table.$el.getBoundingClientRect();
- var subHeight=70/1000 * window.innerHeight;
+ var subHeight=65/1000 * window.innerHeight;
+ if(this.selProject){
+ subHeight=100/1000 * window.innerHeight;
+ }
this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
this.getXmTestCaseExecs();
});