From 9289a4fbacafcc7a80385fc3a3167f383d5cf991 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 15 一月 2026 18:00:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/views/salesManagement/receiptPaymentLedger/index.vue |   47 ++++++++++++++++++++++++++---------------------
 1 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/views/salesManagement/receiptPaymentLedger/index.vue b/src/views/salesManagement/receiptPaymentLedger/index.vue
index aa6ffb3..7029cfc 100644
--- a/src/views/salesManagement/receiptPaymentLedger/index.vue
+++ b/src/views/salesManagement/receiptPaymentLedger/index.vue
@@ -38,23 +38,27 @@
             label="瀹㈡埛鍚嶇О"
             prop="customerName"
             show-overflow-tooltip
+						width="200"
           />
           <el-table-column
-            label="寮�绁ㄩ噾棰�(鍏�)"
+            label="鍚堝悓閲戦(鍏�)"
             prop="invoiceTotal"
             show-overflow-tooltip
             :formatter="formattedNumber"
+						width="200"
           />
           <el-table-column
             label="鍥炴閲戦(鍏�)"
             prop="receiptPaymentAmount"
             show-overflow-tooltip
             :formatter="formattedNumber"
+						width="200"
           />
           <el-table-column
             label="搴旀敹閲戦(鍏�)"
             prop="unReceiptPaymentAmount"
             show-overflow-tooltip
+						width="200"
           >
             <template #default="{ row, column }">
               <el-text type="danger">
@@ -89,48 +93,50 @@
           />
           <el-table-column
             label="鍙戠敓鏃ユ湡"
-            prop="happenTime"
+            prop="receiptPaymentDate"
             show-overflow-tooltip
+						width="110"
           />
           <el-table-column
-            label="寮�绁ㄩ噾棰�(鍏�)"
-            prop="invoiceAmount"
+            label="閿�鍞悎鍚屽彿"
+            prop="salesContractNo"
+            show-overflow-tooltip
+						width="200"
+          />
+          <el-table-column
+            label="鍚堝悓閲戦(鍏�)"
+            prop="invoiceTotal"
             show-overflow-tooltip
             :formatter="formattedNumber"
+						width="200"
           />
           <el-table-column
             label="鍥炴閲戦(鍏�)"
-            prop="receiptAmount"
+            prop="receiptPaymentAmount"
             show-overflow-tooltip
             :formatter="formattedNumber"
+						width="200"
           />
           <el-table-column
             label="搴旀敹閲戦(鍏�)"
-            prop="unReceiptAmount"
+            prop="unReceiptPaymentAmount"
             show-overflow-tooltip
+						width="200"
           >
             <template #default="{ row, column }">
               <el-text type="danger">
-                {{ formattedNumber(row, column, row.unReceiptAmount) }}
+                {{ formattedNumber(row, column, row.unReceiptPaymentAmount) }}
               </el-text>
             </template>
           </el-table-column>
         </el-table>
-        <pagination
-          v-show="recordTotal > 0"
-          :total="recordTotal"
-          layout="total, sizes, prev, pager, next, jumper"
-          :page="recordPage.current"
-          :limit="recordPage.size"
-          @pagination="recordPaginationChange"
-        />
       </div>
     </div>
   </div>
 </template>
 
 <script setup>
-import { ref } from "vue";
+import {onMounted, ref} from "vue";
 import { invoiceLedgerSalesAccount } from "../../../api/salesManagement/invoiceLedger.js";
 import { customerInteractions } from "../../../api/salesManagement/receiptPayment.js";
 import Pagination from "../../../components/PIMTable/Pagination.vue";
@@ -164,7 +170,6 @@
   getList();
 };
 const paginationChange = (obj) => {
-  console.log("paginationChange", current, limit);
   page.current = obj.page;
   page.size = obj.limit;
   getList();
@@ -200,7 +205,7 @@
 const summarizeMainTable1 = (param) => {
   var summarizeTable = proxy.summarizeTable(
     param,
-    ["invoiceAmount", "receiptAmount"],
+    ["invoiceAmount", "receiptAmount", "unReceiptAmount"],
     {
       ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
       futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
@@ -216,8 +221,6 @@
   } else {
     summarizeTable[summarizeTable.length - 1] = 0.0;
   }
-  // const sb = tableData.findIndex((item) => item.id == customerId.value);
-  // console.log(sb);
   return summarizeTable;
 };
 
@@ -253,7 +256,9 @@
   receiptRecord.value = originReceiptRecord.value.slice(start, end);
 };
 
-getList();
+onMounted(() => {
+	getList();
+});
 </script>
 
 <style scoped lang="scss">

--
Gitblit v1.9.3