From 9b1fc46df257b08461018ec0f70fb94f750d0776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 23 Mar 2022 16:57:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/xmQuestion/XmQuestionAdd.vue      | 29 ++++++++++++-------
 .../xmQuestionHandle/XmQuestionHandleMng.vue  | 18 ++++++------
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
index 36d452cc..67b89760 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
@@ -62,20 +62,28 @@
 									
 								</el-col>
 								<el-col :span="12">
-									<el-form-item label="解决方案" prop="solution">
-										<el-select v-model="addForm.solution" placeholder="请选择解决方案">
-											<el-option v-for="(i,index) in dicts['bugSolution']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
+									<el-form-item label="复现版本" prop="verNum">
+										<el-select v-model="addForm.verNum" placeholder="请选择版本">
+											<el-option v-for="(i,index) in xmProductVersions" :label="i.name" :value="i.id" :key="index">{{i.id}}</el-option>
 										</el-select> 
 									</el-form-item>
 								</el-col>
 						</el-row>
-						<el-form-item label="提出人" prop="askUsername">
-							<el-tag @click="showGroupUsers('askUsername')">{{addForm.askUsername?addForm.askUsername:'未关联提出人'}}</el-tag>
-							<el-tooltip content="最晚解决时间"><el-date-picker :clearable="false" style="width:150px;" type="date" placeholder="选择日期" v-model="addForm.endTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker></el-tooltip>
-						</el-form-item>
-						<el-form-item label="指派给" prop="handlerUsername">
-							{{addForm.handlerUsername}} <el-button type="text" @click="sendToAsk">指派给提出人</el-button><el-button type="text"  @click="sendToCreater">指派给创建人</el-button><el-button type="text"  @click="showGroupUsers('handlerUsername')">指派给其它人</el-button>
-						</el-form-item>
+						
+						
+						<el-row> 
+								<el-col :span="12">
+									<el-form-item label="提出人" prop="askUsername">
+										<el-tag @click="showGroupUsers('askUsername')">{{addForm.askUsername?addForm.askUsername:'未关联提出人'}}</el-tag>
+										<el-tooltip content="最晚解决时间"><el-date-picker :clearable="false" style="width:150px;" type="date" placeholder="选择日期" v-model="addForm.endTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker></el-tooltip>
+									</el-form-item> 
+								</el-col>
+								<el-col :span="12">
+									<el-form-item label="指派给" prop="handlerUsername">
+										{{addForm.handlerUsername}} <el-button type="text" @click="sendToAsk">指派给提出人</el-button><el-button type="text"  @click="sendToCreater">指派给创建人</el-button><el-button type="text"  @click="showGroupUsers('handlerUsername')">指派给其它人</el-button>
+									</el-form-item>
+								</el-col>
+						</el-row>
 
 						<el-form-item label="测试步骤" prop="opStep">
 							<el-tooltip content="点击切换为富文本编辑|普通文本">
@@ -216,6 +224,7 @@
 					qtype:'',
 					attachment: [],
 					repRate:'',
+					verNum:'',
 				},
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				fileVisible: true,
diff --git a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue
index bd600afa..54c30ced 100644
--- a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue
+++ b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue
@@ -18,15 +18,15 @@
 				<el-table-column prop="receiptTime" label="时间" min-width="80" ></el-table-column> 
 				<el-table-column prop="handleStatus" label="状态" min-width="80" > 
 					<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>   
+							<el-tag type="info" v-if="scope.row.handleStatus=='create' ">创建</el-tag>
+							<el-tag type="primary" v-else-if="scope.row.handleStatus=='active'">已激活</el-tag>
+							<el-tag type="warning" v-else-if="scope.row.handleStatus=='confirm'">确认</el-tag>
+							<el-tag type="warning" v-else-if="scope.row.handleStatus=='confirmed'">已确认</el-tag>
+							<el-tag type="success" v-else-if="scope.row.handleStatus=='solve'">解决</el-tag>
+							<el-tag type="success" v-else-if="scope.row.handleStatus=='resolved'">已解决</el-tag>
+							<el-tag type="success" v-else-if="scope.row.handleStatus=='close'">关闭</el-tag>
+							<el-tag type="success" v-else-if="scope.row.handleStatus=='closed'">已关闭</el-tag>
+							<el-tag v-else>{{scope.row.handleStatus}}</el-tag>   
 					</template>
 				</el-table-column> 
  			</el-table>