diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index b72e49b6..47bc70e4 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -40,10 +40,16 @@
选择项目
+
+ 创建者:
+ 选择创建人
+ {{filters.createUser.username}}
+ 我的
+
指派给:
- 选择被指派人
- {{filters.handlerUsername}}
+ 选择被指派人
+ {{filters.handlerUsername}}
我的
@@ -81,9 +87,7 @@
>
- 查询
-
-
+ 查询
导出
@@ -117,7 +121,7 @@
- 指派给
+ 指派给
@@ -157,8 +161,7 @@
-
-
+
@@ -230,6 +233,8 @@
selProject:null,
menus:[],
product:null,
+ createUser:null,
+
},
xmQuestions: [],//查询结果
pageInfo:{//分页数据
@@ -312,6 +317,7 @@
util.formatDate.format(endDate, "yyyy-MM-dd")
],
pickerOptions: util.pickerOptions('datarange'),
+ userType:'',//createUser、handlerUser
/**end 自定义属性请在上面加 请加备注**/
}
@@ -389,6 +395,9 @@
if(this.filters.product){
params.productId=this.filters.product.id
}
+ if(this.filters.createUser){
+ params.createUserid=this.filters.createUser.userid;
+ }
params.createTimeStart=this.dateRanger[0]+" 00:00:00"
params.createTimeEnd=this.dateRanger[1]+" 23:59:59"
this.load.list = true;
@@ -593,9 +602,9 @@
}else if(row.bugStatus=='closed'){
return "激活"
}
- },
-
- showGroupUsers:function(){
+ },
+ showGroupUsers:function(userType){
+ this.userType=userType;
if(this.filters.selProject==null || this.filters.selProject.id==''){
this.$message({ message: "请先选中项目", type: 'success' });
this.nextAction="showGroupUsers"
@@ -660,14 +669,24 @@
/**end 自定义函数请在上面加**/
onUserConfirm:function(groupUsers){
- if(groupUsers==null || groupUsers.length==0){
+ if(this.userType=='createUser'){
+ if(groupUsers==null || groupUsers.length==0){
+ this.filters.createUser=null
+ }else{
+ var user=groupUsers[0]
+ this.filters.createUser=user
+ }
+ }else{
+ if(groupUsers==null || groupUsers.length==0){
this.filters.handlerUserid=''
this.filters.handlerUsername='';
- }else{
- var user=groupUsers[0]
- this.filters.handlerUserid=user.userid
- this.filters.handlerUsername=user.username
- }
+ }else{
+ var user=groupUsers[0]
+ this.filters.handlerUserid=user.userid
+ this.filters.handlerUsername=user.username
+ }
+ }
+
this.selectUserVisible=false
this.searchXmQuestions();
@@ -681,11 +700,13 @@
onPorjectConfirm:function(project){
this.filters.selProject=project
this.selectProjectVisible=false;
- this.searchXmQuestions();
+
if(this.nextAction=='showAdd'){
this.showAdd()
}else if(this.nextAction=='showGroupUsers'){
- this.showGroupUsers()
+ this.showGroupUsers(this.userType)
+ }else{
+ this.searchXmQuestions();
}
},
showApprovaInfo:function(row){
@@ -760,6 +781,11 @@
this.nextAction=""
this.searchXmQuestions()
},
+ clearCreateUser(){
+ this.filters.createUser=null;
+ this.searchXmQuestions();
+ this.nextAction=""
+ },
clearHandler(){
this.filters.handlerUserid=''
@@ -776,6 +802,10 @@
this.filters.handlerUserid=this.userInfo.userid;
this.filters.handlerUsername=this.userInfo.username;
this.searchXmQuestions();
+ },
+ setFiltersCreateUserAsMySelf(){
+ this.filters.createUser=this.userInfo
+ this.searchXmQuestions();
}
},//end methods
components: {