From fe16ca4589d8da17b4f71ac1a30fbb1f01634d27 Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Wed, 4 Jan 2023 15:54:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E5=92=8C?=
 =?UTF-8?q?=E4=B8=8D=E9=80=9A=E8=BF=87=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E5=AE=A1=E6=A0=B8=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/admin/business/process-completed.ftl  | 4 ++--
 .../resources/templates/admin/business/process-review.ftl     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/templates/admin/business/process-completed.ftl b/src/main/resources/templates/admin/business/process-completed.ftl
index 9513f93..8cdd13f 100644
--- a/src/main/resources/templates/admin/business/process-completed.ftl
+++ b/src/main/resources/templates/admin/business/process-completed.ftl
@@ -109,7 +109,7 @@
                 <span>{{scope.row.processType | processType}}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="applyPersonName" label="申请人" width="100"></el-table-column>
+            <el-table-column prop="applyPersonName" label="申请人" width="120"></el-table-column>
             <el-table-column prop="status" label="审核状态" width="100">
               <template slot-scope="scope">
                 <span>{{scope.row.status | processStatus}}</span>
@@ -117,7 +117,7 @@
             </el-table-column>
             <el-table-column prop="currentAudit" label="当前审核人" width="100">
               <template slot-scope="scope">
-                <span v-if="scope.row.status!=='audit_passed' || scope.row.status==='audit_not_passed'">{{scope.row.currentAudit}}</span>
+                <span v-if="scope.row.status!=='audit_passed' && scope.row.status!=='audit_not_passed'">{{scope.row.currentAudit}}</span>
               </template>
             </el-table-column>
             <el-table-column prop="lastUpdateAt" label="最后更新时间" width="170"></el-table-column>
diff --git a/src/main/resources/templates/admin/business/process-review.ftl b/src/main/resources/templates/admin/business/process-review.ftl
index 9b56b10..c3341d8 100644
--- a/src/main/resources/templates/admin/business/process-review.ftl
+++ b/src/main/resources/templates/admin/business/process-review.ftl
@@ -101,7 +101,7 @@
                 <span>{{scope.row.processType | processType}}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="applyPersonName" label="申请人" width="100"></el-table-column>
+            <el-table-column prop="applyPersonName" label="申请人" width="120"></el-table-column>
             <el-table-column prop="status" label="审核状态" width="100">
               <template slot-scope="scope">
                 <span>{{scope.row.status | processStatus}}</span>