From 98525721de9d5806a077161b0d46d2dc66d1769b Mon Sep 17 00:00:00 2001
From: Decadence <leizhang9527@163.com>
Date: Wed, 8 Jun 2022 09:41:01 +0000
Subject: [PATCH] =?UTF-8?q?!26=20=E6=B5=81=E7=A8=8B=E6=AD=A5=E9=AA=A4?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=98=BE=E7=A4=BA=E6=B5=81=E8=BD=AC=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=20*=20=E6=B5=81=E7=A8=8B=E6=AD=A5=E9=AA=A4=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=98=BE=E7=A4=BA=E6=B5=81=E8=BD=AC=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WfInstanceServiceImpl.java   |  1 +
 .../src/components/ProcessViewer/index.vue    | 21 ++++++++-----------
 ruoyi-ui/src/views/workflow/work/detail.vue   |  2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfInstanceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfInstanceServiceImpl.java
index 8da38c64..de0362e6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfInstanceServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfInstanceServiceImpl.java
@@ -138,6 +138,7 @@ public class WfInstanceServiceImpl extends FlowServiceFactory implements IWfInst
                 WfTaskVo taskVo = new WfTaskVo();
                 taskVo.setProcDefId(taskInstance.getProcessDefinitionId());
                 taskVo.setTaskId(taskInstance.getId());
+                taskVo.setTaskDefKey(taskInstance.getTaskDefinitionKey());
                 taskVo.setTaskName(taskInstance.getName());
                 taskVo.setCreateTime(taskInstance.getStartTime());
                 taskVo.setFinishTime(taskInstance.getEndTime());
diff --git a/ruoyi-ui/src/components/ProcessViewer/index.vue b/ruoyi-ui/src/components/ProcessViewer/index.vue
index f30cabea..15636f5a 100644
--- a/ruoyi-ui/src/components/ProcessViewer/index.vue
+++ b/ruoyi-ui/src/components/ProcessViewer/index.vue
@@ -22,21 +22,18 @@
     <!-- 已完成节点悬浮弹窗 -->
     <el-dialog class="comment-dialog" :title="dlgTitle || '审批记录'" :visible.sync="dialogVisible">
       <el-row>
-        <el-table :data="taskCommentList" size="mini" border header-cell-class-name="table-header-gray" height="500px">
+        <el-table :data="taskCommentList" size="mini" border header-cell-class-name="table-header-gray">
           <el-table-column label="序号" header-align="center" align="center" type="index" width="55px" />
-          <el-table-column label="执行人" prop="createUsername" width="150px" />
-          <el-table-column label="操作" width="150px">
+          <el-table-column label="候选办理" prop="candidate" width="150px" align="center"/>
+          <el-table-column label="实际办理" prop="assigneeName" width="100px" align="center"/>
+          <el-table-column label="处理时间" prop="createTime" width="140px" align="center"/>
+          <el-table-column label="办结时间" prop="finishTime" width="140px" align="center" />
+          <el-table-column label="耗时" prop="duration" width="100px" align="center"/>
+          <el-table-column label="审批意见" align="center">
             <template slot-scope="scope">
-              <el-tag size="mini" :type="getOperationTagType(scope.row.approvalType)" effect="dark">{{SysFlowTaskOperationType.getValue(scope.row.approvalType)}}</el-tag>
-              <el-tag v-if="scope.row.delegateAssginee != null" size="mini" type="success" effect="plain" style="margin-left: 10px;">{{scope.row.delegateAssginee}}</el-tag>
+              {{scope.row.commentList&&scope.row.commentList[0]?scope.row.commentList[0].fullMessage:''}}
             </template>
           </el-table-column>
-          <el-table-column label="审批意见">
-            <template slot-scope="scope">
-              <span>{{scope.row.comment ? scope.row.comment : ''}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="处理时间" prop="createTime" width="160px" />
         </el-table>
       </el-row>
     </el-dialog>
@@ -181,7 +178,7 @@ export default {
       this.dlgTitle = element.businessObject ? element.businessObject.name : undefined;
       // 计算当前悬浮任务审批记录，如果记录为空不显示弹窗
       this.taskCommentList = (this.allCommentList || []).filter(item => {
-        return item.taskKey === this.selectTaskId;
+        return item.taskDefKey === this.selectTaskId;
       });
       this.dialogVisible = true;
     },
diff --git a/ruoyi-ui/src/views/workflow/work/detail.vue b/ruoyi-ui/src/views/workflow/work/detail.vue
index e3dc434c..f7e726e1 100644
--- a/ruoyi-ui/src/views/workflow/work/detail.vue
+++ b/ruoyi-ui/src/views/workflow/work/detail.vue
@@ -98,7 +98,7 @@
       <el-tab-pane label="流程跟踪" name="track">
         <el-card class="box-card" shadow="never">
           <process-viewer :key="`designer-${loadIndex}`" :style="'height:' + height" :xml="xmlData"
-                          :finishedInfo="finishedInfo" :allCommentList="null"
+                          :finishedInfo="finishedInfo" :allCommentList="flowRecordList"
           />
         </el-card>
       </el-tab-pane>