From 509b47441fc4c1c50449b545ff935de6d493d20c 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, 30 Mar 2022 05:05:02 +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/components/XmProjectSelect.vue    |   5 +-
 .../xm/core/xmQuestion/XmQuestionAdd.vue      | 199 +++++++------
 .../xm/core/xmQuestion/XmQuestionEdit.vue     | 273 +++++++++---------
 .../xm/core/xmQuestion/XmQuestionMng.vue      |   2 +-
 src/views/xm/core/xmTask/XmTaskEdit.vue       |  14 +-
 5 files changed, 250 insertions(+), 243 deletions(-)

diff --git a/src/views/xm/core/components/XmProjectSelect.vue b/src/views/xm/core/components/XmProjectSelect.vue
index 6b238705..06430432 100644
--- a/src/views/xm/core/components/XmProjectSelect.vue
+++ b/src/views/xm/core/components/XmProjectSelect.vue
@@ -342,7 +342,10 @@
 		},
 		mounted() {
 			this.$nextTick(() => {
-				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el);
+				if(this.$refs.table){
+					this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el);
+				}
+				
 				if(this.autoSelect!==false){
 					this.initData();
 					this.hadInit=true;
diff --git a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
index 833ade1b..11dd55a0 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
@@ -3,17 +3,16 @@
 		<el-row class="page-main">
 			<el-form :model="addForm" label-width="120px"  :rules="addFormRules" ref="addForm">
 						<el-form-item label="缺陷标题" prop="name">
-							<el-input v-model="addForm.name" placeholder="缺陷标题" ></el-input>
-
+							<el-input v-model="addForm.name" placeholder="缺陷标题" ></el-input> 
 						</el-form-item>
 						<el-row>
-							<el-col :span="12">
+							<el-col :span="8">
 								<el-form-item label="归属项目" prop="projectId">
 									<font v-if="filters.selProject">{{this.filters.selProject?this.filters.selProject.name:''}}</font>
  									 <xm-project-select ref="xmProjectSelect" v-if="!selProject" @row-click="onPorjectConfirm"></xm-project-select>
 								</el-form-item>
 							</el-col>
-							<el-col  :span="12">
+							<el-col  :span="8">
 								<el-form-item label="隶属需求" prop="menuId"> 
 									<el-tag title="隶属需求" closable @click="showSelectMenu" @close.stop="handleCloseMenuTag">
 									<div class="icon" :style="{backgroundColor:   'rgb(79, 140, 255)' }">
@@ -21,106 +20,106 @@
 									</div> {{addForm.menuName?addForm.menuName:"未关联需求"}}</el-tag> 
 								</el-form-item>
 							</el-col>
+							<el-col :span="8">
+								<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-row> 
-								<el-col :span="12">
-									<el-form-item label="优先级别" prop="priority">
-										<el-select v-model="addForm.priority" placeholder="请选择优先级">
-											<el-option v-for="(i,index) in dicts['priority']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
-										</el-select> 
-									</el-form-item>
-									
-								</el-col>
-								<el-col :span="12">
-									<el-form-item label="严重程度" prop="bugSeverity">
-									<el-select v-model="addForm.bugSeverity" placeholder="请选择严重程度">
-										<el-option v-for="(i,index) in dicts['bugSeverity']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
+						<el-row>
+							<el-col :span="8">
+								<el-form-item label="严重程度" prop="bugSeverity">
+								<el-select v-model="addForm.bugSeverity" placeholder="请选择严重程度">
+									<el-option v-for="(i,index) in dicts['bugSeverity']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
+								</el-select> 
+								</el-form-item>
+							</el-col> 
+							<el-col :span="8">
+								<el-form-item label="优先级别" prop="priority">
+									<el-select v-model="addForm.priority" placeholder="请选择优先级">
+										<el-option v-for="(i,index) in dicts['priority']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
 									</el-select> 
-									</el-form-item>
-								</el-col> 
-						</el-row>
-						
-						<el-row> 
-								<el-col :span="12">
-									<el-form-item label="复现频率" prop="repRate">
-										<el-select v-model="addForm.repRate" placeholder="请选择复现频率">
-											<el-option v-for="(i,index) in dicts['bugRepRate']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
-										</el-select> 
-									</el-form-item>
-									
-								</el-col>
-								<el-col :span="12">
-									<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-row> 
-								<el-col :span="12">
-									<el-form-item label="缺陷类别" prop="bugType">
-										<el-select v-model="addForm.bugType" placeholder="请选择缺陷类别">
-											<el-option v-for="(i,index) in dicts['bugType']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
-										</el-select> 
-									</el-form-item>
-									
-								</el-col>
-								<el-col :span="12">
-									<el-form-item label="结束时间" prop="endTime">
-										 <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="addForm.endTime"></el-date-picker>
-									</el-form-item>
-								</el-col>
-						</el-row>
-						<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-form-item> 
+							</el-col>
+							<el-col :span="8">
+								<el-form-item label="结束时间" prop="endTime">
+										<el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="addForm.endTime"></el-date-picker>
+								</el-form-item>
+							</el-col>
 						</el-row>
+						<el-tabs value="1">
+							<el-tab-pane name="1" label="基本信息">
+								<el-row> 
+										<el-col :span="6">
+											<el-form-item label="复现频率" prop="repRate">
+												<el-select v-model="addForm.repRate" placeholder="请选择复现频率">
+													<el-option v-for="(i,index) in dicts['bugRepRate']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
+												</el-select> 
+											</el-form-item>
+											
+										</el-col> 
+										<el-col :span="6">
+											<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-col :span="6">
+											<el-form-item label="缺陷类别" prop="bugType">
+												<el-select v-model="addForm.bugType" placeholder="请选择缺陷类别">
+													<el-option v-for="(i,index) in dicts['bugType']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
+												</el-select> 
+											</el-form-item>
+											
+										</el-col> 
+										<el-col :span="6">
+											<el-form-item label="提出人" prop="askUsername">
+												<el-tag @click="showGroupUsers('askUsername')">{{addForm.askUsername?addForm.askUsername:'未关联提出人'}}</el-tag>
+ 											</el-form-item> 
+										</el-col>
+								</el-row>
 
-						<el-form-item label="测试步骤" prop="opStep">
-							<el-tooltip content="点击切换为富文本编辑|普通文本">
-								<el-button icon="el-icon-refresh" @click="opStepEditorVisible=!opStepEditorVisible" type="text"></el-button>
-							</el-tooltip>
-							<div v-if="opStepEditorVisible==false">
-								<el-input  style="width:100%;" v-model="addForm.opStep" type="textarea" :rows="2"> </el-input>
-							</div>
-							<div v-else>
-								<vue-editor  :id="'opStep'+addForm.id" :branch-id="userInfo.branchId" v-model="addForm.opStep" ref="opStep"></vue-editor>
-							</div>
- 						</el-form-item>
-
-						<el-form-item label="预期结果" prop="expectResult">
-							<el-tooltip content="点击切换为富文本编辑|普通文本">
-								<el-button icon="el-icon-refresh" @click="expectResultEditorVisible=!expectResultEditorVisible" type="text"></el-button>
-							</el-tooltip>
-							<div v-if="expectResultEditorVisible==false">
-								<el-input  style="width:100%;" v-model="addForm.expectResult" type="textarea" :rows="2"> </el-input>
-							</div>
-							<div v-else>
-								<vue-editor v-if="expectResultEditorVisible==true" :id="'expectResult'+addForm.id" :branch-id="userInfo.branchId" v-model="addForm.expectResult"  ref="expectResult"></vue-editor>
-							</div>
-						</el-form-item>
-						<el-form-item label="缺陷描述" prop="description">
-							<el-tooltip content="点击切换为富文本编辑|普通文本">
-								<el-button icon="el-icon-refresh" @click="descriptionEditorVisible=!descriptionEditorVisible" type="text"></el-button>
-							</el-tooltip>
-							<div v-if="descriptionEditorVisible==false">
-								<el-input  style="width:100%;" v-model="addForm.description" type="textarea" :rows="2"> </el-input>
-							</div>
-							<div v-else>
-								<vue-editor class="rich-context" :id="'description_'+addForm.id" :branch-id="userInfo.branchId" v-model="addForm.description"></vue-editor>
-							</div>
-
-				</el-form-item>
+								
+								<el-form-item label="缺陷描述" prop="description">
+									<el-tooltip content="点击切换为富文本编辑|普通文本">
+										<el-button icon="el-icon-refresh" @click="descriptionEditorVisible=!descriptionEditorVisible" type="text"></el-button>
+									</el-tooltip>
+									<div v-if="descriptionEditorVisible==false">
+										<el-input  style="width:100%;" v-model="addForm.description" type="textarea" :rows="6"> </el-input>
+									</div>
+									<div v-else>
+										<vue-editor class="rich-context" :id="'description_'+addForm.id" :branch-id="userInfo.branchId" v-model="addForm.description"></vue-editor>
+									</div>
+								</el-form-item>
+							</el-tab-pane>
+							<el-tab-pane label="测试步骤" name="2">
+								<el-form-item label="测试步骤" prop="opStep">
+									<el-tooltip content="点击切换为富文本编辑|普通文本">
+										<el-button icon="el-icon-refresh" @click="opStepEditorVisible=!opStepEditorVisible" type="text"></el-button>
+									</el-tooltip>
+									<div v-if="opStepEditorVisible==false">
+										<el-input  style="width:100%;" v-model="addForm.opStep" type="textarea" :rows="6"> </el-input>
+									</div>
+									<div v-else>
+										<vue-editor  :id="'opStep'+addForm.id" :branch-id="userInfo.branchId" v-model="addForm.opStep" ref="opStep"></vue-editor>
+									</div>
+								</el-form-item>
+							</el-tab-pane>
+							<el-tab-pane label="预期结果" name="3">
+								<el-form-item label="预期结果" prop="expectResult">
+									<el-tooltip content="点击切换为富文本编辑|普通文本">
+										<el-button icon="el-icon-refresh" @click="expectResultEditorVisible=!expectResultEditorVisible" type="text"></el-button>
+									</el-tooltip>
+									<div v-if="expectResultEditorVisible==false">
+										<el-input  style="width:100%;" v-model="addForm.expectResult" type="textarea" :rows="6"> </el-input>
+									</div>
+									<div v-else>
+										<vue-editor v-if="expectResultEditorVisible==true" :id="'expectResult'+addForm.id" :branch-id="userInfo.branchId" v-model="addForm.expectResult"  ref="expectResult"></vue-editor>
+									</div>
+								</el-form-item>
+							</el-tab-pane> 
+						</el-tabs> 
 			</el-form>
 			<el-drawer title="选中用户" :visible.sync="selectUserVisible"  size="70%"  append-to-body   :close-on-click-modal="false">
 				<xm-group-mng  :sel-project="filters.selProject" :is-select-single-user="1" @user-confirm="onUserConfirm"></xm-group-mng>
diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index feff3ce3..6bb4f88c 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -1,27 +1,23 @@
 <template>
 	<section>  
 		<el-row class="page-main ">
-			<el-row class="padding">
-				<font class="font">{{editForm.name}}</font>
-			</el-row>
-			<el-row class="padding-bottom"> 
-				<el-tag>{{editForm.createUsername}} 于 {{editForm.createTime}} 创建 </el-tag>
-				<el-divider direction="vertical"></el-divider>
-				<el-tag v-if="editForm.tagNames">{{editForm.tagNames?editForm.tagNames:''}} </el-tag>
-				<el-button type="text" icon="el-icon-plus" @click="tagSelectVisible=true">标签</el-button>
-				<el-divider direction="vertical"></el-divider>
-				<el-button type="text" icon="el-icon-search" @click="flowInfoVisible=true">日志</el-button> 
-			</el-row>  
-			<el-row>
-				<el-form :model="editForm" label-width="120px" :rules="editFormRules" ref="editForm"> 
-						
+			<el-form :model="editForm" label-width="120px" :rules="editFormRules" ref="editForm"> 
+			  	<el-form-item label="缺陷标题" prop="name">
+					 <el-input   v-model="editForm.name"></el-input>
+					 	<el-tag>{{editForm.createUsername}} 于 {{editForm.createTime}} 创建 </el-tag>
+						<el-divider direction="vertical"></el-divider>
+						<el-tag v-if="editForm.tagNames">{{editForm.tagNames?editForm.tagNames:''}} </el-tag>
+						<el-button type="text" icon="el-icon-plus" @click="tagSelectVisible=true">标签</el-button>
+						<el-divider direction="vertical"></el-divider>
+						<el-button type="text" icon="el-icon-search" @click="flowInfoVisible=true">日志</el-button>  
+				</el-form-item> 
 						<el-row>
-							<el-col :span="12">
+							<el-col :span="8">
 								<el-form-item label="归属项目" prop="projectId">
-									<font v-if="editForm.projectId">{{editForm.projectId?editForm.projectId:''}}</font> 
+									 {{editForm.projectId}}
 								</el-form-item>
 							</el-col>
-							<el-col  :span="12">
+							<el-col  :span="8">
 								<el-form-item label="隶属需求" prop="menuId"> 
 									<el-tag title="隶属需求" closable @click="showSelectMenu" @close.stop="handleCloseMenuTag">
 									<div class="icon" :style="{backgroundColor:   'rgb(79, 140, 255)' }">
@@ -29,45 +25,61 @@
 									</div> {{editForm.menuName?editForm.menuName:"未关联需求"}}</el-tag> 
 								</el-form-item>
 							</el-col>
+							<el-col :span="8">
+								<el-form-item label="负责人" prop="handlerUsername">
+									{{editForm.handlerUsername}}  <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-row> 
-								<el-col :span="12">
-									<el-form-item label="优先级别" prop="priority">
-										<el-select v-model="editForm.priority" placeholder="请选择优先级">
-											<el-option v-for="(i,index) in dicts['priority']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
-										</el-select> 
-									</el-form-item>
-									
-								</el-col>
-								<el-col :span="12">
-									<el-form-item label="严重程度" prop="bugSeverity">
-									<el-select v-model="editForm.bugSeverity" placeholder="请选择严重程度">
-										<el-option v-for="(i,index) in dicts['bugSeverity']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
+						<el-row>
+							<el-col :span="8">
+								<el-form-item label="严重程度" prop="bugSeverity">
+								<el-select v-model="editForm.bugSeverity" placeholder="请选择严重程度">
+									<el-option v-for="(i,index) in dicts['bugSeverity']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
+								</el-select> 
+								</el-form-item>
+							</el-col> 
+							<el-col :span="8">
+								<el-form-item label="优先级别" prop="priority">
+									<el-select v-model="editForm.priority" placeholder="请选择优先级">
+										<el-option v-for="(i,index) in dicts['priority']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
 									</el-select> 
-									</el-form-item>
-								</el-col> 
-						</el-row> 
-						<el-row> 
-								<el-col :span="12">
-									<el-form-item label="复现频率" prop="repRate">
-										<el-select v-model="editForm.repRate" placeholder="请选择复现频率">
-											<el-option v-for="(i,index) in dicts['bugRepRate']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
-										</el-select> 
-									</el-form-item>
-									
-								</el-col>
-								
-								<el-col :span="12">
-									<el-form-item label="复现版本" prop="verNum">
-										<el-select v-model="editForm.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-form-item> 
+							</el-col>
+							<el-col :span="8">
+								<el-form-item label="结束时间" prop="endTime">
+										<el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="editForm.endTime"></el-date-picker>
+								</el-form-item>
+							</el-col>
 						</el-row>
-						
-						<el-row> 
-								<el-col :span="12">
+						<el-tabs value="1">
+							<el-tab-pane name="1" label="基本信息">
+								<el-row> 
+									
+										<el-col :span="8">
+											<el-form-item label="提出人" prop="askUsername">
+												<el-tag @click="showGroupUsers('askUsername')">{{editForm.askUsername?editForm.askUsername:'未关联提出人'}}</el-tag> 
+											</el-form-item> 
+										</el-col>
+										<el-col :span="8">
+											<el-form-item label="复现频率" prop="repRate">
+												<el-select v-model="editForm.repRate" placeholder="请选择复现频率">
+													<el-option v-for="(i,index) in dicts['bugRepRate']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
+												</el-select> 
+											</el-form-item>
+											
+										</el-col> 
+										<el-col :span="8">
+											<el-form-item label="复现版本" prop="verNum">
+												<el-select v-model="editForm.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-row>
+									
+								<el-col :span="8">
 									<el-form-item label="原因分析" prop="bugReason">
 										<el-select v-model="editForm.bugReason" placeholder="请选择原因">
 											<el-option v-for="(i,index) in dicts['bugReason']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
@@ -75,90 +87,90 @@
 									</el-form-item>
 								</el-col>
 								
-								<el-col :span="12">
+								<el-col :span="6">
 									<el-form-item label="解决方案" prop="solution">
 										<el-select v-model="editForm.solution" placeholder="请选择解决方案">
 											<el-option v-for="(i,index) in dicts['bugSolution']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
 										</el-select> 
 									</el-form-item>
-								</el-col>
-						</el-row>
-						
-						
-						<el-row> 
-								<el-col :span="12">
-									<el-form-item label="缺陷类别" prop="bugType">
-										<el-select v-model="editForm.bugType" placeholder="请选择缺陷类别">
-											<el-option v-for="(i,index) in dicts['bugType']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
-										</el-select> 
-									</el-form-item>  
-								</el-col>
+								</el-col> 
+								<el-col :span="6">
+											<el-form-item label="缺陷类别" prop="bugType">
+												<el-select v-model="editForm.bugType" placeholder="请选择缺陷类别">
+													<el-option v-for="(i,index) in dicts['bugType']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
+												</el-select> 
+											</el-form-item>
+											
+										</el-col> 
+								</el-row>
+
 								
-								<el-col :span="12">
-									<el-form-item label="结束时间" prop="endTime">
-										 <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="editForm.endTime"></el-date-picker>
-									</el-form-item>
-								</el-col>
-						</el-row>
-						
-						<el-row> 
-								<el-col :span="12">
-									<el-form-item label="提出人" prop="askUsername">
-										<el-tag @click="showGroupUsers('askUsername')">{{editForm.askUsername?editForm.askUsername:'未关联提出人'}}</el-tag>
- 									</el-form-item> 
-								</el-col>
-								<el-col :span="12">
-									<el-form-item label="负责人" prop="handlerUsername">
-										{{editForm.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-col :span="24" v-if="editForm.expectResult">
-							<div class="wf-main-context-box" v-if="editForm.opStep">
-								<div    class="wf-main-context"  v-html="editForm.opStep"></div>
-							</div>
-						</el-col>
-						<font v-else>无</font>
-					</el-form-item>
-					<el-form-item label="预期结果" prop="expectResult">
-						<el-col :span="24" v-if="editForm.expectResult">
-							<div class="wf-main-context-box" >
-								<div     class="wf-main-context" v-html="editForm.expectResult"></div>
-							</div>
+								<el-form-item label="缺陷描述" prop="description">
+									<el-tooltip content="点击切换为富文本编辑|普通文本">
+										<el-button icon="el-icon-refresh" @click="descriptionEditorVisible=!descriptionEditorVisible" type="text"></el-button>
+									</el-tooltip>
+									<div v-if="descriptionEditorVisible==false">
+										<el-input  style="width:100%;" v-model="editForm.description" type="textarea" :rows="6"> </el-input>
+									</div>
+									<div v-else>
+										<vue-editor class="rich-context" :id="'description_'+editForm.id" :branch-id="userInfo.branchId" v-model="editForm.description"></vue-editor>
+									</div>
+								</el-form-item>
+							</el-tab-pane>
+							<el-tab-pane label="测试步骤" name="2">
+								<el-form-item label="测试步骤" prop="opStep">
+									<el-tooltip content="点击切换为富文本编辑|普通文本">
+										<el-button icon="el-icon-refresh" @click="opStepEditorVisible=!opStepEditorVisible" type="text"></el-button>
+									</el-tooltip>
+									<div v-if="opStepEditorVisible==false">
+										<el-input  style="width:100%;" v-model="editForm.opStep" type="textarea" :rows="6"> </el-input>
+									</div>
+									<div v-else>
+										<vue-editor  :id="'opStep'+editForm.id" :branch-id="userInfo.branchId" v-model="editForm.opStep" ref="opStep"></vue-editor>
+									</div>
+								</el-form-item>
+							</el-tab-pane>
+							<el-tab-pane label="预期结果" name="3">
+								<el-form-item label="预期结果" prop="expectResult">
+									<el-tooltip content="点击切换为富文本编辑|普通文本">
+										<el-button icon="el-icon-refresh" @click="expectResultEditorVisible=!expectResultEditorVisible" type="text"></el-button>
+									</el-tooltip>
+									<div v-if="expectResultEditorVisible==false">
+										<el-input  style="width:100%;" v-model="editForm.expectResult" type="textarea" :rows="6"> </el-input>
+									</div>
+									<div v-else>
+										<vue-editor v-if="expectResultEditorVisible==true" :id="'expectResult'+editForm.id" :branch-id="userInfo.branchId" v-model="editForm.expectResult"  ref="expectResult"></vue-editor>
+									</div>
+								</el-form-item>
+							</el-tab-pane> 
 
-						</el-col>
-						<font v-else>无</font>
-					</el-form-item> 
-					<el-form-item label="缺陷描述" prop="description">
-						<el-col v-if="editForm.description" :span="24" >
-						<div class="wf-main-context-box" >
-							<div  class="wf-main-context" v-html="editForm.description"></div>
-						</div>
-						</el-col>
-						<font v-else>无</font>
-					</el-form-item> 
-					<el-form-item v-if="!flowInfoVisible" label="上次处理意见" prop="remarks">
-						<el-col v-if="editForm.remarks" :span="24" >
-						<div class="wf-main-context-box"  >
-							<div   class="wf-main-context rich-context" v-html="editForm.remarks"></div>
-						</div>
-						</el-col>
-						<font v-else>无</font> 
-					</el-form-item>
-					<el-form-item label="处理意见" prop="receiptMessage">
+							<el-tab-pane label="处理意见" name="4">
+								<el-form-item v-if="!flowInfoVisible" label="流转意见" prop="remarks">
+									<el-col v-if="editForm.remarks" :span="24" >
+									<div class="wf-main-context-box"  >
+										<div   class="wf-main-context rich-context" v-html="editForm.remarks"></div>
+									</div>
+									</el-col>
+									<font v-else>无</font> 
+								</el-form-item>
+								<el-form-item label="处理意见" prop="receiptMessage"> 
+									<el-tooltip content="点击切换为富文本编辑|普通文本">
+										<el-button icon="el-icon-refresh" @click="receiptMessageEditorVisible=!receiptMessageEditorVisible" type="text"></el-button>
+									</el-tooltip>
+									<div v-if="receiptMessageEditorVisible==false">
+										<el-input  style="width:100%;" v-model="editForm.receiptMessage" type="textarea" :rows="6"> </el-input>
+									</div>
+									<div v-else>
+										<vue-editor :id="'receiptMessage_'+editForm.id" :branch-id="userInfo.branchId" v-model="editForm.receiptMessage"></vue-editor>
 
-						<el-tooltip content="点击切换为富文本编辑|普通文本">
-							<el-button icon="el-icon-refresh" @click="receiptMessageEditorVisible=!receiptMessageEditorVisible" type="text"></el-button>
-						</el-tooltip>
-						<div v-if="receiptMessageEditorVisible==false">
-							<el-input  style="width:100%;" v-model="editForm.receiptMessage" type="textarea" :rows="2"> </el-input>
-						</div>
-						<div v-else>
-							<vue-editor :id="'receiptMessage_'+editForm.id" :branch-id="userInfo.branchId" v-model="editForm.receiptMessage"></vue-editor>
+									</div>
+								</el-form-item>
+							</el-tab-pane> 
 
-						</div>
-					</el-form-item>
+							
+							
+							
+						</el-tabs> 
 				</el-form>
 				<el-drawer title="选中用户" :visible.sync="selectUserVisible"  size="70%"  append-to-body   :close-on-click-modal="false">
 					<xm-group-mng  :sel-project="selProject" :is-select-single-user="1" @user-confirm="onUserConfirm"></xm-group-mng>
@@ -286,7 +298,10 @@
 				selectMenuVisible:false,
 				receiptMessageEditorVisible:false,
 				tagSelectVisible:false,
-				
+				descriptionEditorVisible:false,
+				descriptionEditorVisible:false,
+				expectResultEditorVisible:false,
+				opStepEditorVisible:false,
 				xmProductVersions:[{id:"1.0.0" ,name:'1.0.0'}],
 				/**end 在上面加自定义属性**/
 			}//end return
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index c71bcca9..2221c3c8 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -235,7 +235,7 @@
 				<el-pagination  layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination>
 			 </el-row>
 			<!--编辑 XmQuestion xm_question界面-->
-			<el-dialog  :title="编辑缺陷"   :visible.sync="editFormVisible"   width="80%"  top="20px"  :close-on-click-modal="false">
+			<el-dialog  title="编辑缺陷"   :visible.sync="editFormVisible"   width="80%"  top="20px"  :close-on-click-modal="false">
 					<xm-question-edit :sel-project=" {id:editForm.projectId,name:editForm.projectName} " :xm-question="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-question-edit>
 			</el-dialog>
 
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index b62cd5f7..f820043c 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -169,17 +169,7 @@
 
 					</el-tab-pane>
 					<el-tab-pane label="工时" name="5"> 
-						<el-row>
-							<el-col :span="8">  
-								<el-form-item label="统计方式" prop="calcType">
-									
-									<el-select v-model="editForm.calcType">
-										<el-option label="不统计"  value="0"></el-option>
-										<el-option label="下级往上级汇总"  value="1"></el-option>
-										<el-option label="手工填报"  value="2"></el-option>
-									</el-select>  
-								</el-form-item>  
-							</el-col>
+						<el-row> 
 							<el-col :span="8"> 
 								<el-form-item label="报工方式" prop="wtype" > 
 									<el-select v-model="editForm.wtype">
@@ -397,7 +387,7 @@
 				editForm: {
 					id:'',name:'',parentTaskid:'',parentTaskname:'',projectId:'',projectName:'',level:'3',sortLevel:'0',executorUserid:'',executorUsername:'',
 					preTaskid:'',preTaskname:'',startTime:'',endTime:'',milestone:'',description:'',remarks:'',createUserid:'',createUsername:'',createTime:'',taskOut:'0',
-					rate:0,budgetCost:'',budgetWorkload:'',actCost:'',actWorkload:'',taskState:'0',taskClass:'0',toTaskCenter:'0',actStartTime:'',actEndTime:'',taskType:'4',planType:'w2',settleSchemel:'1',ntype:'0',childrenCnt:0
+					rate:0,budgetCost:'',budgetWorkload:'',actCost:'',actWorkload:'',taskState:'0',taskClass:'0',toTaskCenter:'0',actStartTime:'',actEndTime:'',taskType:'4',planType:'w2',settleSchemel:'1',ntype:'0',childrenCnt:0,wtype:'',
   
 				},
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/