diff --git a/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue b/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue index 2c28bb58..2a1b108c 100644 --- a/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue +++ b/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue @@ -298,22 +298,22 @@ - + - + - + - + - + - + @@ -373,6 +373,14 @@ return 0; } }, + xmProductCpd(){ + if(this.xmProduct && this.xmProduct.id){ + return this.xmProduct + } + if(this.xmIteration && this.xmIteration.id && this.xmIteration.productId){ + return {id:this.xmIteration.productId,productName:this.xmIteration.productName} + } + } }, props:['visible'], watch:{ diff --git a/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue b/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue index f2ae7bea..a8da2788 100644 --- a/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue +++ b/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue @@ -274,6 +274,10 @@ + + + + @@ -318,6 +322,7 @@ import XmProductEdit from "./XmProductEdit.vue"; import XmProductAdd from "./XmProductEdit"; //新增界面 import XmGroupMng from '../xmGroup/XmGroupMng.vue' +import XmReport from "@/views/xm/rpt/reportIndex"; export default { computed: { ...mapGetters(["userInfo", "roles","projectInfo","xmIteration"]), @@ -550,6 +555,7 @@ export default { XmProductProjectLinkMng, XmProductEdit, XmGroupMng, + XmReport }, mounted() { this.$nextTick(() => { diff --git a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue index e6db17ea..334e80a9 100644 --- a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue +++ b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue @@ -253,6 +253,10 @@ + + + + @@ -298,6 +302,7 @@ import XmProductProjectLinkMng from "../xmProductProjectLink/XmProductProjectLin import XmPlan from "../xmTask/XmPlan.vue"; import xmGroupMng from "../xmGroup/XmGroupMng"; +import XmReport from "@/views/xm/rpt/reportIndex"; import { initDicts, getDefOptions, @@ -455,6 +460,7 @@ export default { XmProjectOverview, XmProductProjectLinkMng, XmPlan, + XmReport, xmGroupMng, }, mounted() {