From d1bae8fbf9d11c482525419aa6fcaf29f9bf39b6 Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Wed, 4 Jan 2023 15:27:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BA=BA=E9=97=B4=E8=B7=9D?=
 =?UTF-8?q?=EF=BC=8C=E8=AF=A6=E6=83=85=E7=95=8C=E9=9D=A2=20=E5=9E=AB?=
 =?UTF-8?q?=E8=B5=84=E9=87=91=E9=A2=9D=20=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/admin/business/process-completed.ftl   | 2 +-
 src/main/resources/templates/admin/business/process-detail.ftl | 3 ++-
 src/main/resources/templates/admin/business/process-review.ftl | 2 +-
 3 files changed, 4 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 424ea0d..7671a18 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="申请人"></el-table-column>
+            <el-table-column prop="applyPersonName" label="申请人" width="100"></el-table-column>
             <el-table-column prop="status" label="审核状态" width="100">
               <template slot-scope="scope">
                 <span>{{scope.row.status | processStatus}}</span>
diff --git a/src/main/resources/templates/admin/business/process-detail.ftl b/src/main/resources/templates/admin/business/process-detail.ftl
index 6171fe7..1f91898 100644
--- a/src/main/resources/templates/admin/business/process-detail.ftl
+++ b/src/main/resources/templates/admin/business/process-detail.ftl
@@ -94,7 +94,8 @@
 
           <el-descriptions-item label="税率">{{process.taxRate}}%</el-descriptions-item>
           <el-descriptions-item label="是否垫资">${isPrepaid}</el-descriptions-item>
-          <el-descriptions-item label="垫资金额">${repaidAmount}元</el-descriptions-item>
+          <el-descriptions-item label="垫资金额" v-if="isPrepaid!=='否'">${repaidAmount}元</el-descriptions-item>
+
           <el-descriptions-item label="预算毛利率">${project.grossProfitMargin}</el-descriptions-item>
 
           <el-descriptions-item label="收款条件" v-if="isSaleContract">
diff --git a/src/main/resources/templates/admin/business/process-review.ftl b/src/main/resources/templates/admin/business/process-review.ftl
index fe77298..9b56b10 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="申请人"></el-table-column>
+            <el-table-column prop="applyPersonName" label="申请人" width="100"></el-table-column>
             <el-table-column prop="status" label="审核状态" width="100">
               <template slot-scope="scope">
                 <span>{{scope.row.status | processStatus}}</span>