From ee6f8c315926a871f11a96a69702efcef4d0b49f Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 26 五月 2025 13:49:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/salesManagement/salesLedger/index.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 3493cd0..78f84e0 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -382,6 +382,8 @@
item.children = []
})
total.value = res.total
+ }).catch(() => {
+ tableLoading.value = false
})
}
// 琛ㄦ牸閫夋嫨鏁版嵁
@@ -481,7 +483,7 @@
// 涓婁紶鍓嶆牎妫�
function handleBeforeUpload(file) {
// 鏍℃鏂囦欢澶у皬
- if (file.size > 1024 * 1024) {
+ if (file.size > 1024 * 1024 * 10) {
proxy.$modal.msgError('涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃10MB!')
return false
}
@@ -506,8 +508,6 @@
}
// 绉婚櫎鏂囦欢
function handleRemove (file) {
- console.log('handleRemove', file)
- console.log('operationType.value', operationType.value)
if (operationType.value === 'edit') {
let ids = []
ids.push(file.id)
@@ -573,7 +573,7 @@
addOrUpdateSalesLedgerProduct(productForm.value).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛")
closeProductDia()
- getSalesLedgerWithProducts({id: currentId.value}).then(res => {
+ getSalesLedgerWithProducts({id: currentId.value, type: 1}).then(res => {
productData.value = res.productData
})
})
@@ -607,7 +607,7 @@
delProduct(ids).then(res => {
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
closeProductDia()
- getSalesLedgerWithProducts({id: currentId.value}).then(res => {
+ getSalesLedgerWithProducts({id: currentId.value, type: 1}).then(res => {
productData.value = res.productData
})
})
--
Gitblit v1.9.3