From 10d4c82e729694bd49a29f589d607690dc4b71f8 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 26 五月 2025 16:42:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/salesManagement/salesLedger/index.vue | 6 +++---
src/views/salesManagement/invoiceRegistration/index.vue | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/salesManagement/invoiceRegistration/index.vue b/src/views/salesManagement/invoiceRegistration/index.vue
index 96cb793..43aa25f 100644
--- a/src/views/salesManagement/invoiceRegistration/index.vue
+++ b/src/views/salesManagement/invoiceRegistration/index.vue
@@ -334,7 +334,7 @@
// 璁＄畻鏈寮�绁ㄩ噾棰�
row.currentInvoiceAmount = row.currentInvoiceNum * row.taxInclusiveUnitPrice
// 璁＄畻鏈紑绁ㄦ暟
- row.noInvoiceNum = row.noInvoiceNum - row.currentInvoiceNum
+ row.noInvoiceNum = row.originalNoInvoiceNum - row.currentInvoiceNum
// 璁＄畻鏈紑绁ㄩ噾棰�
row.noInvoiceAmount = row.noInvoiceNum * row.taxInclusiveUnitPrice
}
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index d58321b..7a373f2 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -467,7 +467,7 @@
productList({salesLedgerId: row.id, type: 1}).then(res => {
const index = tableData.value.findIndex(item => item.id === row.id);
if (index > -1) {
- tableData.value[index].children = res.rows;
+ tableData.value[index].children = res;
}
expandedRowKeys.value.push(row.id)
})
@@ -689,7 +689,7 @@
}).catch(() => {
proxy.$modal.msg("宸插彇娑�")
})
-
+
}
}
// 鍏抽棴浜у搧寮规
@@ -753,4 +753,4 @@
<style scoped lang="scss">
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3