diff --git a/src/components/workspace/CashManagement.vue b/src/components/workspace/CashManagement.vue index dbeace5..c54d9de 100644 --- a/src/components/workspace/CashManagement.vue +++ b/src/components/workspace/CashManagement.vue @@ -44,7 +44,7 @@
代收{{ item.name }}: {{ item.value.toLocaleString() }} - +
@@ -100,6 +100,7 @@ const startDate = `${currentYear}-01-01 00:00:00`; const endDate = `${currentYear}-12-31 23:59:59`; // 获取接口数据 const fetchCashData = async () => { + getAdminData() try { const res = await request({ url: '/workbench/getTotalRevenue', @@ -131,7 +132,7 @@ const fetchCashData = async () => { name: m.name, value: resMap.get(m.name) ?? 0 })) - } else { + } else if (marksFlag.value=== false) { // 1. 定义币种中英文对照表 const currencyMap = { sgd: '新币', @@ -227,7 +228,7 @@ const renderChart = () => { } onMounted(() => { - getAdminData() + // getAdminData() fetchCashData() }) diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue index 381150e..64f6355 100644 --- a/src/views/moneyManage/executor/executor.vue +++ b/src/views/moneyManage/executor/executor.vue @@ -148,9 +148,10 @@
退款类型 - - {{ scope.row.refundModel === 1 ? '部分退款' : '全部退款' }} - + + + +
付款币种 @@ -182,7 +183,7 @@
备注 -
@@ -217,7 +218,7 @@ :show-file-list="false">