diff --git a/src/api/xm/core/xmIterationLink.js b/src/api/xm/core/xmIterationLink.js index bfbd5166..cfed03fa 100644 --- a/src/api/xm/core/xmIterationLink.js +++ b/src/api/xm/core/xmIterationLink.js @@ -12,19 +12,19 @@ let base = config.getCoreBasePath(); **/ //普通查询 条件之间and关系 -export const listXmIterationProductLink = params => { return axios.get(`${base}/xm/core/xmIterationProductLink/list`, { params: params }); }; +export const listXmIterationLink = params => { return axios.get(`${base}/xm/core/xmIterationLink/list`, { params: params }); }; //模糊查询迭代表与产品表的关联关系，一般由迭代管理员将迭代挂接到产品表 条件之间or关系 -//export const listXmIterationProductLinkKey = params => { return axios.get(`${base}/xm/core/xmIterationProductLink/listKey`, { params: params }); }; +//export const listXmIterationLinkKey = params => { return axios.get(`${base}/xm/core/xmIterationLink/listKey`, { params: params }); }; //删除一条迭代表与产品表的关联关系，一般由迭代管理员将迭代挂接到产品表 params={iterationId:'迭代表主键 主键',productId:'产品表主键 主键'} -export const delXmIterationProductLink = params => { return axios.post(`${base}/xm/core/xmIterationProductLink/del`,params); }; +export const delXmIterationLink = params => { return axios.post(`${base}/xm/core/xmIterationLink/del`,params); }; //批量删除迭代表与产品表的关联关系，一般由迭代管理员将迭代挂接到产品表 params=[{iterationId:'迭代表主键 主键',productId:'产品表主键 主键'}] -export const batchDelXmIterationProductLink = params => { return axios.post(`${base}/xm/core/xmIterationProductLink/batchDel`, params); }; +export const batchDelXmIterationLink = params => { return axios.post(`${base}/xm/core/xmIterationLink/batchDel`, params); }; //修改一条迭代表与产品表的关联关系，一般由迭代管理员将迭代挂接到产品表记录 -export const editXmIterationProductLink = params => { return axios.post(`${base}/xm/core/xmIterationProductLink/edit`, params); }; +export const editXmIterationLink = params => { return axios.post(`${base}/xm/core/xmIterationLink/edit`, params); }; //新增一条迭代表与产品表的关联关系，一般由迭代管理员将迭代挂接到产品表 -export const addXmIterationProductLink = params => { return axios.post(`${base}/xm/core/xmIterationProductLink/add`, params); }; \ No newline at end of file +export const addXmIterationLink = params => { return axios.post(`${base}/xm/core/xmIterationLink/add`, params); }; \ No newline at end of file diff --git a/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue b/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue index a4feab71..59d21ba3 100644 --- a/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue +++ b/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue @@ -47,7 +47,7 @@ import util from '@/common/js/util';//全局公共库 import config from '@/common/config';//全局公共库 import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 - import { delXmIterationProductLink } from '@/api/xm/core/xmIterationProductLink'; + import { delXmIterationLink } from '@/api/xm/core/xmIterationLink'; import XmIterationSelect from './XmIterationSelect.vue' import XmMenuMng from '../xmMenu/XmMenuMng.vue' @@ -156,10 +156,10 @@ } this.showPanel=tab.name }, - doDelXmIterationProductLink(){ + doDelXmIterationLink(){ this.$confirm('移出后，迭代试图将看不到该产品信息，确认将产品【'+this.xmProduct.productName+'】从迭代【'+this.xmIteration.iterationName+'】移出吗？', '提示', {}).then(() => { var params={iterationId:this.xmIteration.id,productId:this.xmProduct.id} - delXmIterationProductLink(params).then(res=>{ + delXmIterationLink(params).then(res=>{ var tips = res.data.tips; if(tips.isOk){ this.$notify({showClose: true, message:"移出成功", type: tips.isOk?'success':'error' }); diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue index 356a73f0..525d459b 100644 --- a/src/views/xm/core/xmIteration/XmIterationMng.vue +++ b/src/views/xm/core/xmIteration/XmIterationMng.vue @@ -131,7 +131,7 @@ import config from '@/common/config';//全局公共库 import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 import { listXmIteration,listXmIterationWithState, delXmIteration, batchDelXmIteration,loadTasksToXmIterationState } from '@/api/xm/core/xmIteration'; - import { addXmIterationProductLink,delXmIterationProductLink } from '@/api/xm/core/xmIterationProductLink'; + import { addXmIterationLink,delXmIterationLink } from '@/api/xm/core/xmIterationLink'; import XmIterationAdd from './XmIterationAdd';//新增界面 import XmIterationEdit from './XmIterationEdit';//修改界面 @@ -491,7 +491,7 @@ import XmIterationSelect from './XmIterationSelect.vue'; this.$confirm('确认将产品【'+xmProduct.productName+'】加入迭代计划【'+xmIteration.iterationName+'】吗？', '提示', { type: 'warning' }).then(()=>{ - addXmIterationProductLink({iterationId:xmIteration.id,productId:xmProduct.id}).then(res=>{ + addXmIterationLink({iterationId:xmIteration.id,productId:xmProduct.id}).then(res=>{ var tips =res.data.tips; if(tips.isOk){ this.getXmIterations(); @@ -500,13 +500,13 @@ import XmIterationSelect from './XmIterationSelect.vue'; }) }) }, - doDelXmIterationProductLink(row){ + doDelXmIterationLink(row){ var xmIteration=row; var xmProduct=this.xmProduct; this.$confirm('确认将产品【'+xmProduct.productName+'】与迭代【'+xmIteration.iterationName+'】进行脱钩吗？脱钩后，产品与迭代互相查看不到对方信息。', '提示', { type: 'warning' }).then(()=>{ - delXmIterationProductLink({iterationId:xmIteration.id,productId:xmProduct.id}).then(res=>{ + delXmIterationLink({iterationId:xmIteration.id,productId:xmProduct.id}).then(res=>{ var tips =res.data.tips; if(tips.isOk){ this.getXmIterations(); diff --git a/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue b/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue index 70c08df3..51257faa 100644 --- a/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue +++ b/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue @@ -19,7 +19,7 @@ - + @@ -30,12 +30,12 @@ import util from "@/common/js/util"; // 全局公共库 import { mapGetters } from "vuex"; import XmIterationOverview from './XmIterationOverview.vue'; import XmIterationEdit from './XmIterationEdit.vue'; - import XmIterationProductLinkMng from '../xmIterationProductLink/XmIterationProductLinkMng.vue'; + import XmIterationLinkMng from '../xmIterationLink/XmIterationLinkMng.vue'; import XmIterationMenuMng from '../xmIterationMenu/XmIterationMenuMng.vue'; export default { - components: {XmIterationOverview,XmIterationEdit, XmIterationProductLinkMng, XmIterationMenuMng }, + components: {XmIterationOverview,XmIterationEdit, XmIterationLinkMng, XmIterationMenuMng }, computed: { ...mapGetters(["userInfo"]), }, diff --git a/src/views/xm/core/xmIterationLink/XmIterationLinkAdd.vue b/src/views/xm/core/xmIterationLink/XmIterationLinkAdd.vue index 0901ff9d..e36cb7ed 100644 --- a/src/views/xm/core/xmIterationLink/XmIterationLinkAdd.vue +++ b/src/views/xm/core/xmIterationLink/XmIterationLinkAdd.vue @@ -1,7 +1,7 @@