From 8fd5837d851ffb7ac7a2bfc74e4d2d2eaf0e68c5 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Tue, 31 Aug 2021 02:14:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newOaWorkflowDetail/newOaWorkflowDetail.html       |  8 ++++----
 .../newOaWorkflowDetail/newOaWorkflowDetail.js         | 10 +++++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/public/pages/property/newOaWorkflowDetail/newOaWorkflowDetail.html b/public/pages/property/newOaWorkflowDetail/newOaWorkflowDetail.html
index e2cb7295e..8dd92ec1c 100644
--- a/public/pages/property/newOaWorkflowDetail/newOaWorkflowDetail.html
+++ b/public/pages/property/newOaWorkflowDetail/newOaWorkflowDetail.html
@@ -72,11 +72,11 @@
                                 <td scope="row" class="text-center">{{index+1}}</td>
                                 <td scope="row" class="text-center" v-if="item.orgName">{{item.orgName}}</td>
                                 <td scope="row" class="text-center" v-else>管理员</td>
-                                <td class="text-center" v-if="item.userName">{{item.userName}}</td>
-                                <td class="text-center" v-else>{{item.auditName}}</td>
-                                <td class="text-center">{{item.stateName}}</td>
+                                <td class="text-center">{{item.staffName}}</td>
+                                <td class="text-center" v-if="item.endTime">处理完成</td>
+                                <td class="text-center" v-else>正在处理</td>
                                 <td class="text-center">{{item.duration}}</td>
-                                <td class="text-center">{{item.message}}</td>
+                                <td class="text-center">{{item.context}}</td>
                             </tr>
                         </tbody>
                     </table>
diff --git a/public/pages/property/newOaWorkflowDetail/newOaWorkflowDetail.js b/public/pages/property/newOaWorkflowDetail/newOaWorkflowDetail.js
index d8c7cb7be..3db3b6932 100644
--- a/public/pages/property/newOaWorkflowDetail/newOaWorkflowDetail.js
+++ b/public/pages/property/newOaWorkflowDetail/newOaWorkflowDetail.js
@@ -15,7 +15,7 @@
                     staffName: '',
                     taskId: ''
                 },
-                nextAudit:{}
+                nextAudit: {}
             }
         },
         _initMethod: function () {
@@ -80,11 +80,15 @@
                 var param = {
                     params: {
                         communityId: vc.getCurrentCommunity().communityId,
-                        businessKey: $that.newOaWorkflowDetailInfo.id
+                        id: $that.newOaWorkflowDetailInfo.id,
+                        flowId: $that.newOaWorkflowDetailInfo.flowId,
+                        page:1,
+                        row:10
                     }
                 };
                 //发送get请求
-                vc.http.apiGet('workflow.listWorkflowAuditInfo',
+                //vc.http.apiGet('workflow.listWorkflowAuditInfo',
+                vc.http.apiGet('/oaWorkflow/queryOaWorkflowUser',
                     param,
                     function (json, res) {
                         var _workflowManageInfo = JSON.parse(json);