diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index 63a00787..416e4346 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -9,11 +9,20 @@
-
-
- 需求集
- 需求
-
+
+
+
+ 需求集
+ 需求
+
+
+
+
+ {{editForm.tagNames?editForm.tagNames:''}}
+ 标签
+
+
+
@@ -55,6 +64,11 @@
取消
提交
+
+
+
+
+
@@ -65,6 +79,7 @@
import { mapGetters } from 'vuex'
import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
import XmMenuOverview from './XmMenuOverview.vue';
+ import TagMng from "@/views/mdp/arc/tag/TagMng";
export default {
@@ -122,6 +137,7 @@ import XmMenuOverview from './XmMenuOverview.vue';
{id:"9", name:"已删除"},
]
},
+ tagSelectVisible:false,
/**begin 在下面加自定义属性,记得补上面的一个逗号**/
/**end 在上面加自定义属性**/
@@ -172,9 +188,19 @@ import XmMenuOverview from './XmMenuOverview.vue';
this.editForm.mmUsername=''
},
/**begin 在下面加自定义方法,记得补上面的一个逗号**/
- on_click(status){
- this.editForm.status=status;
- }
+ on_click(status){
+ this.editForm.status=status;
+ },
+ onTagSelected(tags) {
+ this.tagSelectVisible = false;
+ if(tags && tags.length>0){
+ this.editForm.tagIds=tags.map(i=>i.tagId).join(",")
+ this.editForm.tagNames=tags.map(i=>i.tagName).join(",")
+ }else{
+ this.editForm.tagIds=""
+ this.editForm.tagNames=""
+ }
+ },
/**end 在上面加自定义方法**/
},//end method
@@ -182,6 +208,7 @@ import XmMenuOverview from './XmMenuOverview.vue';
//在下面添加其它组件 'xm-menu-edit':XmMenuEdit
UsersSelect,
XmMenuOverview,
+ TagMng,
},
mounted() {
this.editForm=Object.assign(this.editForm, this.xmMenu);
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index faa6f9fd..700ece4f 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -9,7 +9,7 @@
-
+
@@ -17,7 +17,9 @@
-
+ 标签
+ {{filters.tags[0].tagName.substr(0,5)}}等({{filters.tags.length}})个
+
需求
汇总进度
@@ -27,6 +29,12 @@
width="400"
trigger="click" >
+
+ 标签条件:
+ 标签
+ {{filters.tags[0].tagName.substr(0,5)}}等({{filters.tags.length}})个
+
+
@@ -109,6 +117,9 @@
{{scope.row.finishRate}}%
+
+
+
@@ -292,7 +303,7 @@
mmUser:null,
iterationFilterType:'',//join、not-join、''
taskFilterType:'',//join、not-join、''
-
+ tags:[],
parentMenu:null,
parentMenuList:[],
},
@@ -417,7 +428,10 @@
params.ctimeStart=this.dateRanger[0]
params.ctimeEnd=this.dateRanger[1]
}
- if(!(params.ctimeStart||params.pmenuId||params.projectId||params.iterationId||params.iterationFilterType||params.mmUserid||params.key||params.taskFilterType)){
+ if(this.filters.tags && this.filters.tags.length>0){
+ params.tagIdList=this.filters.tags.map(i=>i.tagId)
+ }
+ if(!(params.ctimeStart||params.pmenuId||params.projectId||params.iterationId||params.iterationFilterType||params.mmUserid||params.key||params.taskFilterType||params.tagIdList)){
params.isTop="1"
}
return params;
@@ -889,6 +903,21 @@
this.filters.parentMenuList.splice(index+1,this.filters.parentMenuList.length-index)
this.pageInfo.count=true
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 methods
components: {
@@ -903,7 +932,7 @@
XmIterationMng,
UsersSelect,
XmMenuMngBatch,
-
+ TagMng,
//在下面添加其它组件
},
mounted() {