From e754ffc06a52f2e73b570ff455516f40581b1e55 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 22 九月 2025 09:19:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into ywx
---
src/views/salesManagement/receiptPaymentHistory/index.vue | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/views/salesManagement/receiptPaymentHistory/index.vue b/src/views/salesManagement/receiptPaymentHistory/index.vue
index 0219fe9..ea373ea 100644
--- a/src/views/salesManagement/receiptPaymentHistory/index.vue
+++ b/src/views/salesManagement/receiptPaymentHistory/index.vue
@@ -56,7 +56,7 @@
:isShowSummary="isShowSummarySon"
:summaryMethod="summarizeMainTable1"
:tableLoading="tableLoading"
- :total="total"
+ :total="page.total"
@pagination="pagination"
@selection-change="handleSelectionChange"
></PIMTable>
@@ -76,30 +76,32 @@
{
label: "閿�鍞悎鍚屽彿",
prop: "salesContractNo",
+ width:240
},
{
label: "瀹㈡埛鍚堝悓鍙�",
prop: "customerContractNo",
+ width:240
},
{
label: "鍥炴鏃ユ湡",
prop: "receiptPaymentDate",
+ width:100
},
{
label: "瀹㈡埛鍚嶇О",
prop: "customerName",
+ width:240
},
{
label: "椤圭洰鍚嶇О",
prop: "projectName",
- },
- {
- label: "椤圭洰鍚嶇О",
- prop: "projectName",
+ width:200
},
{
label: "鍥炴閲戦锛堝厓锛�",
prop: "receiptPaymentAmount",
+ width:200,
formatData: (params) => {
return params ? parseFloat(params).toFixed(2) : 0;
},
@@ -128,6 +130,7 @@
{
label: "鐧昏鏃ユ湡",
prop: "createTime",
+ width:100
},
]);
const tableData = ref([]);
@@ -136,6 +139,7 @@
const page = reactive({
current: 1,
size: 100,
+ total: 0,
});
const total = ref(0);
@@ -171,7 +175,7 @@
receiptPaymentHistoryListPage({ ...rest, ...page }).then((res) => {
tableLoading.value = false;
tableData.value = res.records;
- total.value = res.total;
+ page.total = res.total;
});
};
// 瀛愯〃鍚堣鏂规硶
--
Gitblit v1.9.3