Browse Source

fix(退款): 修复导出Excel时用户信息未展开的问题

修复coinRefundDetail.vue中导出Excel时refundUser未展开导致参数丢失的问题
同时将auditTime字段改为createTime以保持一致性
优化addCoinConsume.vue中的用户查询逻辑,增加区域提示并完善错误处理
zhangrenyuan/feature-20260113104415-现金重构
zhangrenyuan 1 month ago
parent
commit
b598bac326
  1. 55
      src/views/consume/gold/addCoinConsume.vue
  2. 10
      src/views/refund/gold/coinRefundDetail.vue

55
src/views/consume/gold/addCoinConsume.vue

@ -499,7 +499,10 @@ const getUser = async function (jwcode) {
console.log("请求成功", result); console.log("请求成功", result);
if (result.code === 200 && result.data) {
const { code, data } = result;
const region = data && data.market;
if (data && Object.keys(data).length > 0) {
// //
const currentJwcode = addConsume.value.jwcode; const currentJwcode = addConsume.value.jwcode;
resetForm(); resetForm();
@ -507,37 +510,47 @@ const getUser = async function (jwcode) {
// //
user.value = { user.value = {
...result.data,
...data,
// 100 // 100
nowPermanentGold: result.data.nowPermanentGold,
nowFreeGold: result.data.nowFreeGold,
nowSumGold: result.data.nowSumGold,
nowTaskGold: result.data.nowTaskGold,
nowFreeJune: result.data.nowFreeJune,
nowFreeDecember: result.data.nowFreeDecember,
historySumGold: result.data.historySumGold,
historyPermanentGold: result.data.historyPermanentGold,
historyFreeGold: result.data.historyFreeGold,
historyTaskGold: result.data.historyTaskGold
nowPermanentGold: data.nowPermanentGold,
nowFreeGold: data.nowFreeGold,
nowSumGold: data.nowSumGold,
nowTaskGold: data.nowTaskGold,
nowFreeJune: data.nowFreeJune,
nowFreeDecember: data.nowFreeDecember,
historySumGold: data.historySumGold,
historyPermanentGold: data.historyPermanentGold,
historyFreeGold: data.historyFreeGold,
historyTaskGold: data.historyTaskGold
}; };
ElMessage.success(t('elmessage.searchSuccess'));
if (code === 0 && region) {
ElMessage.info({
message: t('elmessage.userRegionHint', { region }),
customClass: 'custom-blue-message'
});
return;
}
//
if (addConsume.value.redMoney === 1) {
if (code === 200) {
ElMessage.success(t('elmessage.searchSuccess'));
//
if (addConsume.value.redMoney === 1) {
getRedList() getRedList()
}
}
//
validateInput()
//
validateInput()
} else {
ElMessage.warning(result.msg || t('elmessage.checkQueryParams'));
}
} else if (!result.data) {
} else {
ElMessage.warning(t('elmessage.noUser')); ElMessage.warning(t('elmessage.noUser'));
user.value.jwcode = null user.value.jwcode = null
addConsume.value.jwcode = null addConsume.value.jwcode = null
// resetForm(); // // resetForm(); //
} else {
ElMessage.warning(result.msg || t('elmessage.checkQueryParams'));
} }
} catch (error) { } catch (error) {
console.error("请求失败", error); console.error("请求失败", error);

10
src/views/refund/gold/coinRefundDetail.vue

@ -637,11 +637,11 @@ const getMarket = async function () {
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="auditTime" :label="$t('common_export.createTime')">
<template #default="scope">
{{ moment(scope.row.auditTime).format('YYYY-MM-DD HH:mm:ss') }}
</template>
</el-table-column>
<el-table-column prop="createTime" :label="$t('common_export.createTime')">
<template #default="scope">
{{ moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
</template>
</el-table-column>
<el-table-column :label="$t('common_export.operation')"> <el-table-column :label="$t('common_export.operation')">
<template #default="scope"> <template #default="scope">
<el-button type="primary" size="small" @click="downloadExportFile(scope.row)" <el-button type="primary" size="small" @click="downloadExportFile(scope.row)"

Loading…
Cancel
Save