Browse Source

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

zhangyong/feature-20260113094820-现金重构
zhangrenyuan 1 month ago
parent
commit
4be0c1333a
  1. 9
      src/api/cash/financialAccount.js
  2. 8
      src/views/moneyManage/financialAccount/cashFlow.vue
  3. 2
      src/views/moneyManage/financialAccount/performanceAttribution.vue

9
src/api/cash/financialAccount.js

@ -35,3 +35,12 @@ export const exportPerformance = (data) => {
data data
}) })
} }
// 导出资金流水
export const exportFunds = (data) => {
return http({
method: 'POST',
url: '/export/exportFunds',
data
})
}

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

@ -5,7 +5,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
import request from '@/util/http.js' import request from '@/util/http.js'
import dayjs from 'dayjs' import dayjs from 'dayjs'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import { Moneyfunds, refundOnline } from '@/api/cash/financialAccount.js'
import { Moneyfunds, refundOnline, exportFunds } from '@/api/cash/financialAccount.js'
import { useAdminStore } from '@/store/index.js' import { useAdminStore } from '@/store/index.js'
import { storeToRefs } from 'pinia' import { storeToRefs } from 'pinia'
import _ from 'lodash'; import _ from 'lodash';
@ -240,7 +240,7 @@ const handleExport = async () => {
} }
// TODO: URL // TODO: URL
const res = await request({ url: '/export/exportCash', data: params })
const res = await exportFunds( params )
if (res.code == 200) { if (res.code == 200) {
console.log('导出参数', params) console.log('导出参数', params)
@ -265,7 +265,7 @@ const getExportList = async () => {
try { try {
const result = await request({ url: '/export/export' }) const result = await request({ url: '/export/export' })
if (result.code === 200) { if (result.code === 200) {
const filteredData = result.data.filter(item => item.type == 13);
const filteredData = result.data.filter(item => item.type == 15);
exportList.value = filteredData || [] exportList.value = filteredData || []
} else { } else {
ElMessage.error(result.msg || t('elmessage.getExportListError')) ElMessage.error(result.msg || t('elmessage.getExportListError'))
@ -458,7 +458,7 @@ onMounted(async () => {
<el-table-column :label="t('common_list.operation')" width="100" fixed="right" align="center"> <el-table-column :label="t('common_list.operation')" width="100" fixed="right" align="center">
<template #default="{ row }"> <template #default="{ row }">
<el-button v-if="row.orderCode.slice(0, 4) == 'GOLD'" type="danger" link size="small"
<el-button v-if="row.orderCode.slice(0, 4) == 'GOLD' && row.status === 4" type="danger" link size="small"
@click="openRefundConfirm(row)"> @click="openRefundConfirm(row)">
{{ t('common_list.refund') }} {{ t('common_list.refund') }}
</el-button> </el-button>

2
src/views/moneyManage/financialAccount/performanceAttribution.vue

@ -196,7 +196,7 @@ const getExportList = async () => {
try { try {
const result = await request({ url: '/export/export' }) const result = await request({ url: '/export/export' })
if (result.code === 200) { if (result.code === 200) {
const filteredData = result.data.filter(item => item.type == 13);
const filteredData = result.data.filter(item => item.type == 14);
exportList.value = filteredData || [] exportList.value = filteredData || []
} else { } else {
ElMessage.error(result.msg || t('elmessage.getExportListError')) ElMessage.error(result.msg || t('elmessage.getExportListError'))

Loading…
Cancel
Save