diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 4809eba2..3087e193 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -200,6 +200,11 @@
+
+
+
+
+
@@ -223,6 +228,7 @@
import XmTaskListForMenu from '../xmTask/XmTaskListForMenu';
import XmIterationMng from '../xmIteration/XmIterationSelect';//修改界面
import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
+ import TagMng from "@/views/mdp/arc/tag/TagMng";
import {sn} from '@/common/js/sequence'
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index f3cd780d..e3e0feee 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -1,11 +1,11 @@
-
+
{{b.optionName}}
-
+
{{b.optionName}}
@@ -13,15 +13,10 @@
{{b.optionName}}
- {{this.filters.product.productName}}
- 选产品
- 选择需求
- {{filters.menus[0].menuName.substr(0,5)}}等({{filters.menus.length}})个
-
-
-
-
+
+
+
项目:
{{ filters.selProject.name }}
- 选择项目
-
+ 选择项目
+
+
+ 需求:
+ 需求
+ {{filters.menus[0].menuName.substr(0,5)}}等({{filters.menus.length}})个
创建者:
@@ -120,12 +119,26 @@
+
+ {{this.filters.product.productName}}
+ 产品
+ {{ filters.selProject.name }}
+ 选择项目
+ 标签
+ {{filters.tags[0].tagName.substr(0,5)}}等({{filters.tags.length}})个
+ 需求
+ {{filters.menus[0].menuName.substr(0,5)}}等({{filters.menus.length}})个
+
+ 选择被指派人
+ 指派给{{filters.handlerUsername}}的
+ 指派给我的
+
-
+
{{formatterOption(scope.row,{property:'bugSeverity'},scope.row.bugSeverity)}}
{{formatterOption(scope.row,{property:'bugSeverity'},scope.row.bugSeverity)}}
{{formatterOption(scope.row,{property:'bugSeverity'},scope.row.bugSeverity)}}
@@ -135,20 +148,6 @@
-
-
-
- 未发审
- 审核中
- 已通过
- 未通过
- 已取消
-
- {{qtype=='risk'?'':''}}
-
-
-
-
创建
@@ -167,8 +166,13 @@
+
+
+
+
+
@@ -196,6 +200,11 @@
+
+
+
+
+
@@ -215,6 +224,7 @@
import XmProjectList from '../xmProject/XmProjectList';
import XmProductSelect from '../xmProduct/XmProductSelect';//修改界面
+ import TagMng from "@/views/mdp/arc/tag/TagMng";
export default {
computed: {
@@ -258,6 +268,7 @@
createUser:null,
hisHandler:null,
hisHandleStatus:null,
+ tags:[],
},
xmQuestions: [],//查询结果
@@ -341,6 +352,7 @@
],
pickerOptions: util.pickerOptions('datarange'),
userType:'',//createUser、handlerUser
+ tagSelectVisible:false,
/**end 自定义属性请在上面加 请加备注**/
}
@@ -462,6 +474,9 @@
if(this.filters.key){
params.key='%'+this.filters.key+'%'
}
+ if(this.filters.tags && this.filters.tags.length>0){
+ params.tagIdList=this.filters.tags.map(i=>i.tagId)
+ }
params.qtype=this.qtype
listXmQuestion(params).then((res) => {
var tips=res.data.tips;
@@ -507,6 +522,11 @@
this.filters.menus.splice(index,1);
this.searchXmQuestions();
},
+ clearFiltersTag(tag){
+ var index=this.filters.tags.findIndex(i=>i.tagId==tag.tagId)
+ this.filters.tags.splice(index,1);
+ this.searchXmQuestions();
+ },
//显示编辑界面 XmQuestion xm_question
showEdit: function ( row,index ) {
this.editFormVisible = true;
@@ -899,13 +919,23 @@
msg=row.createUsername+'创建的缺陷'
}
return msg;
+ },
+
+ onTagSelected(tags) {
+ this.tagSelectVisible = false;
+ if (!tags || tags.length == 0) {
+ this.filters.tags=[]
+ }else{
+ this.filters.tags=tags
+ }
+ this.searchXmQuestions();
}
},//end methods
components: {
'xm-question-add':XmQuestionAdd,
'xm-question-edit':XmQuestionEdit,
- XmGroupMng,XmProjectList,xmMenuSelect,XmProductSelect
+ XmGroupMng,XmProjectList,xmMenuSelect,XmProductSelect,TagMng,
//在下面添加其它组件
},
mounted() {
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 3401fa31..21a9e17e 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -397,6 +397,10 @@
+
+
+
+
@@ -427,6 +431,7 @@
import XmMenuRichDetail from '../xmMenu/XmMenuRichDetail';
import XmProductSelect from '../xmProduct/XmProductSelect';//修改界面
+ import TagMng from "@/views/mdp/arc/tag/TagMng";
import XmGantt from '../components/xm-gantt';
import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';