From 9476c25c25a6a5b483bb4e9a4f4ce7f757ec5403 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 13 五月 2025 16:08:55 +0800
Subject: [PATCH] 采购台账-联调
---
src/views/procurementManagement/procurementLedger/index.vue | 11 +++++++----
src/views/salesManagement/salesLedger/index.vue | 6 ++++--
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 92e9942..f54c869 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -48,12 +48,12 @@
</el-table-column>
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column label="閲囪喘鍚堝悓鍙�" prop="purchaseContractNumber" show-overflow-tooltip/>
- <el-table-column label="閿�鍞悎鍚屽彿" prop="salesLedgerId" show-overflow-tooltip/>
+ <el-table-column label="閿�鍞悎鍚屽彿" prop="salesContractNo" show-overflow-tooltip/>
<el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" show-overflow-tooltip/>
<el-table-column label="涓氬姟鍛�" prop="salesman" show-overflow-tooltip/>
<el-table-column label="椤圭洰鍚嶇О" prop="projectName" show-overflow-tooltip/>
<el-table-column label="鍚堝悓閲戦(鍏�)" prop="contractAmount" show-overflow-tooltip/>
- <el-table-column label="褰曞叆浜�" prop="recorderId" show-overflow-tooltip/>
+ <el-table-column label="褰曞叆浜�" prop="recorderName" show-overflow-tooltip/>
<el-table-column label="褰曞叆鏃ユ湡" prop="entryDate" show-overflow-tooltip/>
<el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
<template #default="scope">
@@ -371,6 +371,8 @@
})
total.value = res.total
expandedRowKeys.value = []
+ }).catch(() => {
+ tableLoading.value = false
})
}
// 琛ㄦ牸閫夋嫨鏁版嵁
@@ -451,6 +453,7 @@
operationType.value = type
form.value = {}
productData.value = []
+ fileList.value = []
userListNoPage().then(res => {
userList.value = res.data
})
@@ -566,7 +569,7 @@
addOrUpdateSalesLedgerProduct(productForm.value).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛")
closeProductDia()
- getSalesLedgerWithProducts({id: currentId.value}).then(res => {
+ getPurchaseById({id: currentId.value, type: 2}).then(res => {
productData.value = res.productData
})
})
@@ -600,7 +603,7 @@
delProduct(ids).then(res => {
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
closeProductDia()
- getSalesLedgerWithProducts({id: currentId.value}).then(res => {
+ getSalesLedgerWithProducts({id: currentId.value, type: 2}).then(res => {
productData.value = res.productData
})
})
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 3493cd0..97621c8 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
})
}
// 琛ㄦ牸閫夋嫨鏁版嵁
@@ -573,7 +575,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 +609,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