From 1395356d3b3423f8cb90ded6b5fe8eb2eb52af23 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 18 八月 2025 10:43:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue b/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue
index 713fcf3..c8baab3 100644
--- a/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue
@@ -553,7 +553,7 @@
dispatchNo.value = row.dispatchNo;
dialog.title = '璐圭敤鏄庣粏';
if (activeName.value == 'first') {
- listEstimatedReceivable({ dispatchNo: row.dispatchNo, feeType: 1 }).then((res) => {
+ listEstimatedReceivable({ dispatchNo: row.dispatchNo, feeType: 1,isConfirmed:1 }).then((res) => {
if (res.code === 200) {
dialog.detail = true;
tableDataList.value = res.rows || [];
@@ -561,7 +561,7 @@
})
} else if (activeName.value == 'second') {
// 杩欓噷鍙互娣诲姞鏌ヨ鏀跺叆鐩稿叧鐨勯�昏緫
- listEstimatedReceivable({ dispatchNo: row.dispatchNo, feeType: 0 }).then((res) => {
+ listEstimatedReceivable({ dispatchNo: row.dispatchNo, feeType: 0,isConfirmed:1 }).then((res) => {
if (res.code === 200) {
dialog.detail = true;
tableDataList.value = res.rows || [];
@@ -570,7 +570,7 @@
}
}
const getListVable = (dispatchNo, feeType) => {
- listEstimatedReceivable({ dispatchNo: dispatchNo, feeType: feeType }).then((res) => {
+ listEstimatedReceivable({ dispatchNo: dispatchNo, feeType: feeType,isConfirmed:1 }).then((res) => {
if (res.code === 200) {
tableDataList.value = res.rows || [];
}
--
Gitblit v1.8.0