From 0953a90ad4a203518b1b3ec56da612a66362b6e6 Mon Sep 17 00:00:00 2001
From: "271556543@qq.com" <271556543@qq.com>
Date: Tue, 6 Sep 2022 11:39:55 +0800
Subject: [PATCH] 2022.9.6

---
 src/views/contract/components/printRegistration.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/contract/components/printRegistration.vue b/src/views/contract/components/printRegistration.vue
index b4e0f3c..c91bfee 100644
--- a/src/views/contract/components/printRegistration.vue
+++ b/src/views/contract/components/printRegistration.vue
@@ -25,7 +25,7 @@
             <div style="grid-area: tb5-4"></div>
             <div style="grid-area: tb6-1" class="print-table1-grid-center">C</div>
             <div style="grid-area: tb6-2" class="print-table1-grid-center">前期累计已支付</div>
-            <div style="grid-area: tb6-3" class="print-table1-grid-center">{{priceFormat(beforeTotalMoney)}}</div>
+            <div style="grid-area: tb6-3" class="print-table1-grid-center">{{priceFormat(registration.total_act_money)}}</div>
             <div style="grid-area: tb6-4"></div>
             <div style="grid-area: tb7-1" class="print-table1-grid-center">D</div>
             <div style="grid-area: tb7-2" class="print-table1-grid-center">本期扣款</div>
@@ -33,7 +33,7 @@
             <div style="grid-area: tb7-4"></div>
             <div style="grid-area: tb8-1" class="print-table1-grid-center">E</div>
             <div style="grid-area: tb8-2;font-weight: 600" class="print-table1-grid-center">本期应付款</div>
-            <div style="grid-area: tb8-3;font-weight: 600" class="print-table1-grid-center">{{priceFormat(registration.apply_money)}}</div>
+            <div style="grid-area: tb8-3;font-weight: 600" class="print-table1-grid-center">{{priceFormat(registration.act_money)}}</div>
             <div style="grid-area: tb8-4;padding-left: 0.6vw;display: block;">
               <div style="display: flex;align-items: center;">
                 <div><span v-if="registration.type == '进度款'">✔</span>进度款</div>
@@ -49,11 +49,11 @@
             </div>
             <div style="grid-area: tb9-1" class="print-table1-grid-center">F</div>
             <div style="grid-area: tb9-2" class="print-table1-grid-center">累计支付</div>
-            <div style="grid-area: tb9-3" class="print-table1-grid-center">{{priceFormat(registration.total_act_money)}}</div>
+            <div style="grid-area: tb9-3" class="print-table1-grid-center">{{priceFormat(Number(registration.total_act_money)+Number(registration.act_money))}}</div>
             <div style="grid-area: tb9-4"></div>
             <div style="grid-area: tb10-1" class="print-table1-grid-center">G</div>
             <div style="grid-area: tb10-2" class="print-table1-grid-center">累计扣款</div>
-            <div style="grid-area: tb10-3" class="print-table1-grid-center">{{priceFormat(registration.total_apply_money)}}</div>
+            <div style="grid-area: tb10-3" class="print-table1-grid-center">{{priceFormat(Number(registration.total_discount_money)+Number(registration.discount_money))}}</div>
             <div style="grid-area: tb10-4"></div>
             <div style="grid-area: tb11-1" class="print-table1-grid-center">H</div>
             <div style="grid-area: tb11-2" class="print-table1-grid-center">质保金</div>
@@ -108,7 +108,7 @@ export default {
       return res.toString()
     },
     guaranteeRate(gua,money){
-      if(gua && money) return ((moneyRecovery(gua) / money) * 100).toFixed(4)
+      if(gua && money) return ((moneyRecovery(gua) / money) * 100).toFixed(2)
     },
 
     async getDetailFundLog(id){