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/salesManagement/receiptPaymentLedger/index.vue | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/views/salesManagement/receiptPaymentLedger/index.vue b/src/views/salesManagement/receiptPaymentLedger/index.vue
index f5a9d8f..8852a32 100644
--- a/src/views/salesManagement/receiptPaymentLedger/index.vue
+++ b/src/views/salesManagement/receiptPaymentLedger/index.vue
@@ -41,18 +41,18 @@
show-overflow-tooltip
:formatter="formattedNumber"
width="200" />
- <el-table-column label="鍥炴閲戦(鍏�)"
- prop="receiptPaymentAmount"
+ <el-table-column label="宸插嚭搴撻噾棰�(鍏�)"
+ prop="shippedAmount"
show-overflow-tooltip
:formatter="formattedNumber"
width="200" />
- <el-table-column label="搴旀敹閲戦(鍏�)"
- prop="receiptableAmount"
+ <el-table-column label="鏈嚭搴撻噾棰�(鍏�)"
+ prop="unshippedAmount"
show-overflow-tooltip
width="200">
<template #default="{ row, column }">
<el-text type="danger">
- {{ formattedNumber(row, column, row.receiptableAmount) }}
+ {{ formattedNumber(row, column, row.unshippedAmount) }}
</el-text>
</template>
</el-table-column>
@@ -91,18 +91,18 @@
show-overflow-tooltip
:formatter="formattedNumber"
width="200" />
- <el-table-column label="鍥炴閲戦(鍏�)"
- prop="receiptPaymentAmount"
+ <el-table-column label="宸插嚭搴撻噾棰�(鍏�)"
+ prop="shippedAmount"
show-overflow-tooltip
:formatter="formattedNumber"
width="200" />
- <el-table-column label="搴旀敹閲戦(鍏�)"
- prop="receiptableAmount"
+ <el-table-column label="鏈嚭搴撻噾棰�(鍏�)"
+ prop="unshippedAmount"
show-overflow-tooltip
width="200">
<template #default="{ row, column }">
<el-text type="danger">
- {{ formattedNumber(row, column, row.receiptableAmount) }}
+ {{ formattedNumber(row, column, row.unshippedAmount) }}
</el-text>
</template>
</el-table-column>
@@ -180,7 +180,7 @@
const summarizeMainTable = param => {
return proxy.summarizeTable(
param,
- ["invoiceTotal", "receiptPaymentAmount", "unReceiptPaymentAmount"],
+ ["contractAmounts", "shippedAmount", "unshippedAmount"],
{
ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
@@ -191,7 +191,7 @@
const summarizeMainTable1 = param => {
var summarizeTable = proxy.summarizeTable(
param,
- ["contractAmount", "receiptPaymentAmount", "receiptableAmount"],
+ ["contractAmount", "shippedAmount", "unshippedAmount"],
{
ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
--
Gitblit v1.9.3