2 Commits

  1. 2
      src/views/moneyManage/executor/executor.vue
  2. 16
      src/views/moneyManage/financialAccount/cashFlow.vue

2
src/views/moneyManage/executor/executor.vue

@ -423,7 +423,7 @@ const submitRefund = async function () {
refundTime: editForm.value.refundTime ? dayjs(editForm.value.refundTime).format('YYYY-MM-DD HH:mm:ss') : "",
refundRemark: editForm.value.refundRemark,
id: editRow.value.id,
refundCurrency: editForm.value.refundCurrency,
refundCurrency: CurrencyForId(editForm.value.refundCurrency),
refundAmount: editForm.value.refundAmount,
refundChannels: editForm.value.refundChannels,
status: 41,

16
src/views/moneyManage/financialAccount/cashFlow.vue

@ -373,6 +373,17 @@ const handleExport = async () => {
return statuses;
};
try {
let performanceMarkets = [];
const selectedNames = queryParams.performanceMarket;
if (Array.isArray(selectedNames) && selectedNames.length > 0) {
performanceMarkets = selectedNames
.map(name => {
if (!name) return null;
const id = MarketNameForId(name);
return id;
})
.filter(id => id !== null && id !== 'null'); //
}
const params = {
pageNum: queryParams.pageNum,
pageSize: queryParams.pageSize,
@ -383,6 +394,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,
performanceMarkets: performanceMarkets,
statuses: formatStatuses(queryParams.statuses),
markets: [],
}
@ -773,12 +785,12 @@ onMounted(async () => {
<el-table-column prop="orderCode" :label="t('common_list.orderCode')" width="280" show-overflow-tooltip />
<el-table-column prop="receivedMarket" :label="t('common_list.receiveArea')" width="280" show-overflow-tooltip >
<template #default="{ row }">
{{ marketFilter(row.receivedMarket) }}
{{ row.receivedMarket }}
</template>
</el-table-column>
<el-table-column prop="performanceMarket" :label="t('common_list.performanceMarket')" width="120" show-overflow-tooltip >
<template #default="{ row }">
{{ marketFilter(row.performanceMarket) }}
{{ row.performanceMarket }}
</template></el-table-column>
<el-table-column prop="name" :label="t('common_list.name')" width="150" show-overflow-tooltip />
<el-table-column prop="jwcode" :label="t('common_list.jwcode')" width="120" />

Loading…
Cancel
Save