diff --git a/src/api/xm/core/xmIterationLink.js b/src/api/xm/core/xmIterationLink.js index 698faab1..43f115de 100644 --- a/src/api/xm/core/xmIterationLink.js +++ b/src/api/xm/core/xmIterationLink.js @@ -27,4 +27,9 @@ export const batchDelXmIterationLink = params => { return axios.post(`${base}/xm export const editXmIterationLink = params => { return axios.post(`${base}/xm/core/xmIterationLink/edit`, params); }; //新增一条迭代表与产品表的关联关系,一般由迭代管理员将迭代挂接到产品表 -export const addXmIterationLink = params => { return axios.post(`${base}/xm/core/xmIterationLink/add`, params); }; \ No newline at end of file +export const addXmIterationLink = params => { return axios.post(`${base}/xm/core/xmIterationLink/add`, params); }; + + +//普通查询 条件之间and关系 +export const listXmIterationLinkWithProductInfo = params => { return axios.get(`${base}/xm/core/xmIterationLink/listWithProductInfo`, { params: params }); }; +export const listXmIterationLinkWithProjectInfo = params => { return axios.get(`${base}/xm/core/xmIterationLink/listWithProjectInfo`, { params: params }); }; diff --git a/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue b/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue index 51257faa..007d15e7 100644 --- a/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue +++ b/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue @@ -19,7 +19,8 @@ - + + @@ -30,12 +31,13 @@ import util from "@/common/js/util"; // 全局公共库 import { mapGetters } from "vuex"; import XmIterationOverview from './XmIterationOverview.vue'; import XmIterationEdit from './XmIterationEdit.vue'; - import XmIterationLinkMng from '../xmIterationLink/XmIterationLinkMng.vue'; + import XmIterationLinkForProduct from '../xmIterationLink/XmIterationLinkForProduct.vue'; + import XmIterationLinkForProject from '../xmIterationLink/XmIterationLinkForProject.vue'; import XmIterationMenuMng from '../xmIterationMenu/XmIterationMenuMng.vue'; export default { - components: {XmIterationOverview,XmIterationEdit, XmIterationLinkMng, XmIterationMenuMng }, + components: {XmIterationOverview,XmIterationEdit, XmIterationLinkForProduct,XmIterationLinkForProject, XmIterationMenuMng }, computed: { ...mapGetters(["userInfo"]), }, diff --git a/src/views/xm/core/xmIterationLink/XmIterationLinkMng.vue b/src/views/xm/core/xmIterationLink/XmIterationLinkForProduct.vue similarity index 95% rename from src/views/xm/core/xmIterationLink/XmIterationLinkMng.vue rename to src/views/xm/core/xmIterationLink/XmIterationLinkForProduct.vue index c2bdcc41..105eebbb 100644 --- a/src/views/xm/core/xmIterationLink/XmIterationLinkMng.vue +++ b/src/views/xm/core/xmIterationLink/XmIterationLinkForProduct.vue @@ -36,12 +36,12 @@ import util from '@/common/js/util';//全局公共库 import config from '@/common/config';//全局公共库 import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 - import { listXmIterationLink,addXmIterationLink, delXmIterationLink, batchDelXmIterationLink } from '@/api/xm/core/xmIterationLink'; + import { listXmIterationLinkWithProductInfo,addXmIterationLink, delXmIterationLink, batchDelXmIterationLink } from '@/api/xm/core/xmIterationLink'; import XmIterationLinkAdd from './XmIterationLinkAdd';//新增界面 import XmIterationLinkEdit from './XmIterationLinkEdit';//修改界面 import { mapGetters } from 'vuex' -import XmProductSelect from '../xmProduct/XmProductSelect.vue'; -import XmIterationSelect from '../xmIteration/XmIterationSelect.vue'; + import XmProductSelect from '../xmProduct/XmProductSelect.vue'; + import XmIterationSelect from '../xmIteration/XmIterationSelect.vue'; export default { props:['xmIteration','xmProduct'], @@ -152,7 +152,7 @@ import XmIterationSelect from '../xmIteration/XmIterationSelect.vue'; params.proId=this.xmProduct.id } this.load.list = true; - listXmIterationLink(params).then((res) => { + listXmIterationLinkWithProductInfo(params).then((res) => { var tips=res.data.tips; if(tips.isOk){ this.pageInfo.total = res.data.total; @@ -233,9 +233,10 @@ import XmIterationSelect from '../xmIteration/XmIterationSelect.vue'; }).then(() => { this.load.add=true; this.addForm.iterationId=this.xmIteration.id; - this.addForm.proId= product.id; + this.addForm.proId= product.id; + this.addForm.ltype="1" addXmIterationLink(this.addForm).then((res) => { - this.load.del=false; + this.load.add=false; var tips=res.data.tips; if( tips.isOk ){ this.pageInfo.count=true; @@ -249,11 +250,12 @@ import XmIterationSelect from '../xmIteration/XmIterationSelect.vue'; this.$confirm('确认建立与迭代【'+iteration.iterationName+'】的关联关系吗?', '提示', { type: 'warning' }).then(() => { - this.load.del=true; + this.load.add=true; this.addForm.iterationId=iteration.id; this.addForm.proId=this.xmProduct.id; + this.addForm.ltype="1" addXmIterationLink(this.addForm).then((res) => { - this.load.del=false; + this.load.add=false; var tips=res.data.tips; if( tips.isOk ){ this.pageInfo.count=true; diff --git a/src/views/xm/core/xmIterationLink/XmIterationLinkForProject.vue b/src/views/xm/core/xmIterationLink/XmIterationLinkForProject.vue new file mode 100644 index 00000000..0abd9c8a --- /dev/null +++ b/src/views/xm/core/xmIterationLink/XmIterationLinkForProject.vue @@ -0,0 +1,295 @@ + + + + + \ No newline at end of file diff --git a/src/views/xm/core/xmProduct/XmProductOverviewComplex.vue b/src/views/xm/core/xmProduct/XmProductOverviewComplex.vue index 0462064b..17ca3e22 100644 --- a/src/views/xm/core/xmProduct/XmProductOverviewComplex.vue +++ b/src/views/xm/core/xmProduct/XmProductOverviewComplex.vue @@ -12,46 +12,11 @@ 配置可见项目 - - - - - 需求评审 - - - 需求边界异动 - - - - - - - 迭代计划评审 - - - 迭代上线申请 - - - - - - - 计划评审 - - - 预算变更 - - + - + @@ -62,12 +27,12 @@ import util from "@/common/js/util"; // 全局公共库 import { mapGetters } from "vuex"; import XmProductOverview from './XmProductOverview.vue'; import XmProductEdit from './XmProductEdit.vue'; -import XmIterationLinkMng from '../xmIterationLink/XmIterationLinkMng.vue'; +import XmIterationLinkForProduct from '../xmIterationLink/XmIterationLinkForProduct.vue'; import XmProductProjectLinkMng from '../xmProductProjectLink/XmProductProjectLinkMng.vue'; export default { - components: { XmProductOverview, XmProductEdit, XmIterationLinkMng, XmProductProjectLinkMng }, + components: { XmProductOverview, XmProductEdit, XmIterationLinkForProduct, XmProductProjectLinkMng }, computed: { ...mapGetters(["userInfo"]), }, diff --git a/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue b/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue index 9d8e38e4..dfa2e171 100644 --- a/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue +++ b/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue @@ -8,85 +8,16 @@ 项目详情 - 配置可见产品 - - - - - 基础信息修改 - - - 立项申请 - - - 预算+- - - - 成本+- - - - 收款 - - - 结项申请 - - - 暂停申请 - - - 激活申请 - - - 转售后申请 - - - 项目经理变更申请 - - - 组长变更申请 - - - - - - 需求评审 - - - 需求边界异动 - - - - - - - 迭代计划评审 - - - 迭代上线申请 - - - - - - - 计划评审 - - - 预算变更 - - + 关联产品 + + + 关联迭代 + + @@ -98,10 +29,11 @@ import { listXmProjectState } from '@/api/xm/core/xmProjectState'; import XmProjectOverview from './XmProjectOverview.vue'; import XmProjectDetail from './XmProjectDetail.vue'; import XmProductProjectLinkMng from '../xmProductProjectLink/XmProductProjectLinkMng.vue'; +import XmIterationLinkForProject from '../xmIterationLink/XmIterationLinkForProject.vue'; export default { - components: { XmProjectOverview, XmProjectDetail, XmProductProjectLinkMng }, + components: { XmProjectOverview, XmProjectDetail, XmProductProjectLinkMng ,XmIterationLinkForProject}, computed: { ...mapGetters(["userInfo"]), },