From 4cce348b6353d853df170cd7a82c80aa698abb2f Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期日, 24 五月 2026 18:32:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁_帮太优选' into dev_pro_河南鹤壁_帮太优选

---
 src/views/procurementManagement/paymentLedger/index.vue |   32 ++++++++++++--------------------
 1 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/views/procurementManagement/paymentLedger/index.vue b/src/views/procurementManagement/paymentLedger/index.vue
index 99b4b39..ae2c30b 100644
--- a/src/views/procurementManagement/paymentLedger/index.vue
+++ b/src/views/procurementManagement/paymentLedger/index.vue
@@ -42,16 +42,16 @@
                              prop="contractAmounts"
                              show-overflow-tooltip
                              :formatter="formattedNumber" />
-            <el-table-column label="浠樻閲戦(鍏�)"
-                             prop="paymentAmount"
+            <el-table-column label="宸插叆搴撻噾棰�(鍏�)"
+                             prop="shippedAmount"
                              show-overflow-tooltip
                              :formatter="formattedNumber" />
-            <el-table-column label="搴斾粯閲戦(鍏�)"
-                             prop="payableAmount"
+            <el-table-column label="鏈叆搴撻噾棰�(鍏�)"
+                             prop="unshippedAmount"
                              show-overflow-tooltip>
               <template #default="{ row, column }">
                 <el-text type="danger">
-                  {{ formattedNumber(row, column, row.payableAmount) }}
+                  {{ formattedNumber(row, column, row.unshippedAmount) }}
                 </el-text>
               </template>
             </el-table-column>
@@ -79,7 +79,7 @@
                     @pagination="sonPaginationSearch">
             <template #payableAmountSlot="{ row }">
               <el-text type="danger">
-                {{ parseFloat(row.payableAmount).toFixed(2) }}
+                {{ parseFloat(row.unshippedAmount).toFixed(2) }}
               </el-text>
             </template>
           </PIMTable>
@@ -145,18 +145,18 @@
       },
     },
     {
-      label: "浠樻閲戦(鍏�)",
-      prop: "paymentAmount",
+      label: "宸插叆搴撻噾棰�(鍏�)",
+      prop: "shippedAmount",
       width: 200,
       formatData: params => {
         return params ? parseFloat(params).toFixed(2) : 0;
       },
     },
     {
-      label: "搴斾粯閲戦(鍏�)",
+      label: "鏈叆搴撻噾棰�(鍏�)",
       dataType: "slot",
       width: 200,
-      prop: "payableAmount",
+      prop: "unshippedAmount",
       slot: "payableAmountSlot",
     },
   ]);
@@ -170,7 +170,7 @@
   const summarizeMainTable = param => {
     return proxy.summarizeTable(
       param,
-      ["contractAmounts", "paymentAmount", "payableAmount"],
+      ["contractAmounts", "shippedAmount", "unshippedAmount"],
       {
         ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
         futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
@@ -181,20 +181,12 @@
   const summarizeMainTable1 = param => {
     let summarizeTable = proxy.summarizeTable(
       param,
-      ["contractAmount", "invoiceAmount", "paymentAmount"],
+      ["contractAmount", "shippedAmount", "unshippedAmount"],
       {
         ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
         futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
       }
     );
-    if (originalTableDataSon.value.length > 0) {
-      summarizeTable[summarizeTable.length - 1] =
-        originalTableDataSon.value[
-          originalTableDataSon.value.length - 1
-        ].payableAmount.toFixed(2);
-    } else {
-      summarizeTable[summarizeTable.length - 1] = 0.0;
-    }
     return summarizeTable;
   };
   /** 鎼滅储鎸夐挳鎿嶄綔 */

--
Gitblit v1.9.3