From ca412e49c9ab4de010f6b3f9729c84f3274755d2 Mon Sep 17 00:00:00 2001 From: ZhangYong Date: Sun, 25 Jan 2026 20:25:42 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=80=80=E6=AC=BE=E8=B4=9F=E8=B4=A3?= =?UTF-8?q?=E4=BA=BA=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moneyManage/refundDetail/refundCharge.vue | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue index e481f0c..b32f6a3 100644 --- a/src/views/moneyManage/refundDetail/refundCharge.vue +++ b/src/views/moneyManage/refundDetail/refundCharge.vue @@ -632,19 +632,19 @@ const getMarket = async function () { } } const exportExcel = async function () { - const payCurrencySelect = ref('') - const statuses = ref([20, 22, 30, 32, 40, 41]) // 看不到进度没到这里的 - if (searchForm.value.statuses === t('cash.statusList.passed')) { - statuses.value = [30, 40] - } else if (searchForm.value.statuses === t('cash.statusList.rejected')) { - statuses.value = [22, 32] - } else if (searchForm.value.statuses === t('cash.statusList.pending')) { - statuses.value = [20] - } else if (searchForm.value.statuses === t('cash.statusList.success')) { - statuses.value = [41] - } else { - statuses.value = [20, 22, 30, 32, 40, 41] - } + const payCurrencySelect = ref('') + const statuses = ref([20, 22, 30, 32, 40, 41]) // 看不到进度没到这里的 + if (searchForm.value.statuses === t('cash.statusList.passed')) { + statuses.value = [30, 40] + } else if (searchForm.value.statuses === t('cash.statusList.rejected')) { + statuses.value = [22, 32] + } else if (searchForm.value.statuses === t('cash.statusList.pending')) { + statuses.value = [20] + } else if (searchForm.value.statuses === t('cash.refundSuccess')) { + statuses.value = [41] + } else { + statuses.value = [20, 22, 30, 32, 40, 41] + } const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0 ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : '' From 0e9823e79c4b9c8c40ea1100e6bae07a3b17ded7 Mon Sep 17 00:00:00 2001 From: ZhangYong Date: Sun, 25 Jan 2026 20:33:12 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B5=81=E6=B0=B4=E8=B4=A6=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/moneyManage/financialAccount/cashFlow.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/moneyManage/financialAccount/cashFlow.vue b/src/views/moneyManage/financialAccount/cashFlow.vue index 2187064..1f3de5d 100644 --- a/src/views/moneyManage/financialAccount/cashFlow.vue +++ b/src/views/moneyManage/financialAccount/cashFlow.vue @@ -227,17 +227,18 @@ const exportListLoading = ref(false) // 导出Excel const handleExport = async () => { try { - const params = { + const params = { pageNum: queryParams.pageNum, pageSize: queryParams.pageSize, fundsDTO: { jwcode: queryParams.jwcode, - markets: queryParams.markets, + localMarket:queryParams.markets, 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') : '', payType: normalizePayType(queryParams.payType || ''), orderCode: queryParams.orderCode, statuses: queryParams.statuses, + markets:[], } } From c9c23e88fb65d821c192fda6b659dca31d6482cf Mon Sep 17 00:00:00 2001 From: ZhangYong Date: Sun, 25 Jan 2026 21:31:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/moneyManage/receiveDetail/receiveFinance.vue | 2 +- src/views/moneyManage/receiveDetail/receiveManage.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue index 98dca99..f7108b8 100644 --- a/src/views/moneyManage/receiveDetail/receiveFinance.vue +++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue @@ -832,7 +832,7 @@ const exportExcel = async function () { receivedMarket: MarketNameForId(submitterMarket), cashRoleId: cashRoleId, paymentCurrency: payCurrencySelect, - submitterMarket: submitterMarket, + submitterMarket: normalizeSubmitterMarket(adminData.value.markets), goodsName: goodsName, market: MarketNameForId(searchData.value.market) } diff --git a/src/views/moneyManage/receiveDetail/receiveManage.vue b/src/views/moneyManage/receiveDetail/receiveManage.vue index 98dca99..f7108b8 100644 --- a/src/views/moneyManage/receiveDetail/receiveManage.vue +++ b/src/views/moneyManage/receiveDetail/receiveManage.vue @@ -832,7 +832,7 @@ const exportExcel = async function () { receivedMarket: MarketNameForId(submitterMarket), cashRoleId: cashRoleId, paymentCurrency: payCurrencySelect, - submitterMarket: submitterMarket, + submitterMarket: normalizeSubmitterMarket(adminData.value.markets), goodsName: goodsName, market: MarketNameForId(searchData.value.market) } From 44ed97bc24ea853c67d20f8f0422febb3fc0589b Mon Sep 17 00:00:00 2001 From: ZhangYong Date: Sun, 25 Jan 2026 21:47:18 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B5=84=E9=87=91=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E8=B4=A6null=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/moneyManage/financialAccount/cashFlow.vue | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/views/moneyManage/financialAccount/cashFlow.vue b/src/views/moneyManage/financialAccount/cashFlow.vue index 1f3de5d..76a99af 100644 --- a/src/views/moneyManage/financialAccount/cashFlow.vue +++ b/src/views/moneyManage/financialAccount/cashFlow.vue @@ -84,6 +84,18 @@ const getMarket = async () => { } } +const formatStatuses = (statuses) => { + // 情况1：非数组/空值 → 返回空数组 + if (!Array.isArray(statuses)) { + return []; + } + // 情况2：数组中包含 null 或 undefined → 返回空数组 + if (statuses.some(item => item === null || item === undefined)) { + return []; + } + // 情况3：正常数组 → 返回原数组 + return statuses; +}; // 查询列表 const fetchData = async () => { loading.value = true @@ -99,11 +111,13 @@ const fetchData = async () => { endTime: queryParams.timeRange?.[1] ? dayjs(queryParams.timeRange[1]).format('YYYY-MM-DD HH:mm:ss') : '', payType: normalizePayType(queryParams.payType || ''), orderCode: queryParams.orderCode, - statuses: queryParams.statuses, + statuses: formatStatuses(queryParams.statuses), markets:[], } } + + console.log('查询参数:', params) const res = await Moneyfunds(params) if (res.code == 200) {