Merge branch 'milestone-20251215-多语言二期2' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20251215-多语言二期2

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) {
@@ -227,17 +241,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:[],
       }
     }
 

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)
         }

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)
         }

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] : ''