From 6495c73e01ac2a4fc2243a6254aa309bcf4ce5fe Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 10 七月 2025 11:13:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/procurementManagement/invoiceEntry/index.vue | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/views/procurementManagement/invoiceEntry/index.vue b/src/views/procurementManagement/invoiceEntry/index.vue
index 6de82f0..c7376ee 100644
--- a/src/views/procurementManagement/invoiceEntry/index.vue
+++ b/src/views/procurementManagement/invoiceEntry/index.vue
@@ -42,6 +42,7 @@
:expand-row-keys="expandRowKeys"
@expand-change="expandChange"
@selection-change="handleSelectionChange"
+ @pagination="changePage"
>
<template #expand="{ row }">
<ExpandTable ref="expandTableRef" />
@@ -87,6 +88,7 @@
pagination,
getTableData,
resetFilters,
+ onCurrentChange,
} = usePaginationApi(
gePurchaseListPage,
{
@@ -97,6 +99,10 @@
type: "expand",
dataType: "slot",
slot: "expand",
+ },
+ {
+ label: "閲囪喘璁㈠崟鍙�",
+ prop: "purchaseContractNumber",
},
{
label: "閿�鍞悎鍚屽彿",
@@ -111,24 +117,32 @@
prop: "projectName",
},
{
+ label: "褰曞叆浜�",
+ prop: "recorderName",
+ },
+ {
+ label: "褰曞叆鏃ユ湡",
+ prop: "entryDate",
+ },
+ {
label: "鍚堝悓閲戦(鍏�)",
prop: "contractAmount",
formatData: (val) => {
- return parseFloat(val).toFixed(2) ?? 0;
+ return val ? parseFloat(val).toFixed(2) : 0;
},
},
{
label: "宸插紑绁ㄩ噾棰�(鍏�)",
prop: "receiptPaymentAmount",
formatData: (val) => {
- return parseFloat(val).toFixed(2) ?? 0;
+ return val ? parseFloat(val).toFixed(2) : 0;
},
},
{
label: "寰呭紑绁ㄩ噾棰�(鍏�)",
prop: "unReceiptPaymentAmount",
formatData: (val) => {
- return parseFloat(val).toFixed(2) ?? 0;
+ return val ? parseFloat(val).toFixed(2) : 0;
},
},
// {
@@ -168,6 +182,11 @@
expandTableRef.value.getList(row.id);
};
+const changePage = ({ page }) => {
+ pagination.currentPage = page;
+ onCurrentChange(page);
+};
+
onMounted(() => {
getTableData();
});
--
Gitblit v1.9.3