diff --git a/src/styles/mdp.scss b/src/styles/mdp.scss
index f9a4e8ae..7993426f 100644
--- a/src/styles/mdp.scss
+++ b/src/styles/mdp.scss
@@ -1,7 +1,40 @@
 //main-container全局样式
 
 .page-full-height{ 
-  height: calc(100vh);  
+  height: calc(100vh); 
+} 
+
+.page-height-95{
+  height: calc(95vh);   
+}  
+.page-height-85{
+  height: calc(85vh);  
+} 
+
+.page-height-75{
+  height: calc(75vh);   
+}  
+.page-height-65{
+  height: calc(65vh);  
+} 
+
+.page-height-55{
+  height: calc(55vh);   
+}  
+.page-height-45{
+  height: calc(45vh);  
+} 
+
+.page-height-35{
+  height: calc(35vh);   
+}  
+.page-height-25{
+  height: calc(25vh);  
+} 
+.page-height-15{
+  
+  height: calc(15vh);  
+
 } 
 .page-height-90{
   height: calc(90vh);   
@@ -9,11 +42,27 @@
 .page-height-80{
   height: calc(80vh);  
 } 
+
+.page-height-70{
+  height: calc(70vh);   
+}  
+.page-height-60{
+  height: calc(60vh);  
+} 
+
+.page-height-50{
+  height: calc(50vh);   
+}  
+.page-height-40{
+  height: calc(40vh);  
+} 
+
+.page-height-30{
+  height: calc(30vh);   
+}  
 .page-height-20{
-  
   height: calc(20vh);  
-
-}
+} 
 .page-height-10{
   
   height: calc(10vh);  
@@ -25,6 +74,7 @@
 
 }  
 .page-container {   
+  overflow: auto;
   .page-tips{ 
     position:absolute;
     font-size: 16px;  
@@ -42,8 +92,7 @@
     overflow: auto;
   }
   .page-main{  
-    overflow-y: auto;
-    overflow-x: hidden;
+    overflow: auto;
   }
   .page-bottom{   
     overflow: auto;
@@ -52,6 +101,9 @@
 .overflow-auto{
   overflow: auto;
 }
+.overflow-hidden{
+  overflow: hidden;
+}
 .border{ 
   border: 1px solid #e8e8e8;
 }
diff --git a/src/views/xm/core/xmMenu/XmMenuAdd.vue b/src/views/xm/core/xmMenu/XmMenuAdd.vue
index e008b887..c9928cee 100644
--- a/src/views/xm/core/xmMenu/XmMenuAdd.vue
+++ b/src/views/xm/core/xmMenu/XmMenuAdd.vue
@@ -1,6 +1,6 @@
 <template>
 	<section class="page-container page-full-height padding border">
-		<el-row>
+		<el-row class="page-main page-height-90">
 			<!--新增界面 XmMenu 项目故事表--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item v-if="parentMenu" label="上级故事" prop="pmenuId">
@@ -35,18 +35,17 @@
 				</el-form-item>  
 				<el-form-item label="概述" prop="remark">
 					<el-input type="textarea" :autosize="{ minRows: 4, maxRows: 20}" v-model="addForm.remark" placeholder="什么人？做什么事？，为什么？如： 作为招聘专员，我需要统计员工半年在职/离职人数，以便我能够制定招聘计划" ></el-input>
-				</el-form-item> 
-				<el-form-item>
-					<el-col :span="24" :offset="8"> 
-						<el-button @click.native="handleCancel">取消</el-button>  
-						<el-button v-loading="load.add" type="primary" @click.native="addSubmit" :disabled="load.add==true">提交</el-button>  
-					</el-col>
-				</el-form-item> 
+				</el-form-item>  
 			</el-form>
 			
 			<el-drawer title="选择员工" :visible.sync="userSelectVisible" size="60%" append-to-body>
 				<users-select  @confirm="onUserSelected" ref="usersSelect"></users-select>
 			</el-drawer>	
+			
+		</el-row>
+		<el-row>
+			<el-button @click.native="handleCancel">取消</el-button>  
+			<el-button v-loading="load.add" type="primary" @click.native="addSubmit" :disabled="load.add==true">提交</el-button>  
 		</el-row>
 	</section>
 </template>
diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index 1ef66bca..9458b579 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -35,10 +35,9 @@
 				<users-select  @confirm="onUserSelected" ref="usersSelect"></users-select>
 			</el-drawer>	
 		</el-row>
-		<el-row class="page-bottom">
-			
-						<el-button @click.native="handleCancel">取消</el-button>  
-						<el-button v-loading="load.edit" type="primary" @click.native="editSubmit" :disabled="load.edit==true">提交</el-button> 
+		<el-row class="page-bottom"> 
+			<el-button @click.native="handleCancel">取消</el-button>  
+			<el-button v-loading="load.edit" type="primary" @click.native="editSubmit" :disabled="load.edit==true">提交</el-button> 
 		</el-row>
 	</section>
 </template>
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index cd724eb9..5c196a1d 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -168,19 +168,22 @@
 				<el-drawer title="选中任务" :visible.sync="selectTaskVisible"   size="80%"  append-to-body   :close-on-click-modal="false">
 					<xm-task-list  :sel-project="selProject" :is-multi-select="true"  @tasks-selected="onSelectedTasks"></xm-task-list>
 				</el-drawer> 
-				<el-drawer title="查看任务" :visible.sync="taskListForMenuVisible"   size="80%"  append-to-body   :close-on-click-modal="false">
+				<el-drawer title="查看任务" :visible.sync="taskListForMenuVisible" :with-header="false"  size="80%"  append-to-body   :close-on-click-modal="false">
 					<xm-task-list-for-menu   :is-multi-select="true" :menu-id="editForm.menuId"></xm-task-list-for-menu>
 				</el-drawer> 
 				<el-drawer
 					append-to-body
 					title="任务"
 					:visible.sync="taskMngVisible"
-					fullscreen>
+					:with-header="false"
+					size="80%">
 					<xm-task-mng :sel-project="selProject"   :menu-id="editForm.menuId" :menu-name="editForm.menuName"></xm-task-mng> 
 				</el-drawer>
 				<el-drawer
 					append-to-body
-					title="故事关联的迭代查询"
+					title="故事关联的迭代查询" 
+					:with-header="false"
+					size="80%"
 					:visible.sync="iterationVisible" 
 					>
 						<xm-iteration-mng :visible="iterationVisible" :product-id="editForm.productId" :menu-id="editForm.menuId" ></xm-iteration-mng>
diff --git a/src/views/xm/core/xmProduct/XmProductAdd.vue b/src/views/xm/core/xmProduct/XmProductAdd.vue
index fc287822..d054210d 100644
--- a/src/views/xm/core/xmProduct/XmProductAdd.vue
+++ b/src/views/xm/core/xmProduct/XmProductAdd.vue
@@ -1,6 +1,6 @@
 <template>
 	<section class="page-container page-full-height padding border">
-		<el-row>
+		<el-row class="page-main page-height-80">
 			<!--新增界面 XmProduct 产品表--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="产品编号" prop="id">
@@ -16,13 +16,7 @@
 				</el-form-item>  
 				<el-form-item label="备注" prop="remark">
 					<el-input v-model="addForm.remark" type="textarea" :autosize="{ minRows: 4, maxRows: 20}"  placeholder="备注" ></el-input>
-				</el-form-item> 
-				<el-form-item>
-					<el-col :span="24" :offset="8"> 
-						<el-button @click.native="handleCancel">取消</el-button>  
-						<el-button v-loading="load.add" type="primary" @click.native="addSubmit" :disabled="load.add==true">提交</el-button>  
-					</el-col>
-				</el-form-item> 
+				</el-form-item>  
 			</el-form>
 			
 		
@@ -30,6 +24,10 @@
        		 <users-select  @confirm="onUserSelected" ref="usersSelect"></users-select>
       	</el-drawer>	
 		</el-row>
+		<el-row> 
+			<el-button @click.native="handleCancel">取消</el-button>  
+			<el-button v-loading="load.add" type="primary" @click.native="addSubmit" :disabled="load.add==true">提交</el-button>   
+		</el-row>
 	</section>
 </template>
 
diff --git a/src/views/xm/core/xmProduct/XmProductEdit.vue b/src/views/xm/core/xmProduct/XmProductEdit.vue
index 55b19659..f29b844c 100644
--- a/src/views/xm/core/xmProduct/XmProductEdit.vue
+++ b/src/views/xm/core/xmProduct/XmProductEdit.vue
@@ -1,6 +1,6 @@
 <template>
 	<section class="page-container page-full-height padding border">
-		<el-row>
+		<el-row class="page-main page-height-80">
 			<!--新增界面 XmProduct 产品表--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="产品编号" prop="id">
@@ -16,13 +16,7 @@
 				</el-form-item>  
 				<el-form-item label="备注" prop="remark">
 					<el-input v-model="editForm.remark" type="textarea" :autosize="{ minRows: 4, maxRows: 20}"  placeholder="备注" ></el-input>
-				</el-form-item> 
-				<el-form-item>
-					<el-col :span="24" :offset="8"> 
-						<el-button @click.native="handleCancel">取消</el-button>  
-						<el-button v-loading="load.edit" type="primary" @click.native="editSubmit" :disabled="load.edit==true">提交</el-button>  
-					</el-col>
-				</el-form-item> 
+				</el-form-item>  
 			</el-form>
 			
 		
@@ -30,6 +24,11 @@
        		 <users-select  @confirm="onUserSelected" ref="usersSelect"></users-select>
       	</el-drawer>	
 		</el-row>
+		
+		<el-row> 
+			<el-button @click.native="handleCancel">取消</el-button>  
+			<el-button v-loading="load.edit" type="primary" @click.native="editSubmit" :disabled="load.edit==true">提交</el-button> 
+		</el-row>
 	</section>
 </template>
 
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index bb5ebd16..08b17ff8 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -142,12 +142,12 @@
 		</el-row>
 		 
 					<!--编辑 XmProduct 产品表界面-->
-			<el-drawer title="编辑产品" :visible.sync="editFormVisible"  size="50%"  append-to-body   :close-on-click-modal="false">
+			<el-drawer title="编辑产品" :visible.sync="editFormVisible"  size="50%" :with-header="false"  append-to-body   :close-on-click-modal="false">
 				  <xm-product-edit :xm-product="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-product-edit>
 			</el-drawer>
 	
 			<!--新增 XmProduct 产品表界面-->
-			<el-drawer title="新增产品" :visible.sync="addFormVisible"  size="50%"  append-to-body  :close-on-click-modal="false">
+			<el-drawer title="新增产品" :visible.sync="addFormVisible"  size="50%" :with-header="false" append-to-body  :close-on-click-modal="false">
 				<xm-product-add :xm-product="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-product-add>
 			</el-drawer> 
 			<el-drawer title="产品状态数据" :visible.sync="productStateVisible"  width="100%"  append-to-body  :close-on-click-modal="false">
diff --git a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
index 6318f47a..c17297d6 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
@@ -1,7 +1,7 @@
 <template>
 	<section class="page-container page-full-height padding">
 		<el-row>
-			<el-steps :active="calcBugStep" simple finish-status="success">
+			<el-steps simple finish-status="success">
 				<el-step title="已激活,待确认" description="创建后自动激活、关闭后重新激活)"></el-step>
 				<el-step title="已确认,待解决" description="业务确认缺陷后变为已确认"></el-step>
 				<el-step title="已解决,待关闭" description="开发修复缺陷后，变成已解决"></el-step>
@@ -9,57 +9,74 @@
 			</el-steps>
 		</el-row>
 		<el-row class="page-main page-height-80 padding"> 
-			<el-form :model="addForm"  :rules="addFormRules" ref="addForm"> 
-						
-						<el-form-item label="隶属项目" prop="projectName">
-							<el-tag :closable="!selProject" @close="clearProject">{{this.filters.selProject?this.filters.selProject.name:'未选项目'}}</el-tag><el-button v-if="!selProject" @click="showProjectList" type="plian">选项目</el-button> 
-						</el-form-item>
-						<el-form-item label="隶属任务" prop="taskName">
-							<el-tag v-if="addForm.taskId!='' && addForm.taskId!=null " closable @close="handleCloseTaskTag">{{addForm.taskName}}</el-tag><el-button @click="showSelectTask">选任务</el-button>
-						</el-form-item>
-						<el-form-item label="隶属故事" prop="menuName">
-							<el-tag v-if="addForm.menuId!='' && addForm.menuId!=null " closable @close="handleCloseMenuTag">{{addForm.menuName}}</el-tag><el-button @click="showSelectMenu">选故事</el-button>
-						</el-form-item>   
+			<el-form :model="addForm"  :rules="addFormRules" ref="addForm">  
 						<el-form-item label="缺陷标题" prop="name">
 							<el-input v-model="addForm.name" placeholder="缺陷标题" ></el-input>
-						</el-form-item>  
-						<el-form-item label="优先级别" prop="priority">
-							<el-radio-group v-model="addForm.priority">
-								<el-radio v-for="(i,index) in options['urgencyLevel']" :label="i.optionValue" :key="index">{{i.optionName}}</el-radio> 
-							</el-radio-group> 
-						</el-form-item> 
-						<el-form-item label="严重程度" prop="bugSeverity">
-							<el-radio-group v-model="addForm.bugSeverity">
-								<el-radio v-for="(i,index) in options['bugSeverity']" :label="i.optionValue" :key="index">{{i.optionName}}</el-radio> 
-							</el-radio-group>  
-						</el-form-item> 
-						<!--
-						<el-form-item label="解决方案" prop="solution">
-							<el-radio-group v-model="addForm.solution">
-								<el-radio v-for="(i,index) in options['bugSolution']" :label="i.optionValue" :key="index">{{i.optionName}}</el-radio> 
-							</el-radio-group>   
-						</el-form-item> 
-						-->
-						<el-form-item label="到期时间" prop="endTime">
-							<el-date-picker :clearable="false" style="width:100%;" type="date" placeholder="选择日期" v-model="addForm.endTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
-						</el-form-item> 
+						</el-form-item>   
+						<el-form-item label="隶属" prop="taskName">
+							<el-tooltip content="隶属项目"><el-tag :closable="!selProject" @click="showProjectList" @close.stop="clearProject">{{this.filters.selProject?this.filters.selProject.name:'未关联项目'}}</el-tag></el-tooltip> 
+							<el-divider direction="vertical"></el-divider>
+							<el-tooltip content="隶属任务"><el-tag  closable @click="showSelectTask" @close.stop="handleCloseTaskTag">{{addForm.taskName?addForm.taskName:'未关联任务'}}</el-tag> </el-tooltip>
+							<el-divider direction="vertical"></el-divider>
+							<el-tooltip content="隶属故事"><el-tag  closable @click="showSelectMenu" @close.stop="handleCloseMenuTag">{{addForm.menuName?addForm.menuName:"未关联故事"}}</el-tag></el-tooltip>
+						</el-form-item>   
+						<el-form-item label="缺陷属性" prop="priority">
+							<el-col :span="24">
+							<el-select v-model="addForm.priority" placeholder="请选择紧急程度">
+								<el-option v-for="(i,index) in options['urgencyLevel']" :label="i.optionName" :value="i.optionValue" :key="i.optionValue">{{i.optionName}}</el-option> 
+							</el-select> 
+							
+							<el-select v-model="addForm.bugSeverity" placeholder="请选择严重程度">
+								<el-option v-for="(i,index) in options['bugSeverity']" :label="i.optionName" :value="i.optionValue" :key="i.optionValue">{{i.optionName}}</el-option> 
+							</el-select>  
+							
+							<el-select v-model="addForm.solution" placeholder="请选择解决方案">
+								<el-option v-for="(i,index) in options['bugSolution']" :label="i.optionName" :value="i.optionValue" :key="i.optionValue">{{i.optionName}}</el-option> 
+							</el-select>   
+							</el-col>
+						</el-form-item>    
 						<el-form-item label="提出人" prop="askUsername">
-							{{addForm.askUsername}} <el-button @click="showGroupUsers('askUsername')">选提出人</el-button>
+							<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" format="yyyy-MM-dd"></el-date-picker></el-tooltip>
 						</el-form-item> 
 						<el-form-item label="指派给" prop="handlerUsername">
-							{{addForm.handlerUsername}} <el-button @click="sendToAsk">指派给提出人</el-button><el-button @click="sendToCreater">指派给创建人</el-button><el-button @click="showGroupUsers('handlerUsername')">选其它人</el-button>
+							{{addForm.handlerUsername}} <el-button @click="sendToAsk">指派给提出人</el-button><el-button @click="sendToCreater">指派给创建人</el-button><el-button @click="showGroupUsers('handlerUsername')">指派给其它人</el-button>
 						</el-form-item>   
 											
 						<el-form-item label="测试步骤" prop="opStep"> 
-									<vue-editor :id="'opStep'+addForm.id" :branch-id="userInfo.branchId" v-model="addForm.opStep" ref="opStep"></vue-editor>  
-		 
+							<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">  
-									<vue-editor :id="'expectResult'+addForm.id" :branch-id="userInfo.branchId" v-model="addForm.expectResult"  ref="expectResult"></vue-editor>   
+							<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"> 
-        			<vue-editor :id="'description_'+addForm.id" :branch-id="userInfo.branchId" v-model="addForm.description"></vue-editor>
+				<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 :id="'description_'+addForm.id" :branch-id="userInfo.branchId" v-model="addForm.description"></vue-editor>
+							</div> 
+        			
 				</el-form-item>    
 			</el-form>
 			<el-drawer title="选中用户" :visible.sync="selectUserVisible"  size="80%"  append-to-body   :close-on-click-modal="false">
@@ -171,6 +188,10 @@
 				selectTaskVisible:false,
 				selectMenuVisible:false,
 				selectProjectVisible:false,
+				opStepEditorVisible:false,
+				expectResultEditorVisible:false,
+				descriptionEditorVisible:false,
+
 				/**end 在上面加自定义属性**/
 			}//end return
 		},//end data
@@ -188,7 +209,19 @@
 						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
 							this.load.add=true 
 							let params = Object.assign({}, this.addForm); 
-							params.expectResult=params.expectResult.replace("<p>\n<br>\n<\p>","");
+
+							if(params.expectResult){
+								params.expectResult=params.expectResult.replace(/<p>\n<br>\n<\p>/g,"");
+								params.expectResult=params.expectResult.replace(/<p><br><\p>/g,"");
+							}
+							if(params.opStep){
+								params.opStep=params.opStep.replace(/<p>\n<br>\n<\p>/g,"");
+								params.opStep=params.opStep.replace("<p><br><\p>","");
+							}
+							if(params.description){
+								params.description=params.description.replace(/<p>\n<br>\n<\p>/g,"");
+								params.description=params.description.replace("<p><br><\p>","");
+							}
 							addXmQuestion(params).then((res) => {
 								this.load.add=false
 								var tips=res.data.tips;
@@ -377,7 +410,7 @@
 
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 
   .wf-main-context-box {  
 	border:1px dashed #000;
diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index 301593a9..b1285366 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -1,131 +1,135 @@
 <template>
-	<section class="page-container padding border">  
-			<el-row class="page-main page-height-90 padding"> 
-					<el-form :model="editForm"  :rules="editFormRules" ref="editForm">  
-								<el-row>
-									<h2>{{editForm.name}}</h2>
-									<el-tooltip content="项目"><el-tag type="warning">{{selProject.name}} </el-tag></el-tooltip> 
-									<el-divider direction="vertical"></el-divider>
-									<el-tag>{{editForm.createUsername}} 于 {{editForm.createTime}} 创建 </el-tag>
-									<el-divider direction="vertical"></el-divider>
-									<el-date-picker :clearable="false" style="width:150px;" type="date" placeholder="到期日期" v-model="editForm.endTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
-								</el-row>
-								<el-row style="padding-bottom:10px;padding-top:10px;">
-									<el-steps :active="calcBugStep" simple finish-status="success">
-										<el-step title="已激活,待确认" description="创建后自动激活、关闭后重新激活)"></el-step>
-										<el-step title="已确认,待解决" description="业务确认缺陷后变为已确认"></el-step>
-										<el-step title="已解决,待关闭" description="开发修复缺陷后，变成已解决"></el-step>
-										<el-step title="已关闭(可重新激活)" description="测试通过后变为已关闭，已关闭缺陷可以重新激活"></el-step> 
-									</el-steps>
-								</el-row>
-								<el-form-item label="隶属任务" prop="taskName">
-									<el-tag v-if="editForm.taskId!='' && editForm.taskId!=null " closable @close="handleCloseTaskTag" @click="showSelectTask">{{editForm.taskName}}</el-tag>&nbsp;&nbsp;<el-button @click="showSelectTask">选任务</el-button>
-								</el-form-item>   
-								<el-form-item label="隶属故事" prop="menuName">
-									<el-tag v-if="editForm.menuId!='' && editForm.menuId!=null " closable @close="handleCloseMenuTag" @click="showSelectMenu">{{editForm.menuName}}</el-tag>&nbsp;&nbsp;<el-button @click="showSelectMenu">选故事</el-button>
-								</el-form-item>   
-								<el-form-item label="缺陷属性" prop="priority">
-									<el-col :span="24">
-									<el-select v-model="editForm.priority" placeholder="请选择紧急程度">
-										<el-option v-for="(i,index) in options['urgencyLevel']" :label="i.optionName" :value="i.optionValue" :key="i.optionValue">{{i.optionName}}</el-option> 
-									</el-select> 
-								 
-									<el-select v-model="editForm.bugSeverity" placeholder="请选择严重程度">
-										<el-option v-for="(i,index) in options['bugSeverity']" :label="i.optionName" :value="i.optionValue" :key="i.optionValue">{{i.optionName}}</el-option> 
-									</el-select>  
-								 
-									<el-select v-model="editForm.solution" placeholder="请选择解决方案">
-										<el-option v-for="(i,index) in options['bugSolution']" :label="i.optionName" :value="i.optionValue" :key="i.optionValue">{{i.optionName}}</el-option> 
-									</el-select>   
-									</el-col>
-								</el-form-item>    
-								<el-form-item label="指派给" prop="handlerUsername">
-									{{editForm.handlerUsername}}   <el-button @click="sendToCreater">指派给创建人</el-button><el-button @click="showGroupUsers('handlerUsername')">选其它人</el-button>
-								</el-form-item>   
-							<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 style="padding:10px;"  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  style="padding:10px;"  class="wf-main-context" v-html="editForm.expectResult"></div> 
-									</div>
-									
-								</el-col> 
-								<font v-else>无</font>
-							</el-form-item> 
-							<el-form-item label="流转信息">   
-									<el-button icon="el-icon-search" v-if="flowInfoVisible==false" @click="showFlowInfo" >查询流转信息</el-button>
-									<el-button icon="el-icon-search" v-else @click="flowInfoVisible=false" >隐藏流转信息</el-button>
-								 
-								<el-col :span="24" style="padding-top:12px;">  
-								<!--列表 XmQuestionHandle xm_question_handle--> 
-									
-									<el-table v-show="flowInfoVisible" max-height="300" :data="xmQuestionHandles"   highlight-current-row v-loading="load.list" border   style="width: 100%;">
-										<el-table-column sortable type="index" width="40"></el-table-column>  
-										<el-table-column  label="处理意见"  prop="receiptMessage"  min-width="200" >
-											<template slot-scope="scope">
-												<div v-html="scope.row.receiptMessage"></div>
-											</template>
-										</el-table-column> 
-										<el-table-column prop="handlerUsername" label="指派动作" width="250"  >
-											<template slot-scope="scope">
-												<el-tag>{{scope.row.handlerUsername}}</el-tag> 指派给 <el-tag> {{scope.row.targetUsername}}  </el-tag><br><span style="font-size:8px;">{{scope.row.receiptTime}}</span>
-											</template>
-										</el-table-column>				
-										<el-table-column prop="handleStatus" label="状态"  width="80"   :formatter="formatterOption"></el-table-column>  
-										<el-table-column prop="handleSolution" label="解决方案"  width="100"   :formatter="formatterOption"></el-table-column>
+	<section class="page-container padding border">   
+		<el-row>
+			<font class="font">{{editForm.name}}</font>
+		</el-row> 
+		<el-row class="padding-bottom">
+			<el-tooltip content="项目"><el-tag type="warning">{{selProject.name}} </el-tag></el-tooltip> 
+			<el-divider direction="vertical"></el-divider>
+			<el-tag>{{editForm.createUsername}} 于 {{editForm.createTime}} 创建 </el-tag>
+			<el-divider direction="vertical"></el-divider>
+			<el-date-picker :clearable="false" style="width:150px;" type="date" placeholder="到期日期" v-model="editForm.endTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
+		</el-row> 
+		<el-row class="padding-bottom">
+			<el-steps :active="calcBugStep" simple finish-status="success">
+				<el-step title="已激活,待确认" description="创建后自动激活、关闭后重新激活)"></el-step>
+				<el-step title="已确认,待解决" description="业务确认缺陷后变为已确认"></el-step>
+				<el-step title="已解决,待关闭" description="开发修复缺陷后，变成已解决"></el-step>
+				<el-step title="已关闭(可重新激活)" description="测试通过后变为已关闭，已关闭缺陷可以重新激活"></el-step> 
+			</el-steps>
+		</el-row> 
+		<el-row class="page-main page-height-70"> 
+			<el-form :model="editForm"  :rules="editFormRules" ref="editForm">   
+					<el-form-item label="隶属任务\故事" prop="taskName">
+							 <el-tooltip content="隶属任务"><el-tag  closable @click="showSelectTask" @close.stop="handleCloseTaskTag">{{editForm.taskName?editForm.taskName:'未关联任务'}}</el-tag> </el-tooltip>
+							<el-divider direction="vertical"></el-divider>
+							<el-tooltip content="隶属故事"><el-tag  closable @click="showSelectMenu" @close.stop="handleCloseMenuTag">{{editForm.menuName?editForm.menuName:"未关联故事"}}</el-tag></el-tooltip>
+						</el-form-item>   
+					<el-form-item label="缺陷属性" prop="priority">
+						<el-col :span="24">
+						<el-select v-model="editForm.priority" placeholder="请选择紧急程度">
+							<el-option v-for="(i,index) in options['urgencyLevel']" :label="i.optionName" :value="i.optionValue" :key="i.optionValue">{{i.optionName}}</el-option> 
+						</el-select> 
+						
+						<el-select v-model="editForm.bugSeverity" placeholder="请选择严重程度">
+							<el-option v-for="(i,index) in options['bugSeverity']" :label="i.optionName" :value="i.optionValue" :key="i.optionValue">{{i.optionName}}</el-option> 
+						</el-select>  
+						
+						<el-select v-model="editForm.solution" placeholder="请选择解决方案">
+							<el-option v-for="(i,index) in options['bugSolution']" :label="i.optionName" :value="i.optionValue" :key="i.optionValue">{{i.optionName}}</el-option> 
+						</el-select>   
+						</el-col>
+					</el-form-item>    
+					<el-form-item label="指派给" prop="handlerUsername">
+						{{editForm.handlerUsername}}   <el-button @click="sendToCreater">指派给创建人</el-button><el-button @click="showGroupUsers('handlerUsername')">选其它人</el-button>
+					</el-form-item>   
+				<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-col> 
+					<font v-else>无</font>
+				</el-form-item> 
+				<el-form-item label="流转信息">   
+						<el-button icon="el-icon-search" v-if="flowInfoVisible==false" @click="showFlowInfo" >查询流转信息</el-button>
+						<el-button icon="el-icon-search" v-else @click="flowInfoVisible=false" >隐藏流转信息</el-button>
+						
+					<el-col :span="24" style="padding-top:12px;">  
+					<!--列表 XmQuestionHandle xm_question_handle--> 
+						
+						<el-table v-show="flowInfoVisible" max-height="300" :data="xmQuestionHandles"   highlight-current-row v-loading="load.list" border   style="width: 100%;">
+							<el-table-column sortable type="index" width="40"></el-table-column>  
+							<el-table-column  label="处理意见"  prop="receiptMessage"  min-width="200" >
+								<template slot-scope="scope">
+									<div v-html="scope.row.receiptMessage"></div>
+								</template>
+							</el-table-column> 
+							<el-table-column prop="handlerUsername" label="指派动作" width="250"  >
+								<template slot-scope="scope">
+									<el-tag>{{scope.row.handlerUsername}}</el-tag> 指派给 <el-tag> {{scope.row.targetUsername}}  </el-tag><br><span style="font-size:8px;">{{scope.row.receiptTime}}</span>
+								</template>
+							</el-table-column>				
+							<el-table-column prop="handleStatus" label="状态"  width="80"   :formatter="formatterOption"></el-table-column>  
+							<el-table-column prop="handleSolution" label="解决方案"  width="100"   :formatter="formatterOption"></el-table-column>
 
-									</el-table> 
-								</el-col>
-							</el-form-item>  
-							<el-form-item label="缺陷描述" prop="description">
-								<div class="wf-main-context-box" v-if="editForm.description">
-									<div  class="wf-main-context" v-html="editForm.description"></div>
-								</div>
-								<font v-else>无</font>
-							</el-form-item>  
-							<el-form-item label="上次处理意见" prop="lremark">
-								<div class="wf-main-context-box"  v-if="editForm.lremark">
-									<div   class="wf-main-context" v-html="editForm.lremark"></div>
-								</div>
-								<font v-else>无</font>
-								
-							</el-form-item>   
-							<el-form-item label="处理意见" prop="description">
-								<vue-editor :id="'description_'+editForm.id" :branch-id="userInfo.branchId" v-model="editForm.receiptMessage"></vue-editor>
-							</el-form-item>   	  
-					</el-form>  
+						</el-table> 
+					</el-col>
+				</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 label="上次处理意见" prop="lremark">
+					<el-col v-if="editForm.lremark" :span="24" >  
+					<div class="wf-main-context-box"  >
+						<div   class="wf-main-context" v-html="editForm.lremark"></div>
+					</div>
+					</el-col>
+					<font v-else>无</font>
 					
-				<el-drawer title="选中用户" :visible.sync="selectUserVisible"  size="80%"  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>
-				</el-drawer> 
-				<el-drawer title="选中任务" :visible.sync="selectTaskVisible"  size="80%" fullscreen  append-to-body   :close-on-click-modal="false">
-					<xm-task-list  :sel-project="selProject"   @task-selected="onSelectedTask"></xm-task-list>
-				</el-drawer> 	
-				
-				<el-drawer append-to-body title="故事选择" :visible.sync="selectMenuVisible"   fullscreen   :close-on-click-modal="false">
-					<xm-menu-select :is-select-menu="true"  @selected="onSelectedMenu" :sel-project="selProject"></xm-menu-select>
-				</el-drawer>	
-			</el-row> 
-			<el-row class="page-bottom page-height-10"> 
-					<el-button @click.native="handleCancel">取消</el-button>  
-					<el-button v-if="editForm.bugStatus !='closed'" v-loading="load.edit" type="primary" @click.native="handleQuestion(editForm.bugStatus)" :disabled="load.edit==true">暂存</el-button>
-					<el-button v-if="editForm.bugStatus=='active'" v-loading="load.edit" type="primary" @click.native="handleQuestion('confirmed')" :disabled="load.edit==true">确认</el-button>  
-					<el-button v-if="editForm.bugStatus=='active'" v-loading="load.edit" type="primary" @click.native="handleQuestion('active')" :disabled="load.edit==true">不是缺陷</el-button>  
-					<el-button v-if="editForm.bugStatus=='active'" v-loading="load.edit" type="primary" @click.native="handleQuestion('resolved')" :disabled="load.edit==true">直接解决</el-button>  
-					<el-button v-if="editForm.bugStatus=='active'" v-loading="load.edit" type="primary" @click.native="handleQuestion('closed')" :disabled="load.edit==true">直接关闭</el-button>  
-					<el-button v-if="editForm.bugStatus=='confirmed'" v-loading="load.edit" type="primary" @click.native="handleQuestion('resolved')" :disabled="load.edit==true">解决</el-button> 
-					<el-button v-if="editForm.bugStatus=='confirmed'" v-loading="load.edit" type="primary" @click.native="handleQuestion('closed')" :disabled="load.edit==true">关闭</el-button>  
-					<el-button v-if="editForm.bugStatus=='resolved'" v-loading="load.edit" type="primary" @click.native="handleQuestion('closed')" :disabled="load.edit==true">关闭</el-button>    
-					<el-button v-if="editForm.bugStatus=='resolved'" v-loading="load.edit" type="primary" @click.native="handleQuestion('active')" :disabled="load.edit==true">重新激活</el-button>   
-					<el-button v-if="editForm.bugStatus=='closed'" v-loading="load.edit" type="primary" @click.native="handleQuestion('active')" :disabled="load.edit==true">重新激活</el-button>    
- 			</el-row> 		 
+				</el-form-item>   
+				<el-form-item label="处理意见" prop="description">
+					<vue-editor :id="'description_'+editForm.id" :branch-id="userInfo.branchId" v-model="editForm.receiptMessage"></vue-editor>
+				</el-form-item>   	  
+			</el-form>   
+			<el-drawer title="选中用户" :visible.sync="selectUserVisible"  size="80%"  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>
+			</el-drawer> 
+			<el-drawer title="选中任务" :visible.sync="selectTaskVisible"  size="80%" fullscreen  append-to-body   :close-on-click-modal="false">
+				<xm-task-list  :sel-project="selProject"   @task-selected="onSelectedTask"></xm-task-list>
+			</el-drawer> 	
+			
+			<el-drawer append-to-body title="故事选择" :visible.sync="selectMenuVisible"   fullscreen   :close-on-click-modal="false">
+				<xm-menu-select :is-select-menu="true"  @selected="onSelectedMenu" :sel-project="selProject"></xm-menu-select>
+			</el-drawer>	
+		</el-row> 
+		<el-row class="padding"> 
+				<el-button @click.native="handleCancel">取消</el-button>  
+				<el-button v-if="editForm.bugStatus !='closed'" v-loading="load.edit" type="primary" @click.native="handleQuestion(editForm.bugStatus)" :disabled="load.edit==true">暂存</el-button>
+				<el-button v-if="editForm.bugStatus=='active'" v-loading="load.edit" type="primary" @click.native="handleQuestion('confirmed')" :disabled="load.edit==true">确认</el-button>  
+				<el-button v-if="editForm.bugStatus=='active'" v-loading="load.edit" type="primary" @click.native="handleQuestion('active')" :disabled="load.edit==true">不是缺陷</el-button>  
+				<el-button v-if="editForm.bugStatus=='active'" v-loading="load.edit" type="primary" @click.native="handleQuestion('resolved')" :disabled="load.edit==true">直接解决</el-button>  
+				<el-button v-if="editForm.bugStatus=='active'" v-loading="load.edit" type="primary" @click.native="handleQuestion('closed')" :disabled="load.edit==true">直接关闭</el-button>  
+				<el-button v-if="editForm.bugStatus=='confirmed'" v-loading="load.edit" type="primary" @click.native="handleQuestion('resolved')" :disabled="load.edit==true">解决</el-button> 
+				<el-button v-if="editForm.bugStatus=='confirmed'" v-loading="load.edit" type="primary" @click.native="handleQuestion('closed')" :disabled="load.edit==true">关闭</el-button>  
+				<el-button v-if="editForm.bugStatus=='resolved'" v-loading="load.edit" type="primary" @click.native="handleQuestion('closed')" :disabled="load.edit==true">关闭</el-button>    
+				<el-button v-if="editForm.bugStatus=='resolved'" v-loading="load.edit" type="primary" @click.native="handleQuestion('active')" :disabled="load.edit==true">重新激活</el-button>   
+				<el-button v-if="editForm.bugStatus=='closed'" v-loading="load.edit" type="primary" @click.native="handleQuestion('active')" :disabled="load.edit==true">重新激活</el-button>    
+		</el-row> 		 
 	</section>
 </template>
 
@@ -210,7 +214,7 @@
 				xmQuestionHandles:[],
 				selectTaskVisible:false,
 				flowInfoVisible:false,
-				selectMenuVisible:false,
+				selectMenuVisible:false,  
 				/**end 在上面加自定义属性**/
 			}//end return
 		},//end data
@@ -228,6 +232,19 @@
 							this.load.edit=true
 							let params = Object.assign({}, this.editForm); 
 							params.tardgetBugStatus=tardgetBugStatus;
+							
+							if(params.expectResult){
+								params.expectResult=params.expectResult.replace(/<p>\n<br>\n<\p>/g,"");
+								params.expectResult=params.expectResult.replace(/<p><br><\/p>/g,"");
+							}
+							if(params.opStep){
+								params.opStep=params.opStep.replace(/<p>\n<br>\n<\/p>/g,"");
+								params.opStep=params.opStep.replace(/<p><br><\/p>/g,"");
+							}
+							if(params.description){
+								params.description=params.description.replace(/<p>\n<br>\n<\/p>/g,"");
+								params.description=params.description.replace(/<p><br><\/p>/g,"");
+							}
 							editXmQuestion(params).then((res) => {
 								this.load.edit=false
 								var tips=res.data.tips;
@@ -419,15 +436,18 @@
 
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
   .wf-main-context-box {  
 	border:1px dashed #000;
-	margin-bottom: 10px;
-	margin-top: 30px;  
 	padding:10px;
 }
  .wf-main-context p { 
 	color: #585858;  
+	display: block;
+    margin-block-start: 0em !important;
+    margin-block-end: 0em !important;
+    margin-inline-start: 0px !important;
+    margin-inline-end: 0px !important; 
 }
 	
 .wf-main-context   p  > img {
diff --git a/src/views/xm/core/xmTask/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue
index 2d38d9aa..c8f43ee0 100644
--- a/src/views/xm/core/xmTask/XmTaskAdd.vue
+++ b/src/views/xm/core/xmTask/XmTaskAdd.vue
@@ -1,14 +1,12 @@
 <template>
-	<section class="page-container padding">
+	<section class="page-container page-full-height padding">
 		<el-row>
 			<el-button type="text" @click="goAnchor('baseInfoAdd')">基础信息</el-button>
 			<el-button type="text" @click="goAnchor('planInfoAdd')">进度计划</el-button>
 			<el-button type="text" @click="goAnchor('costInfoAdd')">工作量与成本</el-button>
 			<el-button type="text" @click="goAnchor('settleInfoAdd')">结算信息</el-button>
 			<el-button type="text" @click="goAnchor('menuInfoAdd')">故事明细</el-button>
-			<el-button type="text" @click="goAnchor('taskOutAdd')">众包</el-button>
-		</el-row>
-		<el-row>  
+			<el-button type="text" @click="goAnchor('taskOutAdd')">众包</el-button> 
 			<el-steps :active="calcTaskStep" finish-status="success" simple>
 				<el-step title="发布" description="任务创建成功后即发布"></el-step>
 				<el-step title="竞标" description="候选人参与竞标，或者由责任人主动设置候选人"></el-step>
@@ -19,16 +17,10 @@
 				<el-step title="提现" description="企业付款完成后，个人对钱包中余额进行提现"></el-step> 
 			</el-steps>
 		</el-row>
-		<el-row class="page-main page-height-80">
+		<el-row class="page-main page-height-70">
 			<!--新增界面 XmTask xm_task-->
 			<el-form :model="addForm"  label-width="100px" :rules="addFormRules" ref="addForm">
-				<el-card class="box-card" header="基础信息" id="baseInfoAdd" shadow="hover">
-					<el-steps :active="calcTaskStep" align-center finish-status="success">
-						<el-step title="待领取"></el-step>
-						<el-step title="执行中"></el-step>
-						<el-step title="已完工待结算"></el-step>
-						<el-step title="已结算"></el-step>
-					</el-steps>
+				<el-card class="box-card" header="基础信息" id="baseInfoAdd" shadow="hover"> 
 					<el-form-item label="任务名称" prop="name">
 						<el-row>
 						<el-col :span="24" style="padding-left:10px;">
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index de58db53..69f654b1 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -6,9 +6,7 @@
 			<el-button type="text" @click="goAnchor('costInfo')">工作量与成本</el-button>
 			<el-button type="text" @click="goAnchor('settleInfo')">结算信息</el-button>
 			<el-button type="text" @click="goAnchor('menuInfo')">故事明细</el-button> 
-			<el-button type="text" @click="goAnchor('taskOut')">众包</el-button>  
-		</el-row>
-		<el-row> 
+			<el-button type="text" @click="goAnchor('taskOut')">众包</el-button>   
 			<el-steps :active="calcTaskStep" finish-status="success" simple>
 			<el-step title="发布" description="任务创建成功后即发布"></el-step>
 			<el-step title="竞标" description="候选人参与竞标，或者由责任人主动设置候选人"></el-step>
@@ -19,7 +17,7 @@
 			<el-step title="提现" description="企业付款完成后，个人对钱包中余额进行提现"></el-step> 
 		</el-steps>
 		</el-row>
-		<el-row class="page-main page-height-80">
+		<el-row class="page-main page-height-70">
 			<!--新增界面 XmTask xm_task--> 
 			<el-form :model="editForm"  label-width="100px" :rules="editFormRules" ref="editForm">     
 				<el-card class="box-card" header="基础信息" id="baseInfo" shadow="hover"> 
@@ -164,7 +162,7 @@
 				 </el-card>  
 			</el-form>  
 		</el-row>
-		<el-row class="page-bottom padding">
+		<el-row class="padding">
 			<el-button @click.native="handleCancel">取消</el-button>  
 			<el-button v-loading="load.edit" type="primary" @click.native="editSubmit" :disabled="load.edit==true">提交</el-button>   	
 		</el-row>