From 665bc8b27c6b50b05df2452a6bf1eadab39069c5 Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Thu, 5 Jan 2023 19:32:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=8F=90=E7=A4=BA=20=E8=AF=A6=E6=83=85=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/business/process-completed.ftl          | 6 ++++--
 .../resources/templates/admin/business/process-detail.ftl   | 2 +-
 2 files changed, 5 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 8b4028c..8fcde4c 100644
--- a/src/main/resources/templates/admin/business/process-completed.ftl
+++ b/src/main/resources/templates/admin/business/process-completed.ftl
@@ -133,7 +133,9 @@
                 </el-button>
                   <#if isAdmin>
                   <#--判断是不是管理员本人的-->
-                    <el-button v-if="scope.row.applyPersonId===${adminId}" type="text" @click="editProcess(scope.row, scope)">编辑
+                    <el-button
+                            v-if="(scope.row.status==='draft' || scope.row.status==='audit_not_passed') && scope.row.applyPersonId===${adminId}"
+                            type="text" @click="editProcess(scope.row, scope)">编辑
                     </el-button>
                   <#else>
                     <el-button v-if="scope.row.status==='draft' || scope.row.status==='audit_not_passed'"
@@ -144,7 +146,7 @@
 
                   <#if isAdmin>
                   <#--判断是不是管理员本人的-->
-                    <el-button v-if="scope.row.applyPersonId===${adminId}" type="text"
+                    <el-button v-if="scope.row.status==='draft' && scope.row.applyPersonId===${adminId}" type="text"
                                @click="deleteProcess(scope.row, scope)">删除
                     </el-button>
                   <#else>
diff --git a/src/main/resources/templates/admin/business/process-detail.ftl b/src/main/resources/templates/admin/business/process-detail.ftl
index 86ad0b0..b1b7762 100644
--- a/src/main/resources/templates/admin/business/process-detail.ftl
+++ b/src/main/resources/templates/admin/business/process-detail.ftl
@@ -250,7 +250,7 @@
             <el-table-column prop="totalTaxInclude_" label="含税总金额（元）" width="120"></el-table-column>
             <el-table-column prop="totalTaxExclude" label="不含税金额（元）" width="120"></el-table-column>
             <el-table-column prop="totalTax" label="税金（元）" width="110"></el-table-column>
-            <el-table-column prop="isUnderwritten" label="是否垫资"></el-table-column>
+            <el-table-column prop="isUnderwrittenDesc" label="是否垫资"></el-table-column>
             <el-table-column prop="payTime" label="支出时间" width="160"></el-table-column>
             <el-table-column prop="payAmount" label="支出金额（元）" width="120"></el-table-column>
             <el-table-column prop="amountAlready" label="已采购数量" width="100"></el-table-column>