From 382e09eb05925c352832d63094778af601295d2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 16 Jul 2021 00:21:26 +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

---
 src/views/xm/core/xmMenu/XmMenuMng.vue          |  8 ++++----
 src/views/xm/core/xmQuestion/XmQuestionEdit.vue | 15 +++++++++++++--
 src/views/xm/core/xmQuestion/XmQuestionMng.vue  |  4 ++--
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 5c196a1d..b1aa57ba 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -93,7 +93,7 @@
 					
 					</el-row>
 					<el-row class="padding-top">  
-						<el-table  ref="table" :height="tableHeight" :data="xmMenusTreeData" default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick">
+						<el-table size="mini"  stripe fit border ref="table" :height="tableHeight" :data="xmMenusTreeData" default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick">
 							<el-table-column sortable type="selection" width="40"></el-table-column> 
 							<el-table-column prop="menuName" label="故事名称" min-width="160" show-overflow-tooltip> 
 								<template slot-scope="scope">
@@ -113,7 +113,7 @@
 											<el-tag slot="reference" icon="el-icon-chat-line-square">描述</el-tag>
 										</el-popover>
 									
-										<el-button type="primary"  @click="showSubAdd( scope.row,scope.$index)" icon="el-icon-plus" circle></el-button> 
+										<el-button  size="mini" type="primary"  @click="showSubAdd( scope.row,scope.$index)" icon="el-icon-plus" circle></el-button> 
  											
 										<el-popover style="padding-left:10px;"
 											v-if="isPmUser"
@@ -132,11 +132,11 @@
 													<el-button v-if="selProject"  type="primary" @click="showTasks(scope.row,scope.$index)"  icon="el-icon-s-operation">查看任务</el-button> 
 												</el-col> 
 												<el-col  :span="24"  style="padding-top:5px;"> 
-													<el-button   type="primary" @click="toIterationList(scope.row,scope.$index)"  icon="el-icon-document-copy">查看迭代计划</el-button>
+													<el-button  type="primary" @click="toIterationList(scope.row,scope.$index)"  icon="el-icon-document-copy">查看迭代计划</el-button>
 												</el-col> 
 											</el-row>  
 
-											<el-button slot="reference" icon="el-icon-more" circle></el-button>
+											<el-button  size="mini" slot="reference" icon="el-icon-more" circle></el-button>
 										</el-popover> 
 									</font>
 								</template>
diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index b1285366..a7796e7f 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -102,8 +102,18 @@
 					<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 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="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-form>   
 			<el-drawer title="选中用户" :visible.sync="selectUserVisible"  size="80%"  append-to-body   :close-on-click-modal="false">
@@ -215,6 +225,7 @@
 				selectTaskVisible:false,
 				flowInfoVisible:false,
 				selectMenuVisible:false,  
+				receiptMessageEditorVisible:false,
 				/**end 在上面加自定义属性**/
 			}//end return
 		},//end data
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index 929f6bcf..531bc631 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -122,7 +122,7 @@
 			 </el-row>
 			 <el-row class="padding-top">
 				<!--列表 XmQuestion xm_question-->
-				<el-table ref="table" :height="tableHeight" :data="xmQuestions" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+				<el-table size="mini" ref="table" :height="tableHeight" :data="xmQuestions" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
  					<el-table-column prop="name" label="缺陷名称"  min-width="200">
 						<template slot-scope="scope">
 							<div>
@@ -151,7 +151,7 @@
 									<el-tag v-else-if="scope.row.flowState=='3'">未通过</el-tag>
 									<el-tag v-else-if="scope.row.flowState=='4'">已取消</el-tag>
 									</el-tooltip>
-									<el-button icon="el-icon-upload2" v-if="!scope.row.flowState"    @click="handleCommand({type:'sendToProcessApprova',data:scope.row,bizKey:'xm_question_up_approva'})">{{qtype=='risk'?'升级':'升级'}}</el-button>
+									<el-button icon="el-icon-upload2" v-if="!scope.row.flowState" type="text"   @click="handleCommand({type:'sendToProcessApprova',data:scope.row,bizKey:'xm_question_up_approva'})">{{qtype=='risk'?'升级':'升级'}}</el-button>
 								</span>
 								<el-badge :value="getBadge(scope.row)">
 												<el-link type="primary" @click="showEdit(scope.row)">{{scope.row.name}}</el-link>