diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
index 07a342c7..ab545e4c 100644
--- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
+++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
@@ -36,8 +36,8 @@
-
-
+
+
diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index f6979257..bc7b6902 100644
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@@ -19,20 +19,20 @@
v-model="iterationVisible">
{{filters.iteration?filters.iteration.iterationName:'选择迭代'}}
-
+
-
-
-
-
+
+
+
+
-
-
+
+
-
+
@@ -138,6 +138,11 @@
+
+
+
+
+
@@ -152,13 +157,15 @@
import XmMenuRichDetail from './XmMenuRichDetail';
import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
+ import TagMng from "@/views/mdp/arc/tag/TagMng";
+
import XmIterationSelect from '../xmIteration/XmIterationSelect';//修改界面
import {sn} from '@/common/js/sequence'
import { mapGetters } from 'vuex'
export default {
- props:['isSelectMenu','excludeIterationId','multi','visible','xmIteration','xmProduct','selProject'],
+ props:['isSelectMenu','multi','visible','xmIteration','xmProduct','selProject'],
computed: {
...mapGetters([
'userInfo','roles'
@@ -230,6 +237,7 @@
/**begin 自定义属性请在下面加 请加备注**/
maxTableHeight:300,
dateRanger: [ ],
+ tagSelectVisible:false,
pickerOptions: util.pickerOptions('datarange'),
/**end 自定义属性请在上面加 请加备注**/
}
@@ -363,7 +371,7 @@
params.orderBy= orderBys.join(",")
}
- if( this.filters.product!==null && this.filters.product.id!=''){
+ if( this.filters.product && this.filters.product.id){
params.productId=this.filters.product.id
}else {
this.$notify({showClose: true, message: "请先选择产品", type: 'success' });
@@ -434,31 +442,47 @@
this.filters.product=product
this.productVisible=false;
this.xmMenus=[]
- this.getXmMenus()
+ this.searchXmMenus()
},
onProductClearSelect:function(){
this.filters.product=null
this.productVisible=false;
this.xmMenus=[]
- this.getXmMenus()
+ this.searchXmMenus()
},
onIterationSelected:function(iteration){
this.filters.iteration=iteration
this.iterationVisible=false;
this.xmMenus=[]
- this.getXmMenus()
+ this.searchXmMenus()
},
onIterationClearSelect:function(){
this.filters.iteration=null
this.iterationVisible=false;
this.xmMenus=[]
- this.getXmMenus()
+ this.searchXmMenus()
},
+
+ clearFiltersTag(tag){
+ var index=this.filters.tags.findIndex(i=>i.tagId==tag.tagId)
+ this.filters.tags.splice(index,1);
+ this.searchXmMenus();
+ },
+ onTagSelected(tags){
+
+ this.tagSelectVisible = false;
+ if (!tags || tags.length == 0) {
+ this.filters.tags=[]
+ }else{
+ this.filters.tags=tags
+ }
+ this.searchXmMenus();
+ },
/**end 自定义函数请在上面加**/
},//end methods
components: {
- XmProductSelect,XmMenuRichDetail,UsersSelect,XmIterationSelect
+ XmProductSelect,XmMenuRichDetail,UsersSelect,XmIterationSelect,TagMng,
//在下面添加其它组件
},
@@ -469,9 +493,14 @@
})
this.$nextTick(() => {
- this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
- if(this.excludeIterationId){
- this.filters.iterationFilterType='not-join'
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
+ if(this.selProject && this.selProject.id){
+ this.filters.taskFilterType='join-curr-project'
+ }
+
+ if(this.xmIteration && this.xmIteration.id){
+ this.filters.iterationFilterType='join-curr-iteration'
+ this.filters.iteration=this.xmIteration
}
this.filters.product=this.xmProduct