From a798cdaa46f693eebabec6d999bfe32d055f4c48 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 14 八月 2026 17:23:14 +0800
Subject: [PATCH] Merge branch 'dev_NEW_pro' into dev_pro_山西_晋和园
---
src/views/salesManagement/receiptPaymentLedger/index.vue | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/views/salesManagement/receiptPaymentLedger/index.vue b/src/views/salesManagement/receiptPaymentLedger/index.vue
index f5a9d8f..c5e3415 100644
--- a/src/views/salesManagement/receiptPaymentLedger/index.vue
+++ b/src/views/salesManagement/receiptPaymentLedger/index.vue
@@ -46,6 +46,11 @@
show-overflow-tooltip
:formatter="formattedNumber"
width="200" />
+ <el-table-column label="閫�璐ч噾棰�(鍏�)"
+ prop="returnAmount"
+ show-overflow-tooltip
+ :formatter="formattedNumber"
+ width="200" />
<el-table-column label="搴旀敹閲戦(鍏�)"
prop="receiptableAmount"
show-overflow-tooltip
@@ -93,6 +98,11 @@
width="200" />
<el-table-column label="鍥炴閲戦(鍏�)"
prop="receiptPaymentAmount"
+ show-overflow-tooltip
+ :formatter="formattedNumber"
+ width="200" />
+ <el-table-column label="閫�璐ч噾棰�(鍏�)"
+ prop="returnAmount"
show-overflow-tooltip
:formatter="formattedNumber"
width="200" />
@@ -180,7 +190,12 @@
const summarizeMainTable = param => {
return proxy.summarizeTable(
param,
- ["invoiceTotal", "receiptPaymentAmount", "unReceiptPaymentAmount"],
+ [
+ "contractAmounts",
+ "receiptPaymentAmount",
+ "returnAmount",
+ "receiptableAmount",
+ ],
{
ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
@@ -191,7 +206,12 @@
const summarizeMainTable1 = param => {
var summarizeTable = proxy.summarizeTable(
param,
- ["contractAmount", "receiptPaymentAmount", "receiptableAmount"],
+ [
+ "contractAmount",
+ "receiptPaymentAmount",
+ "returnAmount",
+ "receiptableAmount",
+ ],
{
ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
--
Gitblit v1.9.3