From 5709db9dc8d689cdbb7a17842998de185b4a6b91 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 11 七月 2025 13:06:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/views/procurementManagement/invoiceEntry/components/ExpandTable.vue |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/src/views/procurementManagement/invoiceEntry/components/ExpandTable.vue b/src/views/procurementManagement/invoiceEntry/components/ExpandTable.vue
index aa663eb..24a368a 100644
--- a/src/views/procurementManagement/invoiceEntry/components/ExpandTable.vue
+++ b/src/views/procurementManagement/invoiceEntry/components/ExpandTable.vue
@@ -4,6 +4,8 @@
     :column="columns"
     :tableData="dataList"
     :tableLoading="loading"
+		:summaryMethod="summarizeChildrenTable"
+		:isShowSummary="true"
     height="auto"
   >
   </PIMTable>
@@ -13,6 +15,7 @@
 import { usePaginationApi } from "@/hooks/usePaginationApi";
 import { productList } from "@/api/procurementManagement/procurementLedger.js";
 import { nextTick } from "vue";
+const { proxy } = getCurrentInstance();
 
 defineOptions({
   name: "鏉ョエ鐧昏鎶樺彔琛�",
@@ -56,6 +59,7 @@
     {
       label: "鍚◣鍗曚环(鍏�)",
       prop: "taxInclusiveUnitPrice",
+			width:200,
       formatData: (val) => {
         return val ? parseFloat(val).toFixed(2) : "-";
       },
@@ -63,6 +67,7 @@
     {
       label: "鍚◣鎬讳环(鍏�)",
       prop: "taxInclusiveTotalPrice",
+			width:200,
       formatData: (val) => {
         return val ? parseFloat(val).toFixed(2) : "-";
       },
@@ -70,6 +75,7 @@
     {
       label: "涓嶅惈绋庢�讳环(鍏�)",
       prop: "taxExclusiveTotalPrice",
+			width:200,
       formatData: (val) => {
         return val ? parseFloat(val).toFixed(2) : "-";
       },
@@ -77,6 +83,7 @@
     {
       label: "鏈鏉ョエ閲戦(鍏�)",
       prop: "ticketsAmount",
+			width:200,
       formatData: (val) => {
         return val ? parseFloat(val).toFixed(2) : "-";
       },
@@ -88,6 +95,7 @@
     {
       label: "鏈潵绁ㄩ噾棰�(鍏�)",
       prop: "futureTicketsAmount",
+			width:200,
       formatData: (val) => {
         return val ? parseFloat(val).toFixed(2) : "-";
       },
@@ -105,7 +113,25 @@
   filters.salesLedgerId = id;
   getTableData();
 };
-
+// 瀛愯〃鍚堣鏂规硶
+const summarizeChildrenTable = (param) => {
+	return proxy.summarizeTable(
+		param,
+		[
+			"taxInclusiveUnitPrice",
+			"taxInclusiveTotalPrice",
+			"taxExclusiveTotalPrice",
+			"ticketsNum",
+			"ticketsAmount",
+			"futureTickets",
+			"futureTicketsAmount",
+		],
+		{
+			ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
+			futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
+		}
+	);
+};
 defineExpose({
   getList,
 });

--
Gitblit v1.9.3