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

src/components/MoneyManage/ProductSelect.vue

@@ -12,7 +12,7 @@
     </div>
 
     <div class="menu" v-show="isOpen">
-      <div class="coinselect" @click="coinhandelMenu" :class="{ 'active': coinisOpen }">
+      <!-- <div class="coinselect" @click="coinhandelMenu" :class="{ 'active': coinisOpen }">
         <div class="cointxt">
           {{ t('cash.goldProduct') }}
         </div>
@@ -24,7 +24,7 @@
       </div>
       <div class="coinoption" v-show="coinisOpen">
         <el-radio v-model="selectedValue" :label="t('cash.coinRecharge')" size="large" />
-      </div>
+      </div> -->
       <div class="product">
         <div class="coinselect" @click="producthandelMenu" :class="{ 'active': productisOpen }">
           <div class="cointxt">

src/views/moneyManage/financialAccount/cashFlow.vue

@@ -240,6 +240,19 @@ const exportListLoading = ref(false)
 
 // 导出Excel
 const handleExport = 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;
+};
   try {
       const params = {
       pageNum: queryParams.pageNum,
@@ -251,7 +264,7 @@ const handleExport = 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:[],
       }
     }

src/views/moneyManage/receiveDetail/receiveFinance.vue

@@ -84,11 +84,11 @@
                                 @click="navigateTo('pass')">
                                 {{ t('common.passed') }}
                             </el-button>
-                            <el-button class="btnItem"
+                            <!-- <el-button class="btnItem"
                                 :style="{ backgroundColor: activeTab === 'done' ? '#2741DE' : '#E5EBFE', color: activeTab === 'done' ? 'white' : '#666' }"
                                 @click="navigateTo('done')">
                                 {{ t('common.completed') }}
-                            </el-button>
+                            </el-button> -->
                             <el-button class="btnItem"
                                 :style="{ backgroundColor: activeTab === 'reject' ? '#2741DE' : '#E5EBFE', color: activeTab === 'reject' ? 'white' : '#666' }"
                                 @click="navigateTo('reject')">

src/views/moneyManage/receiveDetail/receiveManage.vue

@@ -84,11 +84,11 @@
                                 @click="navigateTo('pass')">
                                 {{ t('common.passed') }}
                             </el-button>
-                            <el-button class="btnItem"
+                            <!-- <el-button class="btnItem"
                                 :style="{ backgroundColor: activeTab === 'done' ? '#2741DE' : '#E5EBFE', color: activeTab === 'done' ? 'white' : '#666' }"
                                 @click="navigateTo('done')">
                                 {{ t('common.completed') }}
-                            </el-button>
+                            </el-button> -->
                             <el-button class="btnItem"
                                 :style="{ backgroundColor: activeTab === 'reject' ? '#2741DE' : '#E5EBFE', color: activeTab === 'reject' ? 'white' : '#666' }"
                                 @click="navigateTo('reject')">

src/views/moneyManage/refundDetail/refundHeader.vue

@@ -470,18 +470,6 @@ const executorList = ref([
         value: '315915',
         label: '越:范秋霞'
     },
-    {
-        value: '90047681',
-        label: '李慧琳演示机'
-    },
-    {
-        value: '90047947',
-        label: '宋彤彤'
-    },
-    {
-        value: '90047860',
-        label: 'zy'
-    }
 ])
 // 查全部
 const getRefund = async function () {