From d83860d6839daaf7dccda5cbd68e865ba7e679ab Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 08 七月 2025 17:48:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/salesManagement/receiptPaymentHistory/index.vue | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/views/salesManagement/receiptPaymentHistory/index.vue b/src/views/salesManagement/receiptPaymentHistory/index.vue
index 9e7ad7d..4bd3fcb 100644
--- a/src/views/salesManagement/receiptPaymentHistory/index.vue
+++ b/src/views/salesManagement/receiptPaymentHistory/index.vue
@@ -48,16 +48,17 @@
</el-form>
<div class="table_list">
<PIMTable
+ rowKey="id"
:column="tableColumn"
:tableData="tableData"
:page="page"
:isSelection="true"
:isShowSummary="isShowSummarySon"
:summaryMethod="summarizeMainTable1"
- :handleSelectionChange="handleSelectionChange"
:tableLoading="tableLoading"
- @pagination="pagination"
:total="total"
+ @pagination="pagination"
+ @selection-change="handleSelectionChange"
></PIMTable>
</div>
</div>
@@ -73,6 +74,14 @@
const { proxy } = getCurrentInstance();
const tableColumn = ref([
{
+ label: "閿�鍞悎鍚屽彿",
+ prop: "salesContractNo",
+ },
+ {
+ label: "瀹㈡埛鍚堝悓鍙�",
+ prop: "customerContractNo",
+ },
+ {
label: "鍥炴鏃ユ湡",
prop: "receiptPaymentDate",
},
@@ -85,10 +94,6 @@
prop: "projectName",
},
{
- label: "鍚堝悓鍙�",
- prop: "customerContractNo",
- },
- {
label: "椤圭洰鍚嶇О",
prop: "projectName",
},
@@ -96,7 +101,7 @@
label: "鍥炴閲戦锛堝厓锛�",
prop: "receiptPaymentAmount",
formatData: (params) => {
- return parseFloat(params).toFixed(2);
+ return params ? parseFloat(params).toFixed(2) : 0;
},
},
{
--
Gitblit v1.9.3