From 80fba9cc5ce9b16cdb41d4dc137ec5f7444d4cbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 11 Dec 2022 18:56:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=BA=E9=99=B7=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmQuestion/XmQuestionEdit.vue |  9 +++------
 src/views/xm/core/xmQuestion/XmQuestionMng.vue  |  4 ++--
 .../xmQuestionHandle/XmQuestionHandleMng.vue    | 17 +++++++++++++++--
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index 07181963..10aa6e1f 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -146,12 +146,9 @@
 									<el-tab-pane :label="'工时( '+(editForm.actWorkload?editForm.actWorkload:0)+' / '+(editForm.budgetWorkload?editForm.budgetWorkload:0)+' h )'" name="55"> 
 										<xm-workload-record v-if="activateTabPaneName=='55'" biz-type="2" :xm-question="editForm" ></xm-workload-record>
 									</el-tab-pane>
-									<el-tab-pane label="日志" name="4" v-if="opType!='add'"> 
-										<el-row> 
-												<xm-question-handle-mng v-if="activateTabPaneName=='4'" :bug="editForm" :visible="activateTabPaneName=='4'"></xm-question-handle-mng>
-											 
-										</el-row>
-									</el-tab-pane>  
+									<el-tab-pane label="日志" name="4" v-if="opType!='add'">  
+										<xm-question-handle-mng v-if="activateTabPaneName=='4'" :bug="editForm" :visible="activateTabPaneName=='4'"></xm-question-handle-mng>
+ 									</el-tab-pane>  
 									<el-tab-pane label="关注" name="91" v-if="opType!='add'"> 
 										<xm-my-do-focus v-if="activateTabPaneName=='91'" :biz-id="editForm.id" :pbiz-id="editForm.projectId" :biz-name="editForm.name" focus-type="5"></xm-my-do-focus>
 									</el-tab-pane>
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index d65b7642..3020eb89 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -206,12 +206,12 @@
 				<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="90%"  top="20px"  :close-on-click-modal="false" append-to-body>
+			<el-dialog  title="编辑缺陷"   :visible.sync="editFormVisible"   fullscreen  top="10px"  :close-on-click-modal="false" append-to-body>
 					<xm-question-edit :sel-project=" {id:editForm.projectId,name:editForm.projectName} " :xm-question="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit" @edit-fields="onEditFields"></xm-question-edit>
 			</el-dialog>
 
 			<!--新增 XmQuestion xm_question界面-->
-			<el-dialog title="新增缺陷"  :visible.sync="addFormVisible"   width="90%" top="20px"  append-to-body   :close-on-click-modal="false">
+			<el-dialog title="新增缺陷"  :visible.sync="addFormVisible"   width="90%" top="10px"  append-to-body   :close-on-click-modal="false">
 				<xm-question-add  :xm-menu="xmMenu" op-type="add" :xm-test-plan-case="xmTestPlanCase" :xm-test-plan="xmTestPlan" :xm-product="filters.product" :xm-test-case="xmTestCase" :qtype="qtype" :sel-project=" filters.selProject " :xm-question="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-question-add>
 			</el-dialog>
  			<xm-group-dialog ref="xmGroupDialog" :sel-project=" filters.selProject " :is-select-single-user="1" @user-confirm="onUserConfirm"></xm-group-dialog> 
diff --git a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue
index 1a0dcabe..d8bf7223 100644
--- a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue
+++ b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue
@@ -11,13 +11,21 @@
 				</el-table-column>  
 				<el-table-column prop="receiptMessage" label="处理意见" min-width="150" > 
 					<template slot-scope="scope"> 
-						<div style="max-height:100px;overflow:auto;" v-html="scope.row.receiptMessage"></div>
+						<div style="max-height:100px;overflow:auto;" v-html="scope.row.receiptMessage" @click="showBigDialog(scope.row)"></div>
 					</template> 
 				</el-table-column>
 				<el-table-column prop="receiptTime" label="时间" width="150" ></el-table-column>  
  			</el-table>
 			<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>
+
+		<el-dialog append-to-body
+			title="处理意见"
+			:visible.sync="bigDialogVisible"
+			width="850px" top="20px"
+			center>
+			<div v-html="editForm.receiptMessage"> </div> 
+			</el-dialog>
 	</section>
 </template>
 
@@ -75,6 +83,7 @@
 					id:'',handlerUserid:'',handlerUsername:'',handleSolution:'',receiptMessage:'',receiptTime:'',handleStatus:'',bizProcInstId:'',bizFlowState:'',questionId:'',lastUpdateTime:'',createTime:'',actWorkload:'',actCostAmount:'',urls:'',targetUserid:'',targetUsername:''
 				},
 				tableHeight:300,
+				bigDialogVisible:false,
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
@@ -205,6 +214,10 @@
 			},
 			rowClick: function(row, event, column){
 				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
+			},
+			showBigDialog(row){
+				this.editForm=row
+				this.bigDialogVisible=true;
 			}
 			/**begin 自定义函数请在下面加**/
 			
@@ -224,7 +237,7 @@
 					 this.dicts=res.data.data
 				}
 			});
-				this.tableHeight = util.calcTableMaxHeight(this.$refs.table.$el); 
+				this.tableHeight = util.calcTableMaxHeight(this.$refs.table.$el)-50; 
 				this.getXmQuestionHandles();
         	}); 
 		}