From d7cc5f0d2b4da5554e7ad88d4877fc392aa10882 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 20 Apr 2021 01:19:39 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmQuestion/XmQuestionMng.vue | 18 +++++++++++++++---
 .../core/xmTaskExecuser/XmTaskExecuserMng.vue  | 13 ++++++++-----
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index a85dbee4..91a5cf22 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -34,15 +34,27 @@
 				<el-table-column sortable type="index" width="45"></el-table-column> 
 				<el-table-column prop="name" label="问题名称"  min-width="200"> 
 					<template slot-scope="scope">
-						<el-link type="primary" @click="showEdit(scope.row)">{{scope.row.id}}-{{scope.row.name}}</el-link>
+						<el-link type="primary" @click="showEdit(scope.row)">{{scope.row.id}}</el-link> &nbsp;{{scope.row.name}}
 					</template>
 				</el-table-column>
-				<el-table-column prop="bugStatus" label="状态" width="100" :formatter="formatterOption"></el-table-column> 
+				<el-table-column prop="bugStatus" label="状态" width="100" :formatter="formatterOption">
+					<template slot-scope="scope">
+						<el-tag type="info" v-if="scope.row.bugStatus=='create' ">创建</el-tag> 
+						<el-tag type="primary" v-else-if="scope.row.bugStatus=='active'">激活</el-tag> 
+						<el-tag type="warning" v-else-if="scope.row.bugStatus=='confirm'">确认</el-tag>
+						<el-tag type="warning" v-else-if="scope.row.bugStatus=='confirmed'">已确认</el-tag>
+						<el-tag type="success" v-else-if="scope.row.bugStatus=='solve'">解决</el-tag> 
+						<el-tag type="success" v-else-if="scope.row.bugStatus=='resolved'">已解决</el-tag>
+						<el-tag type="success" v-else-if="scope.row.bugStatus=='close'">关闭</el-tag> 
+						<el-tag type="success" v-else-if="scope.row.bugStatus=='closed'">已关闭</el-tag>
+						<el-tag v-else>{{scope.row.bugStatus}}</el-tag>  
+					</template>
+				</el-table-column> 
 				<el-table-column prop="bugSeverity" label="严重程度" width="100" :formatter="formatterOption"></el-table-column> 
 				<el-table-column prop="priority" label="紧急程度" width="100" :formatter="formatterOption"></el-table-column> 
 				<el-table-column prop="solution" label="解决方案" width="100" :formatter="formatterOption"></el-table-column>
 				<el-table-column prop="handlerUsername" width="200" label="指派给" > 
-					<template slot="header" slot-scope="scope">
+					<template slot="header">
 						指派给<el-button @click="showGroupUsers('handlerUsername')"  icon="el-icon-search" circle size="mini"></el-button>
  					</template>
 				</el-table-column>
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
index 31ee22aa..7da5b42b 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
@@ -4,7 +4,7 @@
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmTaskExecusers">查询</el-button>
 			<el-button type="primary"  @click="toJoin">我要加入</el-button> 
-			<el-button type="primary"  @click="showAdd">新增候选人</el-button>  
+			<el-button type="primary"  @click="showAdd">邀请他人加入</el-button>  
 			<!-- <el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button>  -->
 		</div>
 		<el-row class="app-container"> 
@@ -36,13 +36,16 @@
 						</el-form>
 					</template>
 				</el-table-column>
-				<el-table-column prop="username" label="姓名" min-width="120" >
+				<el-table-column prop="username" label="姓名" min-width="100" >
 					<template slot-scope="scope">
-						<el-tag :type="scope.row.isLeader=='1'?'warning':'success'">{{scope.row.isLeader=='1'?'负责人':'队员'}}</el-tag>{{scope.row.username}}
+						{{scope.row.username}}
 					</template>
 				</el-table-column>  
-				<el-table-column prop="startTime" label="开工时间" min-width="80" ></el-table-column>
-				<el-table-column prop="endTime" label="完工时间" min-width="80" ></el-table-column>
+				<el-table-column prop="startTime" label="开始~结束时间" width="200" show-overflow-tooltip >
+					<template slot-scope="scope">
+						{{scope.row.startTime}} ~ {{scope.row.endTime}}
+					</template>
+				</el-table-column> 
 				<el-table-column prop="status" label="状态" min-width="80"> 
 					<template slot-scope="scope">
 						<el-tag type="primary" v-if="scope.row.status=='0'">候选中</el-tag>