From e82f8c93851a157a05a2f7c1abb1b52625e1059a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 3 Jul 2021 00:05:25 +0800
Subject: [PATCH] =?UTF-8?q?bug=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/xmQuestion/XmQuestionMng.vue      | 45 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index 5d9dff13..53b5b59e 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -27,7 +27,7 @@
 				<el-popover
 					placement="top-start"
 					title=""
-					width="400"
+					width="600"
 					trigger="click" >
 					<el-row>
 						<el-col :span="24" style="padding-top:5px;">
@@ -52,6 +52,17 @@
 							<el-tag v-else closable @close="clearHandler"  @click="showGroupUsers('handlerUser')">{{filters.handlerUsername}}</el-tag>
 							<el-button v-if="filters.handlerUserid!=userInfo.userid" @click="setFiltersHandlerAsMySelf">我的</el-button> 
 						</el-col> 
+						
+						<el-col :span="24" style="padding-top:12px;"> 
+							曾经由<el-button v-if="!filters.hisHandler||!filters.hisHandler.userid" @click="showGroupUsers('hisHandler')">执行人</el-button> 
+							<el-tag v-else closable @close="clearHisHandler"  @click="showGroupUsers('hisHandler')">{{filters.hisHandler.username}}</el-tag>
+							<el-button v-if="!filters.hisHandler||filters.hisHandler.userid!=userInfo.userid" @click="setFiltersHisHandlerAsMySelf">我的</el-button> 
+							变更状态为
+							<el-select v-model="filters.hisHandleStatus" placeholder="请选择状态"  clearable @change="changeHisHandleStatus">
+								<el-option v-for="(b,index) in options['bugStatus']" :value="b.optionValue"  :key="index" :label="b.optionName">{{b.optionName}}
+								</el-option>
+							</el-select>的问题
+						</el-col> 
 						<el-col :span="24" style="padding-top:5px;">
 								<font class="more-label-font">故事:</font>
 							<font  v-if="  filters.menus && filters.menus.length>0">
@@ -237,6 +248,8 @@
 					menus:[],
 					product:null,
 					createUser:null,
+					hisHandler:null,
+					hisHandleStatus:null,
 
 				},
 				xmQuestions: [],//查询结果
@@ -401,6 +414,12 @@
 				if(this.filters.createUser){
 					params.createUserid=this.filters.createUser.userid;
 				}
+				if(this.filters.hisHandler){
+					params.hisHandlerUserid=this.filters.hisHandler.userid;
+				}
+				if(this.filters.hisHandleStatus){
+					params.hisHandleStatus=this.filters.hisHandleStatus
+				}
 				params.createTimeStart=this.dateRanger[0]+" 00:00:00"
 				params.createTimeEnd=this.dateRanger[1]+" 23:59:59"
 				this.load.list = true;
@@ -548,6 +567,10 @@
 				this.filters.bugStatus= val; 
 				this.getXmQuestions();
 			},
+			changeHisHandleStatus(val){
+				this.filters.hisHandleStatus= val; 
+				this.getXmQuestions();
+			},
 			changeBugSeverity(val){
 				this.filters.bugSeverity= val; 
 				this.getXmQuestions();
@@ -679,6 +702,13 @@
 						var user=groupUsers[0] 
 						this.filters.createUser=user 
 					} 
+				}else if(this.userType=='hisHandler'){
+					if(groupUsers==null || groupUsers.length==0){ 
+						this.filters.hisHandler=null 
+					}else{
+						var user=groupUsers[0] 
+						this.filters.hisHandler=user 
+					} 
 				}else{
 					if(groupUsers==null || groupUsers.length==0){ 
 						this.filters.handlerUserid=''
@@ -796,6 +826,12 @@
 				this.searchXmQuestions();
 				this.nextAction=""
 			},
+			clearHisHandler(){
+				
+				this.filters.hisHandler=null 
+				this.searchXmQuestions();
+				this.nextAction=""
+			},
 			handleCommand(command) {  
 				if(command.type=='sendToProcessApprova'){ 
 					this.sendToProcessApprova(command.data,command.bizKey);
@@ -809,7 +845,12 @@
 			setFiltersCreateUserAsMySelf(){
 				this.filters.createUser=this.userInfo
  				this.searchXmQuestions();
-			}
+			}, 
+			setFiltersHisHandlerAsMySelf(){
+				this.filters.hisHandler=this.userInfo
+ 				this.searchXmQuestions();
+			},
+			
 		},//end methods
 		components: { 
 				'xm-question-add':XmQuestionAdd,