From a9600ae56b844289a04e1a7385cf0ccfc384cd08 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 10 七月 2025 14:42:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/procurementManagement/invoiceEntry/index.vue | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/views/procurementManagement/invoiceEntry/index.vue b/src/views/procurementManagement/invoiceEntry/index.vue
index c8ece35..a1e02e5 100644
--- a/src/views/procurementManagement/invoiceEntry/index.vue
+++ b/src/views/procurementManagement/invoiceEntry/index.vue
@@ -42,7 +42,7 @@
:expand-row-keys="expandRowKeys"
@expand-change="expandChange"
@selection-change="handleSelectionChange"
- @pagination="onCurrentChange"
+ @pagination="changePage"
>
<template #expand="{ row }">
<ExpandTable ref="expandTableRef" />
@@ -103,18 +103,22 @@
{
label: "閲囪喘璁㈠崟鍙�",
prop: "purchaseContractNumber",
+ width:150
},
{
label: "閿�鍞悎鍚屽彿",
prop: "salesContractNo",
+ width:150
},
{
label: "渚涘簲鍟嗗悕绉�",
prop: "supplierName",
+ width:240
},
{
label: "椤圭洰鍚嶇О",
prop: "projectName",
+ width:150
},
{
label: "褰曞叆浜�",
@@ -123,10 +127,12 @@
{
label: "褰曞叆鏃ユ湡",
prop: "entryDate",
+ width:100
},
{
label: "鍚堝悓閲戦(鍏�)",
prop: "contractAmount",
+ width:150,
formatData: (val) => {
return val ? parseFloat(val).toFixed(2) : 0;
},
@@ -134,6 +140,7 @@
{
label: "宸插紑绁ㄩ噾棰�(鍏�)",
prop: "receiptPaymentAmount",
+ width:150,
formatData: (val) => {
return val ? parseFloat(val).toFixed(2) : 0;
},
@@ -141,6 +148,7 @@
{
label: "寰呭紑绁ㄩ噾棰�(鍏�)",
prop: "unReceiptPaymentAmount",
+ width:150,
formatData: (val) => {
return val ? parseFloat(val).toFixed(2) : 0;
},
@@ -178,8 +186,15 @@
const handleDelete = () => {};
const expandChange = async (row, expandedRows) => {
- await nextTick();
- expandTableRef.value.getList(row.id);
+ if (expandedRows.length > 0) {
+ await nextTick();
+ expandTableRef.value.getList(row.id);
+ }
+};
+
+const changePage = ({ page }) => {
+ pagination.currentPage = page;
+ onCurrentChange(page);
};
onMounted(() => {
--
Gitblit v1.9.3