diff --git a/src/common/js/util.js b/src/common/js/util.js
index cdff579f..1182b683 100644
--- a/src/common/js/util.js
+++ b/src/common/js/util.js
@@ -14,6 +14,9 @@ function padding(s, len) {
export default {
getPositionTop(node) {
+ if(!node){
+ return 150;
+ }
var top = node.offsetTop;
var parent = node.offsetParent;
while(parent != null) {
diff --git a/src/views/xm/core/xmProduct/XmProductTplMng.vue b/src/views/xm/core/xmProduct/XmProductTplMng.vue
index 01896e8f..74dae8f6 100644
--- a/src/views/xm/core/xmProduct/XmProductTplMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductTplMng.vue
@@ -5,21 +5,25 @@
-
-
- 我的模板
-
-
-
-
+
+
+ 我的模板
+
+
+
+
+
+
+
+
-
+
-
+
-
+
{{scope.row.productName}}
@@ -134,8 +138,7 @@
iterationVisible:false,
iterationSelectVisible:false,
productStateVisible:false,
- selectFiltersPmUserVisible:false,
- tableHeight:300,
+ selectFiltersPmUserVisible:false,
dateRanger: [
],
pickerOptions: util.pickerOptions('datarange'),
@@ -145,6 +148,7 @@
id:'',productName:'',code:'',isTpl:'',copyMenu:'1'
},
copyToVisible:false,
+ maxTableHeight:300,
/**begin 自定义属性请在下面加 请加备注**/
/**end 自定义属性请在上面加 请加备注**/
@@ -422,6 +426,10 @@
},
mounted() {
this.$nextTick(() => {
+
+ var table=document.querySelector('.project-table .table');
+ var top=util.getPositionTop(table)
+ this.maxTableHeight = window.innerHeight - top -100;
this.getXmProducts();
});
}
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index 5707a58c..73f8bb75 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -3,7 +3,7 @@
-
+
@@ -76,9 +76,9 @@
-
+
-
+
{{p.name}}
@@ -115,7 +115,8 @@
-
+
+
@@ -185,11 +186,11 @@
-
+
-
+
@@ -331,7 +332,7 @@
finishFlag: false,
xmRecordVisible: false,
productSelectVisible:false,
- tableHeight:300,
+ maxTableHeight:300,
dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'),
xmProjectCopy:{
@@ -742,10 +743,10 @@
this.filters.productId=this.$route.params.productId;
this.filters.productName=this.$route.params.productName;
}
- this.$nextTick(() => {
- var table=document.querySelector('.el-table');
+ this.$nextTick(() => {
+ var table=document.querySelector('.project-table .table');
var top=util.getPositionTop(table)
- this.maxTableHeight = window.innerHeight - top -60;
+ this.maxTableHeight = window.innerHeight - top -100;
this.showInfo = false;
this.getXmProjects();
});
diff --git a/src/views/xm/core/xmProject/XmProjectTplMng.vue b/src/views/xm/core/xmProject/XmProjectTplMng.vue
index f64f9a6c..106fa331 100644
--- a/src/views/xm/core/xmProject/XmProjectTplMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectTplMng.vue
@@ -1,23 +1,25 @@
-
+
我的模板
-
-
- 我的模板
-
-
-
-
+
+
+ 我的模板
+
+
+
+
+
+
-
+
-
+
{{scope.row.name}}
@@ -91,7 +93,7 @@
export default {
- props:['dataScope'],
+ props:['dataScope','showType'],
computed: {
...mapGetters([
'userInfo','roles'
@@ -103,12 +105,7 @@
},
},
- watch: {
- "showType": function(val){
- console.log("shotType_change");
- //this.xmProjects = [];
- //this.getXmProjects();
- },
+ watch: {
"finishFlag":function(val){
this.searchXmProjects();
}
@@ -149,8 +146,7 @@
id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planInnerUserAt:'',planOutUserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planInnerUserPrice:'',budgetOutUserPrice:'',planOutUserCnt:'',planInnerUserCnt:'',planWorkingHours:'',budgetCtrl:'0',
},
/**begin 自定义属性请在下面加 请加备注**/
- menukey: "all",
- showType: true,
+ menukey: "all",
showInfo: false,
selectProject: null,
finishFlag: false,
@@ -163,6 +159,7 @@
id:'',name:'',code:'',isTpl:'',copyPhase:'1',copyTask:'1',copyGrup:'0'
},
copyToVisible:false,
+ maxTableHeight:300,
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@@ -554,6 +551,10 @@
this.filters.productName=this.$route.params.productName;
}
this.$nextTick(() => {
+
+ var table=document.querySelector('.el-table');
+ var top=util.getPositionTop(table)
+ this.maxTableHeight = window.innerHeight - top -100;
this.showInfo = false;
this.getXmProjects();
});
diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue
index 5b814a1e..886bca13 100644
--- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue
+++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue
@@ -1,5 +1,5 @@
-
+
@@ -10,9 +10,9 @@
+项目模板
批量删除
-
+
-
+
@@ -108,6 +108,7 @@
id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planInnerUserAt:'',planOutUserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planInnerUserPrice:'',planOutUserPrice:'',planOutUserCnt:'',planInnerUserCnt:'',planWorkingHours:'',taxRate:'',planInnerUserWorkload:'',planOutUserWorkload:'',productId:'',productName:'',templateId:'',tcuserid:'',tcusername:'',tremark:'',tctime:'',tcbranchId:'',shareScope:''
},
projectTemplateInfoVisible:false,
+ maxTableHeight:300,
/**begin 自定义属性请在下面加 请加备注**/
/**end 自定义属性请在上面加 请加备注**/
@@ -257,6 +258,10 @@
},
mounted() {
this.$nextTick(() => {
+
+ var table=document.querySelector('.el-table');
+ var top=util.getPositionTop(table)
+ this.maxTableHeight = window.innerHeight - top -60;
this.getXmProjectTemplates();
listOption([{categoryId:'all',itemCode:'projectType'}] ).then(res=>{
if(res.data.tips.isOk){