diff --git a/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue b/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue index b74e1992..44545a93 100644 --- a/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue +++ b/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue @@ -143,7 +143,7 @@ tabClick(tab){ if(this.xmIteration==null || !this.xmIteration.id){ this.iterationVisible=true; - this.$notify({showClose: true, message:"请先选中左边迭代", type: 'warning', position: 'top-left' }); + this.$notify({showClose: true, message:"请先选中左边迭代", type: 'warning' }); } return false; this.showPanel=tab.name @@ -175,7 +175,7 @@ if(this.xmIteration==null || !this.xmIteration.id){ this.iterationVisible=true; - this.$notify({showClose: true, message:"请先选中左边迭代", type: 'warning', position: 'top-left' }); + this.$notify({showClose: true, message:"请先选中左边迭代", type: 'warning' }); } this.$nextTick(() => { diff --git a/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue b/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue index f46c08c4..d5d3e419 100644 --- a/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue +++ b/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue @@ -145,7 +145,7 @@ import XmProductOverview from "./XmProductOverview"; tabClick(tab){ if(this.xmProduct==null || !this.xmProduct.id){ this.productVisible=true; - this.$notify({showClose: true, message:"请先选中左边产品", type: 'warning', position: 'top-left'}); + this.$notify({showClose: true, message:"请先选中左边产品", type: 'warning'}); } this.showPanel=tab.name } @@ -168,7 +168,7 @@ XmProductProjectForLink, if(this.xmProduct==null || !this.xmProduct.id){ this.productVisible=true; - this.$notify({showClose: true, message:"请先选中左边产品", type: 'warning', position: 'top-left'}); + this.$notify({showClose: true, message:"请先选中左边产品", type: 'warning'}); } this.$nextTick(() => { diff --git a/src/views/xm/core/xmProject/XmProjectComplex.vue b/src/views/xm/core/xmProject/XmProjectComplex.vue index 95aa21da..0460d0e9 100644 --- a/src/views/xm/core/xmProject/XmProjectComplex.vue +++ b/src/views/xm/core/xmProject/XmProjectComplex.vue @@ -147,7 +147,7 @@ import XmProjectOverview from "./XmProjectOverview"; tabClick(tab){ if(this.selProject==null || !this.selProject.id){ this.projectVisible=true; - this.$notify({showClose: true, message:"请先选中左边项目", type: 'warning', position: 'top-left'}); + this.$notify({showClose: true, message:"请先选中左边项目", type: 'warning'}); } this.showPanel=tab.name } @@ -167,6 +167,11 @@ import XmProjectOverview from "./XmProjectOverview"; XmProjectOverview, }, mounted() { + + if(this.selProject==null || !this.selProject.id){ + this.projectVisible=true; + this.$notify({showClose: true, message:"请先选中左边项目", type: 'warning'}); + } this.$nextTick(() => { }); diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue index 9b304bea..4842ca40 100644 --- a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue +++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue @@ -142,8 +142,8 @@ - - + + @@ -152,7 +152,7 @@ - + diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue index 123c7a9d..6967020e 100644 --- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue +++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue @@ -1282,7 +1282,14 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; }) }, selectTotalProjectAndPhaseBudgetCost(){ - selectTotalProjectAndPhaseBudgetCost({projectId:this.selProject.id}).then(res=>{ + var params={ } + if(this.selProject && this.selProject.id){ + params.projectId=this.selProject.id + } + if(this.xmProduct && this.xmProduct.id){ + params.productId=this.xmProduct.id + } + selectTotalProjectAndPhaseBudgetCost(params ).then(res=>{ var tips = res.data.tips; if(tips.isOk){ this.totalProjectAndPhaseBudgetCost=res.data.data;