From 290d871aa1324dd9cd96b965d045f22cdbeb772d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 31 Mar 2022 11:42:02 +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

---
 public/components/common/flowAudit/flowAudit.js            | 7 ++++++-
 .../contractApplyAuditOrders/contractApplyAuditOrders.html | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/public/components/common/flowAudit/flowAudit.js b/public/components/common/flowAudit/flowAudit.js
index 013879bd9..eaa438e0f 100644
--- a/public/components/common/flowAudit/flowAudit.js
+++ b/public/components/common/flowAudit/flowAudit.js
@@ -93,7 +93,12 @@
             clearAddBasePrivilegeInfo: function() {
                 vc.component.flowAuditInfo = {
                     state: '',
-                    remark: ''
+                    remark: '',
+                    taskId: '',
+                    startUserId: '',
+                    assignee: '',
+                    staffId: '',
+                    staffName: ''
                 }
             },
             _listWorkflow: function() {
diff --git a/public/pages/admin/contractApplyAuditOrders/contractApplyAuditOrders.html b/public/pages/admin/contractApplyAuditOrders/contractApplyAuditOrders.html
index 2fa3c1418..63abe0faa 100644
--- a/public/pages/admin/contractApplyAuditOrders/contractApplyAuditOrders.html
+++ b/public/pages/admin/contractApplyAuditOrders/contractApplyAuditOrders.html
@@ -33,11 +33,11 @@
                                     </div>
                                     <div>
                                         <!--v-if="contractApplyAuditOrdersInfo.currentUserId != auditOrder.startUserId"-->
-                                        <div class="btn-group" v-if="auditOrder.state == '11' || auditOrder.state == '55'">
+                                        <div class="btn-group" v-if="auditOrder.hasAudit && !auditOrder.hasEnd">
                                             <button class="btn-white btn btn-xs" v-on:click="_openAuditOrderModel(auditOrder)">审批
                                             </button>
                                         </div>
-                                        <div class="btn-group" v-else>
+                                        <div class="btn-group" v-if="auditOrder.hasEnd">
                                             <button class="btn-white btn btn-xs" v-on:click="_finishAuditOrder(auditOrder)">结束
                                             </button>
                                         </div>