From 5dc3c770ee4ee4673b0dac292ea9e12d8e4de614 Mon Sep 17 00:00:00 2001 From: ZhangYong Date: Sun, 25 Jan 2026 11:12:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BE=E4=BA=BA=E6=B0=91=E5=B8=81?= =?UTF-8?q?=E8=B5=84=E9=87=91=E6=B5=81=E6=B0=B4=E8=B4=A6=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/moneyManage/financialAccount/cashFlow.vue | 1 + .../moneyManage/financialAccount/performanceAttribution.vue | 4 ++-- src/views/moneyManage/refundDetail/refundService.vue | 9 +++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/views/moneyManage/financialAccount/cashFlow.vue b/src/views/moneyManage/financialAccount/cashFlow.vue index 5f2805d..ec6d81a 100644 --- a/src/views/moneyManage/financialAccount/cashFlow.vue +++ b/src/views/moneyManage/financialAccount/cashFlow.vue @@ -99,6 +99,7 @@ const fetchData = async () => { payType: queryParams.payType, orderCode: queryParams.orderCode, statuses: queryParams.statuses, + markets:[], } } diff --git a/src/views/moneyManage/financialAccount/performanceAttribution.vue b/src/views/moneyManage/financialAccount/performanceAttribution.vue index da47053..4b814dc 100644 --- a/src/views/moneyManage/financialAccount/performanceAttribution.vue +++ b/src/views/moneyManage/financialAccount/performanceAttribution.vue @@ -176,10 +176,10 @@ const handleExport = async () => { pageSize: queryParams.pageSize, performanceDTO:{ jwcode: queryParams.jwcode, - adminMarket: queryParams.adminMarket, + adminMarket: adminData.value.marketName.split(',').filter(item => item.trim() !== '') || [], + customerMarket: queryParams.customerMarket, startTime: queryParams.timeRange?.[0] ? dayjs(queryParams.timeRange[0]).format('YYYY-MM-DD HH:mm:ss') : '', endTime: queryParams.timeRange?.[1] ? dayjs(queryParams.timeRange[1]).format('YYYY-MM-DD HH:mm:ss') : '', - customerMarket: queryParams.customerMarket, } } diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue index 7813a84..abbffc0 100644 --- a/src/views/moneyManage/refundDetail/refundService.vue +++ b/src/views/moneyManage/refundDetail/refundService.vue @@ -452,7 +452,11 @@ const submitEdit = async function () { newRefundFree: (editForm.value.partRefundFree) * 100 } - console.log(editRow.value.goodsName); + if(params.refundModel == 0){ + params.newRefundGold = (editRow.value.gold)*100 + params.newRefundFree = (editRow.value.free)*100 + } + console.log('params',params); if (editRow.value.goodsName != '金币充值') { params.newRefundGold = '' @@ -559,7 +563,8 @@ const currencies = computed(() => [ t('cash.currency.thb'), t('cash.currency.cad'), t('cash.currency.vnd'), - t('cash.currency.krw') + t('cash.currency.krw'), + t('cash.currency.rmb'), ]) const channelOptions = computed(() => [ t('cash.payMethods.stripe'),