From 929e1930ff7aab3d9a2aa6a1e580b98808047719 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 23 Feb 2023 17:44:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=B5=81=E7=A8=8B=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E8=AE=B0=E5=BD=95--=E5=A2=9E=E5=8A=A0=E8=AF=84?=
 =?UTF-8?q?=E8=AE=BA=E8=AE=B0=E5=BD=95=E7=9A=84=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 anrui-system-ui/src/api/workflow/finished.js  |  6 +-
 .../src/components/flow/flowRecord.vue        | 63 +++++++++++--------
 anrui-system-ui/src/views/flow/doneList.vue   |  2 +-
 anrui-system-ui/src/views/flow/todoList.vue   |  2 +-
 4 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/anrui-system-ui/src/api/workflow/finished.js b/anrui-system-ui/src/api/workflow/finished.js
index d6d23d7d6c..5cb3fddd04 100644
--- a/anrui-system-ui/src/api/workflow/finished.js
+++ b/anrui-system-ui/src/api/workflow/finished.js
@@ -15,7 +15,7 @@ export function finishedList(query) {
 // 任务流转记录
 export function flowRecord(query) {
   return request({
-    url: '/portal/v1/flow/task/flowRecord/' + query.procInsId + "/" + query.deployId,
+    url: '/portal/v1/flow/task/flowRecordAndComment/' + query.procInsId + '/' + query.deployId,
     method: 'get',
     params: query
   })
@@ -23,7 +23,7 @@ export function flowRecord(query) {
 
 // 撤回任务
 export function revokeProcess(data) {
-  const userSid = data.userSid;
+  const userSid = data.userSid
   return request({
     url: '/portal/v1/flow/task/revokeProcess/' + userSid,
     method: 'post',
@@ -39,7 +39,7 @@ export function revokeProcess(data) {
 export function deployStart(deployId) {
   return request({
     url: '/flowable/process/startFlow/' + deployId,
-    method: 'get',
+    method: 'get'
   })
 }
 
diff --git a/anrui-system-ui/src/components/flow/flowRecord.vue b/anrui-system-ui/src/components/flow/flowRecord.vue
index bdd0745aa3..02a8378e59 100644
--- a/anrui-system-ui/src/components/flow/flowRecord.vue
+++ b/anrui-system-ui/src/components/flow/flowRecord.vue
@@ -10,35 +10,48 @@
           </div>
           <div style="width:50%;;float:left;border-left: 1px solid blue">
             <el-timeline>
-              <el-timeline-item v-for="(item,index ) in flowRecordList" :key="index" :icon="setIcon(item.finishTime)" :color="setColor(item.finishTime)">
-                <p style="font-weight: 700">{{ item.taskName }}</p>
-                <el-card :body-style="{ padding: '10px' }">
-                  <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: flex-start">
+              <el-timeline-item v-for="(item,index ) in flowRecordList" :key="index" :icon="setIcon(item.time)" :color="setColor(item.time)">
+                <div v-if="item.flowableRecordVo !== null">
+                  <p style="font-weight: 700">{{ item.flowableRecordVo.taskName }}</p>
+                  <el-card :body-style="{ padding: '10px' }">
+                    <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: flex-start">
+                      <div>
+                        <label v-if="item.flowableRecordVo.taskUserInfos" style="font-weight: normal;margin-right: 30px;">实际办理：
+                          <span v-for="(items, index ) in item.flowableRecordVo.taskUserInfos" :key="index">{{ items.assigneeName }},</span>
+                          <!-- <el-tag type="info" size="mini">{{item.deptName}}</el-tag>-->
+                        </label>
+                        <label v-if="item.flowableRecordVo.candidate" style="font-weight: normal;margin-right: 30px;">候选办理：{{ item.flowableRecordVo.candidate }}</label><br>
+                        <label style="font-weight: normal">接收时间： </label><label style="color:#8a909c;font-weight: normal">{{ item.flowableRecordVo.createTime }}</label><br>
+                        <label v-if="item.flowableRecordVo.finishTime" style="font-weight: normal">办理时间： </label>
+                        <label style="color:#8a909c;font-weight: normal">{{ item.flowableRecordVo.finishTime }}</label><br>
+                      </div>
+                      <div>
+                        <label v-if="item.duration" style="font-weight: normal">耗时：</label>
+                        <label style="color:red;font-weight: normal">{{ item.duration }}</label>
+                      </div>
+                    </div>
                     <div>
-                      <label v-if="item.taskUserInfos" style="font-weight: normal;margin-right: 30px;">实际办理：
-                        <span v-for="(items, index ) in item.taskUserInfos" :key="index">{{ items.assigneeName }},</span>
-                        <!-- <el-tag type="info" size="mini">{{item.deptName}}</el-tag>-->
-                      </label>
-                      <label v-if="item.candidate" style="font-weight: normal;margin-right: 30px;">候选办理：{{ item.candidate }}</label><br>
-                      <label style="font-weight: normal">接收时间： </label><label style="color:#8a909c;font-weight: normal">{{ item.createTime }}</label><br>
-                      <label v-if="item.finishTime" style="font-weight: normal">办理时间： </label>
-                      <label style="color:#8a909c;font-weight: normal">{{ item.finishTime }}</label><br>
+                      <p v-if="item.comment">
+                        <el-tag type="success" v-if="item.comment.type === '1'"> {{ item.comment.comment }}</el-tag>
+                        <el-tag type="warning" v-if="item.comment.type === '2'"> {{ item.comment.comment }}</el-tag>
+                        <el-tag type="danger" v-if="item.comment.type === '3'"> {{ item.comment.comment }}</el-tag>
+                        <el-tag type="danger" v-if="item.comment.type === '7'"> {{ item.comment.comment }}</el-tag>
+                        <el-tag type="danger" v-if="item.comment.type === '6'"> {{ item.comment.comment }}</el-tag>
+                      </p>
                     </div>
+                  </el-card>
+                </div>
+                <div v-else>
+                  <p style="font-weight: 700">{{ item.processCommentVo.title }}</p>
+                  <el-card :body-style="{ padding: '10px' }">
                     <div>
-                      <label v-if="item.duration" style="font-weight: normal">耗时：</label>
-                      <label style="color:red;font-weight: normal">{{ item.duration }}</label>
+                      <div>
+                        <label style="font-weight: normal">评论时间： </label><label style="color:#8a909c;font-weight: normal">{{ item.processCommentVo.time }}</label><br>
+                        <label style="font-weight: normal">评论内容： </label><label style="color:#8a909c;font-weight: normal">{{ item.processCommentVo.content }}</label>
+                      </div>
                     </div>
-                  </div>
-                  <div>
-                    <p v-if="item.comment">
-                      <el-tag type="success" v-if="item.comment.type === '1'"> {{ item.comment.comment }}</el-tag>
-                      <el-tag type="warning" v-if="item.comment.type === '2'"> {{ item.comment.comment }}</el-tag>
-                      <el-tag type="danger" v-if="item.comment.type === '3'"> {{ item.comment.comment }}</el-tag>
-                      <el-tag type="danger" v-if="item.comment.type === '7'"> {{ item.comment.comment }}</el-tag>
-                      <el-tag type="danger" v-if="item.comment.type === '6'"> {{ item.comment.comment }}</el-tag>
-                    </p>
-                  </div>
-                </el-card>
+                  </el-card>
+                </div>
               </el-timeline-item>
             </el-timeline>
           </div>
diff --git a/anrui-system-ui/src/views/flow/doneList.vue b/anrui-system-ui/src/views/flow/doneList.vue
index af632b69c9..947edc1b01 100644
--- a/anrui-system-ui/src/views/flow/doneList.vue
+++ b/anrui-system-ui/src/views/flow/doneList.vue
@@ -345,7 +345,7 @@ import flowRecords from '@/components/flow/flowRecord'
         var token = getStorage()
         const params = { procInsId: procInsId, deployId: deployId, token: token }
         flowRecord(params).then(res => {
-          this.flowRecordList = res.data.flowList
+          this.flowRecordList = res.data
           // 流程过程中不存在初始化表单 直接读取的流程变量中存储的表单值
           if (res.data.formData) {
             this.formConf = res.data.formData
diff --git a/anrui-system-ui/src/views/flow/todoList.vue b/anrui-system-ui/src/views/flow/todoList.vue
index 7e6062a24d..a5399d0dc0 100644
--- a/anrui-system-ui/src/views/flow/todoList.vue
+++ b/anrui-system-ui/src/views/flow/todoList.vue
@@ -430,7 +430,7 @@ export default {
         var token = getStorage()
         const params = {procInsId: procInsId, deployId: deployId,token: token }
         flowRecord(params).then(res => {
-          this.flowRecordList = res.data.flowList
+          this.flowRecordList = res.data
           // 流程过程中不存在初始化表单 直接读取的流程变量中存储的表单值
           if (res.data.formData) {
             this.formConf = res.data.formData