From 5709db9dc8d689cdbb7a17842998de185b4a6b91 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 11 七月 2025 13:06:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/views/procurementManagement/paymentLedger/index.vue |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/procurementManagement/paymentLedger/index.vue b/src/views/procurementManagement/paymentLedger/index.vue
index 665242c..387e6b9 100644
--- a/src/views/procurementManagement/paymentLedger/index.vue
+++ b/src/views/procurementManagement/paymentLedger/index.vue
@@ -86,6 +86,7 @@
             :tableLoading="tableLoadingSon"
             :isShowSummary="isShowSummarySon"
             :summaryMethod="summarizeMainTable1"
+						height="calc(100vh - 18.5em)"
           >
             <template #payableAmountSlot="{ row }">
               <el-text type="danger">
@@ -120,6 +121,7 @@
   {
     label: "渚涘簲鍟嗗悕绉�",
     prop: "supplierName",
+    width:240
   },
   {
     label: "鍙戠エ閲戦(鍏�)",
@@ -163,24 +165,29 @@
   {
     label: "鍙戠敓鏃ユ湡",
     prop: "happenTime",
+		width: 110,
   },
   {
     label: "鍙戠エ閲戦(鍏�)",
     prop: "invoiceAmount",
+		width: 200,
     formatData: (params) => {
-      return parseFloat(params).toFixed(2);
+      return params ? parseFloat(params).toFixed(2) : 0;
     },
   },
   {
     label: "浠樻閲戦(鍏�)",
     prop: "currentPaymentAmount",
+		width: 200,
     formatData: (params) => {
-      return parseFloat(params).toFixed(2);
+      return params ? parseFloat(params).toFixed(2) : 0;
     },
   },
   {
     label: "搴斾粯閲戦(鍏�)",
     dataType: "slot",
+		width: 200,
+    prop: "payableAmount",
     slot: "payableAmountSlot",
   },
 ]);

--
Gitblit v1.9.3