diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index e6a90114..a62091a1 100644
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@@ -8,7 +8,7 @@
placement="right"
width="400"
trigger="click">
-
+
{{filters.product?filters.product.productName:'选择产品'}}
@@ -117,7 +117,7 @@
//import Sticky from '@/components/Sticky' // 粘性header组件
//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
import { listXmMenu } from '@/api/xm/core/xmMenu';
- import XmProductMng from '../xmProduct/XmProductSelect';//新增界面
+ import XmProductSelect from '../xmProduct/XmProductSelect';//新增界面
import XmMenuRichDetail from './XmMenuRichDetail';
import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
@@ -126,7 +126,7 @@
import { mapGetters } from 'vuex'
export default {
- props:['isSelectMenu','excludeIterationId','multi','visible','xmIteration'],
+ props:['isSelectMenu','excludeIterationId','multi','visible','xmIteration','xmProduct','selProject'],
computed: {
...mapGetters([
'userInfo','roles'
@@ -144,6 +144,14 @@
},
xmItertaion(){
this.getXmMenus();
+ },
+
+ xmProduct(){
+ this.filters.product=this.xmProduct
+ this.getXmMenus();
+ },
+ selProject(){
+ this.getXmMenus();
}
},
data() {
@@ -412,7 +420,7 @@
},//end methods
components: {
- XmProductMng,XmMenuRichDetail,UsersSelect
+ XmProductSelect,XmMenuRichDetail,UsersSelect
//在下面添加其它组件
},
@@ -421,6 +429,8 @@
if(this.excludeIterationId){
this.filters.iterationFilterType='not-join'
}
+
+ this.filters.product=this.xmProduct
this.getXmMenus();
this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
});
diff --git a/src/views/xm/core/xmProduct/XmProductSelect.vue b/src/views/xm/core/xmProduct/XmProductSelect.vue
index 32bf7e63..24545d96 100644
--- a/src/views/xm/core/xmProduct/XmProductSelect.vue
+++ b/src/views/xm/core/xmProduct/XmProductSelect.vue
@@ -207,11 +207,10 @@
params.key="%"+this.filters.key+"%"
}else{
//params.xxx=xxxxx
- }
+ }
if(this.selProject){
params.projectId=this.selProject.id
}
-
if(this.xmIteration){
params.iterationId=this.xmIteration.id
}
diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue
index b1a97bb0..4ff231ff 100644
--- a/src/views/xm/core/xmTask/XmTaskList.vue
+++ b/src/views/xm/core/xmTask/XmTaskList.vue
@@ -118,6 +118,9 @@
this.filters.selProject=this.selProject
this.changeSelKey("all");
},
+ "xmProduct":function(){
+ this.changeSelKey("all");
+ }
},
data() {
const beginDate = new Date();
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index d31fe974..95a589c6 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -864,6 +864,8 @@
:visible="batchRelTasksWithMenuVisible"
:is-select-menu="true"
@selected="onBatchRelTasksWithMenu"
+ :xm-product="filters.product"
+ :sel-project="filters.selProject"
>
@@ -891,7 +894,8 @@
:visible="menuStory"
:is-select-menu="true"
:multi="true"
- @menus-selected="onSelectedStory"
+ @menus-selected="onSelectedStory"
+ :xm-product="filters.product"
>