From 4538de1fa692cf5454ae7b1b061a8c298be96821 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 10 七月 2025 17:00:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/procurementManagement/invoiceEntry/components/ExpandTable.vue | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/views/procurementManagement/invoiceEntry/components/ExpandTable.vue b/src/views/procurementManagement/invoiceEntry/components/ExpandTable.vue
index 0523e40..aa663eb 100644
--- a/src/views/procurementManagement/invoiceEntry/components/ExpandTable.vue
+++ b/src/views/procurementManagement/invoiceEntry/components/ExpandTable.vue
@@ -4,6 +4,7 @@
:column="columns"
:tableData="dataList"
:tableLoading="loading"
+ height="auto"
>
</PIMTable>
</template>
@@ -11,6 +12,7 @@
<script setup>
import { usePaginationApi } from "@/hooks/usePaginationApi";
import { productList } from "@/api/procurementManagement/procurementLedger.js";
+import { nextTick } from "vue";
defineOptions({
name: "鏉ョエ鐧昏鎶樺彔琛�",
@@ -55,28 +57,28 @@
label: "鍚◣鍗曚环(鍏�)",
prop: "taxInclusiveUnitPrice",
formatData: (val) => {
- return parseFloat(val).toFixed(2) ?? 0;
+ return val ? parseFloat(val).toFixed(2) : "-";
},
},
{
label: "鍚◣鎬讳环(鍏�)",
prop: "taxInclusiveTotalPrice",
formatData: (val) => {
- return parseFloat(val).toFixed(2) ?? 0;
+ return val ? parseFloat(val).toFixed(2) : "-";
},
},
{
label: "涓嶅惈绋庢�讳环(鍏�)",
prop: "taxExclusiveTotalPrice",
formatData: (val) => {
- return parseFloat(val).toFixed(2) ?? 0;
+ return val ? parseFloat(val).toFixed(2) : "-";
},
},
{
label: "鏈鏉ョエ閲戦(鍏�)",
prop: "ticketsAmount",
formatData: (val) => {
- return parseFloat(val).toFixed(2) ?? 0;
+ return val ? parseFloat(val).toFixed(2) : "-";
},
},
{
@@ -87,7 +89,7 @@
label: "鏈潵绁ㄩ噾棰�(鍏�)",
prop: "futureTicketsAmount",
formatData: (val) => {
- return parseFloat(val).toFixed(2) ?? 0;
+ return val ? parseFloat(val).toFixed(2) : "-";
},
},
],
@@ -98,7 +100,8 @@
}
);
-const getList = (id) => {
+const getList = async (id) => {
+ await nextTick();
filters.salesLedgerId = id;
getTableData();
};
--
Gitblit v1.9.3