yueyixin
/
foreign-admin-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

处理金额

This commit is contained in:
杨 2026-05-21 13:07:04 +08:00
parent 3a23a85077
commit f0aa2625e9
23 changed files with 358 additions and 303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/components/common/Table.vue
View File

@ -12,7 +12,12 @@
v-bind="$attrs"
@row-click="handleRowClick"
@row-contextmenu="handleRowContextmenu"
@selection-change="handleSelectionChange"
@current-change="handleCurrentChange"
>
<!-- 勾选列 -->
<el-table-column v-if="showSelection" type="selection" width="55" align="center" />
<!-- 动态表头列 -->
<template v-for="(column, index) in columns" :key="index">
<el-table-column
@ -29,7 +34,11 @@
:width="column.width"
:align="column.align || 'left'"
:sortable="column.sortable"
/>
>
<template v-if="column.isNumber" #default="{ row }">
<span>{{ formatDecimalTruncate(row[column.prop]) }}</span>
</template>
</el-table-column>
<!-- 具名插槽列 -->
<el-table-column
@ -50,6 +59,7 @@
<script setup lang="ts">
import { ref, watch } from 'vue'
import type { TableInstance } from 'element-plus'
import { formatDecimalTruncate } from '@/utils/formatDecimal'
// 定义表格列配置接口
interface TableColumn {
@ -60,6 +70,7 @@ interface TableColumn {
align?: 'left' | 'center' | 'right'
slotName?: string // 具名插槽名称
sortable?: boolean // 是否可排序
isNumber?: boolean // 是否为数字类型（自动截取小数位）
}
// 定义表格组件属性接口
@ -73,20 +84,38 @@ interface Props {
border?: boolean // 是否显示边框
highlightCurrentRow?: boolean // 是否高亮当前行
loading?: boolean // 是否显示加载状态
showSelection?: boolean // 是否显示勾选列
}
const props = withDefaults(defineProps<Props>(), {
border: true,
highlightCurrentRow: true,
loading: false,
showSelection: false,
})
// 定义组件抛出的事件
const emit = defineEmits<{
(e: 'row-click', row: any): void // 保留原有行点击事件
(e: 'row-contextmenu', row: any, column: any, event: MouseEvent): void
(e: 'selection-change', rows: any[]): void // 勾选变化事件
(e: 'current-change', row: any): void // 当前行变化事件
}>()
// 处理勾选变化
const handleSelectionChange = (rows: any[]) => {
emit('selection-change', rows)
}
// 处理当前行变化
const handleCurrentChange = (row: any) => {
// 添加空值保护，避免传递 null 导致 Vue 响应式系统报错
if (row === null || row === undefined) {
return
}
emit('current-change', row)
}
const tableRef = ref<TableInstance>()
// 维护当前选中行状态，用于二次点击取消选中
@ -103,7 +132,7 @@ const handleRowClick = (row: any) => {
if (selectedRow.value && selectedRow.value === row) {
// 二次点击：取消选中
selectedRow.value = null
tableRef.value?.setCurrentRow() // 不传参即清除选中 [^14^]
tableRef.value?.setCurrentRow(null) // 传 null 清除选中
} else {
// 首次点击或点击不同行：选中该行
selectedRow.value = row
@ -127,16 +156,29 @@ watch(
() => {
// 数据更新时，清除选中状态
selectedRow.value = null
tableRef.value?.setCurrentRow() // 不传参即清除选中 [^14^]
tableRef.value?.setCurrentRow(null)
},
{ deep: true }, // 深度监听，防止数组元素变化未触发
)
// 监听 loading 属性变化，确保状态同步
watch(
() => props.loading,
(newVal) => {
// loading 状态变化时可以执行额外的处理
console.log('Table loading status changed:', newVal)
},
{ flush: 'sync' }, // 使用 sync 模式确保即时响应
)
// 暴露清除当前选中行的方法
defineExpose({
clearCurrentRow: () => {
selectedRow.value = null
tableRef.value?.setCurrentRow()
tableRef.value?.setCurrentRow(null)
},
setCurrentRow: (row: any) => {
tableRef.value?.setCurrentRow(row)
},
})
</script>

46
src/utils/formatDecimal.ts Normal file
View File

@ -0,0 +1,46 @@
/**
* @description: 金额格式化工具函数
*/
/**
* @description: 截取数字到小数点后指定位数（不四舍五入）
* @param value 需要格式化的值
* @param decimals 保留的小数位数，默认2位
* @returns 格式化后的字符串或数字
*/
export function formatDecimalTruncate(value: string | number | null | undefined, decimals: number = 2): string | number {
// 处理空值
if (value === null || value === undefined || value === '') {
return value ?? ''
}
// 转换为字符串检查原始格式
const originalStr = String(value)
// 转换为数字检查是否有效
const num = Number(value)
// 如果不是有效数字，返回原值
if (isNaN(num)) {
return value
}
// 分割整数和小数部分
const dotIndex = originalStr.indexOf('.')
// 如果没有小数点，添加小数位后返回
if (dotIndex === -1) {
return `${originalStr}.${'0'.repeat(decimals)}`
}
const integerPart = originalStr.substring(0, dotIndex)
const decimalPart = originalStr.substring(dotIndex + 1)
// 截取到指定小数位（不四舍五入）
const truncatedDecimal = decimalPart.substring(0, decimals)
// 补齐小数位到指定位数
const paddedDecimal = truncatedDecimal.padEnd(decimals, '0')
return `${integerPart}.${paddedDecimal}`
}

4
src/views/capital/fundFlow/options.ts
View File

@ -62,9 +62,9 @@ export const tableColumns = [
//资金流向
// { prop: 'fundDirection', label: '资金流向' },
//原有金额
{ prop: 'amount', label: '变动金额' },
{ prop: 'amount', label: '变动金额', isNumber: true },
//余额变动
{ prop: 'balance', label: '变动后余额' },
{ prop: 'balance', label: '变动后余额' , isNumber: true},
//现有余额
// { prop: 'currentBalance', label: '现有余额' },
//状态

2
src/views/capital/rechange/options.ts
View File

@ -6,6 +6,6 @@ export const rechangeTableColumns = [
label: '支持货币',
align: 'center' as const
},
{ prop: 'channel_fee', label: '渠道费用', align: 'center' as const },
{ prop: 'channel_fee', label: '渠道费用', align: 'center' as const , isNumber: true },
{ label: '操作', slotName: 'action', align: 'center' as const, width: 120 },
]

2
src/views/capital/rechangeChanl/options.ts
View File

@ -4,7 +4,7 @@ export const tableColumns = [
//存款渠道名称
{ label: '渠道名称', prop: 'name' },
//存款渠道费用
{ label: '渠道费用', prop: 'channel_fee' },
{ label: '渠道费用', prop: 'channel_fee', isNumber: true },
//存款渠道类型
{ label: '入金货币', prop: 'currency.symbol' },
// 接口地址

41
src/views/capital/rechangeCheck/index.vue
View File

@ -19,36 +19,16 @@
</template>
</RechangeSearch>
<!-- 列表区域：改为真实接口数据，仍保留勾选列供后续审核动作使用 -->
<div class="table-wrapper">
<el-table
ref="tableRef"
v-loading="loading"
:data="tableData"
border
height="100%"
row-key="id"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" width="70" align="center">
<template #default="scope">
{{ (currentPage - 1) * pageSize + scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column
v-for="column in tableColumns"
:key="column.prop"
:prop="column.prop"
:label="column.label"
:min-width="column.width"
:align="column.align || 'center'"
show-overflow-tooltip
/>
</el-table>
</div>
<!-- 列表区域：使用公共 Table 组件 -->
<Table
ref="tableRef"
:table-data="tableData"
:columns="tableColumns"
row-key="id"
:loading="loading"
:show-selection="true"
@selection-change="handleSelectionChange"
/>
<!-- 分页区域：使用接口返回的 total / current_page / per_page -->
<RechangePagination
@ -68,6 +48,7 @@ defineOptions({
import { ElMessage } from 'element-plus'
import { onMounted, ref } from 'vue'
import RechangeSearch from '@/components/common/Search.vue'
import Table from '@/components/common/Table.vue'
import { usePageLoading } from '@/composables/useLoading'
import RechangePagination from '@/components/common/Pagination.vue'
import { exportToExcel } from '@/utils/exportToExcel'

8
src/views/capital/rechangeCheck/options.ts
View File

@ -39,12 +39,12 @@ export const rechangeCheckSearch = [
// 表格列配置：返回数据与 `rechargeOrder` 一致，因此按同一份结构展示。
export const rechangeCheckTableColumns = [
{ prop: 'orderNo', label: '订单号', align: 'center' as const, width: 220 },
{ prop: 'userName', label: '用户名', align: 'center' as const, width: 160 },
{ prop: 'userName', label: '用户名', align: 'center' as const },
{ prop: 'currency', label: '充值币种', align: 'center' as const, width: 120 },
{ prop: 'amount', label: '充值金额', align: 'center' as const, width: 120 },
{ prop: 'amount', label: '充值金额', align: 'center' as const, width: 120, isNumber: true },
{ prop: 'realCurrency', label: '实际币种', align: 'center' as const, width: 120 },
{ prop: 'realAmount', label: '实际金额', align: 'center' as const, width: 120 },
{ prop: 'realAmount', label: '实际金额', align: 'center' as const, width: 120, isNumber: true },
{ prop: 'rate', label: '汇率', align: 'center' as const, width: 100 },
{ prop: 'statusText', label: '状态', align: 'center' as const, width: 100 },
{ prop: 'rechangeTime', label: '充值时间', align: 'center' as const, width: 180 },
{ prop: 'rechangeTime', label: '充值时间', align: 'center' as const },
]

2
src/views/capital/withdraw/options.ts
View File

@ -5,7 +5,7 @@ export const tableColumns = [
// 渠道名称
{ label: '渠道名称', prop: 'name' },
// 渠道费用
{ label: '渠道费用', prop: 'channel_fee' },
{ label: '渠道费用', prop: 'channel_fee', isNumber: true },
{
label: '出金货币',
prop: 'currency.symbol',

2
src/views/capital/withdrawChanl/options.ts
View File

@ -4,7 +4,7 @@ export const tableColumns = [
//渠道名称
{ label: '渠道名称', prop: 'name' },
//渠道费用
{ label: '渠道费用', prop: 'channel_fee' },
{ label: '渠道费用', prop: 'channel_fee', isNumber: true },
//货币类型
// { label: '入金货币', prop: 'currency.name' },
// 接口地址

30
src/views/capital/withdrawCheck/index.vue
View File

@ -8,25 +8,16 @@
</template>
</WithdrawSearch>
<!-- 列表区域：当前使用页面内表格，避免改动公共 Table 组件 -->
<div class="table-wrapper">
<el-table v-loading="loading" :data="tableData" border height="100%" row-key="id"
@selection-change="handleSelectionChange">
<!-- 勾选列：用于后续审核通过/驳回 -->
<el-table-column type="selection" width="55" align="center" />
<!-- 序号列：根据当前分页动态计算 -->
<el-table-column label="序号" width="70" align="center">
<template #default="scope">
{{ (currentPage - 1) * pageSize + scope.$index + 1 }}
</template>
</el-table-column>
<!-- 业务字段列：通过配置项统一渲染 -->
<el-table-column v-for="column in tableColumns" :key="column.prop" :prop="column.prop" :label="column.label"
:width="column.width" :align="column.align || 'center'" show-overflow-tooltip />
</el-table>
</div>
<!-- 列表区域：使用公共 Table 组件 -->
<Table
ref="tableRef"
:table-data="tableData"
:columns="tableColumns"
row-key="id"
:loading="loading"
:show-selection="true"
@selection-change="handleSelectionChange"
/>
<!-- 分页区域：复用项目内分页组件 -->
<WithdrawPagination v-model="currentPage" v-model:pageSizeValue="pageSize" :total="total"
@ -43,6 +34,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
import { computed, onMounted, ref } from 'vue'
import dayjs from 'dayjs'
import WithdrawSearch from '@/components/common/Search.vue'
import Table from '@/components/common/Table.vue'
import { usePageLoading } from '@/composables/useLoading'
import WithdrawPagination from '@/components/common/Pagination.vue'
import { withdrawCheckSearch, withdrawCheckTableColumns } from './options'

20
src/views/capital/withdrawCheck/options.ts
View File

@ -25,18 +25,18 @@ export const withdrawCheckSearch = [
// 表格列配置
export const withdrawCheckTableColumns = [
{ prop: 'trade_id', label: '订单号', align: 'center' as const, width: 200 },
{ prop: 'user_name', label: '账户持有人', align: 'center' as const, width: 120 },
{ prop: 'user_name', label: '账户持有人', align: 'center' as const},
{ prop: 'withdraw_currency_symbol', label: '取款币种', align: 'center' as const, width: 100 },
{ prop: 'withdraw_amount', label: '取款金额', align: 'center' as const, width: 120 },
{ prop: 'withdraw_amount', label: '取款金额', align: 'center' as const, width: 120, isNumber: true },
{ prop: 'real_currency_symbol', label: '到账币种', align: 'center' as const, width: 100 },
{ prop: 'real_amount', label: '到账金额', align: 'center' as const, width: 120 },
{ prop: 'real_amount', label: '到账金额', align: 'center' as const, width: 120, isNumber: true },
{ prop: 'rate', label: '汇率', align: 'center' as const, width: 100 },
{ prop: 'channel_name', label: '渠道', align: 'center' as const, width: 140 },
{ prop: 'withdraw_service_fee', label: '服务费', align: 'center' as const, width: 100 },
{ prop: 'withdraw_head_fee', label: '总部手续费', align: 'center' as const, width: 120 },
{ prop: 'withdraw_fee_handle', label: '代理手续费', align: 'center' as const, width: 120 },
{ prop: 'withdraw_point_diff', label: '点差', align: 'center' as const, width: 100 },
{ prop: 'withdraw_risk_fee', label: '风控费', align: 'center' as const, width: 100 },
{ prop: 'withdraw_address', label: '提现地址', align: 'center' as const, width: 180 },
{ prop: 'created_at', label: '申请时间', align: 'center' as const, width: 180 }
{ prop: 'withdraw_service_fee', label: '服务费', align: 'center' as const, width: 100, isNumber: true },
{ prop: 'withdraw_head_fee', label: '总部手续费', align: 'center' as const, width: 120, isNumber: true },
{ prop: 'withdraw_fee_handle', label: '代理手续费', align: 'center' as const, width: 120, isNumber: true },
{ prop: 'withdraw_point_diff', label: '点差', align: 'center' as const, width: 100, isNumber: true },
{ prop: 'withdraw_risk_fee', label: '风控费', align: 'center' as const, isNumber: true },
{ prop: 'withdraw_address', label: '提现地址', align: 'center' as const},
{ prop: 'created_at', label: '申请时间', align: 'center' as const}
]

186
src/views/mould/handleFee/index.vue
View File

@ -2,59 +2,23 @@
<div class="mould-fee table_form-container">
<header>
<div class="header-actions">
<el-button type="primary" @click="addFee" v-auth="'feeHandl_createFeeSetting'"
>添加模板</el-button
>
<el-button type="primary" @click="editFee" v-auth="'feeHandl_editFeeSetting'"
>编辑模板</el-button
>
<el-button type="primary" @click="changeStatus(1)" v-auth="'feeHandl_editFeeSetting'"
>启用模板</el-button
>
<el-button type="danger" @click="changeStatus(2)" v-auth="'feeHandl_editFeeSetting'"
>禁用模板</el-button
>
<el-button type="primary" @click="editFeeDetail" v-auth="'feeHandl_setFeeSettingDetail'"
>编辑模板详情</el-button
>
<el-button type="primary" @click="addFee" v-auth="'feeHandl_createFeeSetting'">添加模板</el-button>
<el-button type="primary" @click="editFee" v-auth="'feeHandl_editFeeSetting'">编辑模板</el-button>
<el-button type="primary" @click="changeStatus(1)" v-auth="'feeHandl_editFeeSetting'">启用模板</el-button>
<el-button type="danger" @click="changeStatus(2)" v-auth="'feeHandl_editFeeSetting'">禁用模板</el-button>
<el-button type="primary" @click="editFeeDetail" v-auth="'feeHandl_setFeeSettingDetail'">编辑模板详情</el-button>
</div>
</header>
<div class="table-container">
<div class="table-container-left">
<el-table
ref="singleTableRef"
height="100%"
:data="tableData"
highlight-current-row
border
@current-change="handleCurrentChange"
:loading="loading"
>
<el-table-column type="index" width="55" />
<el-table-column
v-for="column in tableColumns"
:key="column.prop"
:prop="column.prop"
:label="column.label"
/>
</el-table>
<Table ref="singleTableRef" :table-data="tableData" :columns="tableColumns" row-key="id" :loading="loading"
:highlight-current-row="true" @current-change="handleCurrentChange" />
</div>
<div class="table-container-right">
<el-table height="100%" :data="tableDataDetail" :loading="loading">
<el-table-column
v-for="column in tableColumnsDetail"
:key="column.prop"
:prop="column.prop"
:label="column.label"
/>
</el-table>
<Table row-key="id" :table-data="tableDataDetail" :columns="tableColumnsDetail" :loading="detailLoading" />
</div>
</div>
<el-dialog
v-model="dialogVisible"
:title="dialogTitleType === 1 ? '添加手续费模板' : '编辑手续费模板'"
width="500"
>
<el-dialog v-model="dialogVisible" :title="dialogTitleType === 1 ? '添加手续费模板' : '编辑手续费模板'" width="500">
<Form :formItems="formItems" :formRules="formRules" :formData="formData" />
<template #footer>
<div class="dialog-footer">
@ -68,12 +32,7 @@
<template v-for="column in tableColumnsDetail" :key="column.prop">
<el-table-column v-if="column.prop === 'fee'" :prop="column.prop" :label="column.label">
<template #default="scope">
<el-input-number
:min="0"
:max="999999999"
:controls="false"
v-model="scope.row.fee"
/>
<el-input-number :min="0" :max="999999999" :controls="false" v-model="scope.row.fee" />
</template>
</el-table-column>
<el-table-column v-else :prop="column.prop" :label="column.label" />
@ -94,10 +53,9 @@
defineOptions({
name: 'HandleFee'
})
import { ref, onMounted } from 'vue'
import { usePageLoading } from '@/composables/useLoading'
const { loading, startLoading, stopLoading } = usePageLoading()
import {
getFeeSettingList,
getFeeSettingDetail,
@ -106,18 +64,40 @@ import {
setFeeSettingDetail,
} from '@/api/modules/mould/handleFee.ts'
import Form from '@/components/common/Form.vue'
import Table from '@/components/common/Table.vue'
import { formDataList, formRulesList } from './option.ts'
// 弹窗相关
const dialogVisible = ref(false)
const dialogTitleType = ref(1)
// 表单相关
const formData = ref({
name: '',
status: 1,
type: 2,
description: '',
})
const formItems = ref(formDataList)
const formRules = ref(formRulesList)
const formItems = formDataList
const formRules = formRulesList
// 详情弹窗相关
const detaildialogVisible = ref(false)
// 加载状态
const { loading, startLoading, stopLoading } = usePageLoading()
const detailLoading = ref(false)
// 主表格相关
const tableData = ref<any[]>([])
const tableColumns = [
{ prop: 'name', label: '名称' },
{ prop: 'type', label: '状态' },
]
const currentRow = ref<Record<string, any>>({})
const singleTableRef = ref()
// 重置表单数据
const resetFormData = () => {
formData.value = {
name: '',
@ -127,61 +107,72 @@ const resetFormData = () => {
}
}
const tableData = ref([])
const tableColumns = ref([
{ prop: 'name', label: '名称' },
{ prop: 'type', label: '状态' },
])
const currentRow = ref({})
const singleTableRef = ref()
const setCurrent = (row) => {
singleTableRef.value.setCurrentRow(row)
}
const handleCurrentChange = (row: any) => {
currentRow.value = row
getItemDetail(row.id)
// 设置当前选中行
const setCurrent = (row: any) => {
singleTableRef.value?.setCurrentRow(row)
}
const tableDataDetail = ref([])
const tableColumnsDetail = ref([
// 主表格行选中变化
const handleCurrentChange = (row: any) => {
currentRow.value = row
fetchItemDetail(row.id)
}
// 详情表格相关
const tableDataDetail = ref<any[]>([])
const tableColumnsDetail = [
{ prop: 'name', label: '品种' },
{ prop: 'code', label: '编号' },
{ prop: 'fee', label: '开仓手续费' },
])
]
// 获取主表格数据
const getTableData = async () => {
startLoading()
try {
const res = await getFeeSettingList()
const savedId = currentRow.value?.id
tableData.value = res
console.log(res)
if (res && res.length > 0) {
const targetRow = savedId ? res.find((item: any) => item.id === savedId) : null
if (targetRow) {
setCurrent(targetRow)
handleCurrentChange(targetRow)
} else {
setCurrent(res[0])
handleCurrentChange(res[0])
}
}
tableData.value = Array.isArray(res) ? res : []
handleTableDataAfterLoad()
} finally {
stopLoading()
}
}
const getItemDetail = async (id: number) => {
const res = await getFeeSettingDetail({ id })
tableDataDetail.value = res
// 处理表格数据加载后的逻辑
const handleTableDataAfterLoad = () => {
const savedId = currentRow.value?.id
if (tableData.value.length === 0) {
tableDataDetail.value = []
return
}
const targetRow = savedId ? tableData.value.find((item) => item.id === savedId) : null
const rowToSelect = targetRow || tableData.value[0]
setCurrent(rowToSelect)
handleCurrentChange(rowToSelect)
}
// 获取详情数据
const fetchItemDetail = async (id: number) => {
detailLoading.value = true
try {
const res = await getFeeSettingDetail({ id })
tableDataDetail.value = res || []
} finally {
detailLoading.value = false
}
}
// 打开添加弹窗
const addFee = () => {
dialogVisible.value = true
dialogTitleType.value = 1
resetFormData()
}
// 打开编辑弹窗
const editFee = () => {
dialogVisible.value = true
dialogTitleType.value = 2
@ -193,6 +184,7 @@ const editFee = () => {
}
}
// 切换模板状态
const changeStatus = (status: number) => {
dialogTitleType.value = 2
formData.value = {
@ -205,8 +197,8 @@ const changeStatus = (status: number) => {
submit()
}
// 提交主表单
const submit = async () => {
console.log(formData.value)
if (dialogTitleType.value === 1) {
await createFeeSetting(formData.value)
} else {
@ -217,21 +209,24 @@ const submit = async () => {
getTableData()
}
const detaildialogVisible = ref(false)
// 打开编辑详情弹窗
const editFeeDetail = () => {
detaildialogVisible.value = true
console.log(tableDataDetail.value)
}
// 提交详情表单
const submitDetail = async () => {
let contents_json = {}
const contentsJson: Record<string, any> = {}
tableDataDetail.value.forEach((item) => {
contents_json[item.variety_id] = item.fee
contentsJson[item.variety_id] = item.fee
})
await setFeeSettingDetail({
id: currentRow.value.id,
contents_json: JSON.stringify(contents_json),
contents_json: JSON.stringify(contentsJson),
})
detaildialogVisible.value = false
getTableData()
}
@ -246,19 +241,23 @@ onMounted(() => {
// height: 100%;
// overflow: hidden;
}
header {
margin-bottom: 8px;
}
.table-container {
display: flex;
column-gap: 20px;
height: calc(100% - 40px);
.table-container-left {
width: 300px;
height: 100%;
flex: 0 0 auto;
overflow: hidden;
}
.table-container-right {
flex: 1;
height: 100%;
@ -266,3 +265,4 @@ header {
}
}
</style>

149
src/views/mould/risk/index.vue
View File

@ -2,71 +2,31 @@
<div class="risk table_form-container">
<div class="bar">
<span>风控管理</span>
<el-button type="primary" @click="handleAddRisk" v-auth="'riskControl_createRiskControl'"
>添加</el-button
>
<el-button
type="primary"
@click="handleModifyRisk"
v-auth="'riskControl_editRiskControlSetting'"
>修改</el-button
>
<el-button
type="danger"
@click="handleChangeStatus(2)"
v-auth="'riskControl_editRiskControlSetting'"
>停用</el-button
>
<el-button
type="primary"
@click="handleChangeStatus(1)"
v-auth="'riskControl_editRiskControlSetting'"
>启用</el-button
>
<el-button type="primary" @click="handleAddRisk" v-auth="'riskControl_createRiskControl'">添加</el-button>
<el-button type="primary" @click="handleModifyRisk" v-auth="'riskControl_editRiskControlSetting'">修改</el-button>
<el-button type="danger" @click="handleChangeStatus(2)"
v-auth="'riskControl_editRiskControlSetting'">停用</el-button>
<el-button type="primary" @click="handleChangeStatus(1)"
v-auth="'riskControl_editRiskControlSetting'">启用</el-button>
</div>
<!-- 表格 -->
<div class="risk-table-content">
<RiskTableSwitch
:columns="tableColumnsSwitch"
:table-data="tableTreeSwitch"
class="table-switch"
@row-click="handleRowClick"
row-key="id"
highlight-current-row
:current-row-key="selectedRowId"
:loading="loading"
>
<RiskTableSwitch :columns="tableColumnsSwitch" :table-data="tableTreeSwitch" class="table-switch"
@row-click="handleRowClick" row-key="id" highlight-current-row :current-row-key="selectedRowId"
:loading="loading">
<template #status="{ row }">
<span>{{ row.status === 1 ? '启用' : '停用' }}</span>
</template>
</RiskTableSwitch>
<RiskTableContent
:columns="tableColumnsContent"
:table-data="currentContent"
class="table-content"
row-key="id"
:loading="loading"
>
<RiskTableContent :columns="tableColumnsContent" :table-data="currentContent" class="table-content" row-key="id"
:loading="detailLoading">
</RiskTableContent>
</div>
<!-- dialog -->
<RiskDialog
:visible="dialogVisible"
:title="dialogTitle"
:type="dialogType"
@confirm="handleSubmit"
@cancel="handleCancel"
@close="handleClose"
>
<RiskForm
:form-data="dialogForm"
:form-rules="riskRules"
:form-items="RiskFormItems"
:options-map="riskFormOptionsMap"
:row-gutter="rowGutter"
:col-span="colSpan"
ref="riskFormRef"
/>
<RiskDialog :visible="dialogVisible" :title="dialogTitle" :type="dialogType" @confirm="handleSubmit"
@cancel="handleCancel" @close="handleClose">
<RiskForm :form-data="dialogForm" :form-rules="riskRules" :form-items="RiskFormItems"
:options-map="riskFormOptionsMap" :row-gutter="rowGutter" :col-span="colSpan" ref="riskFormRef" />
</RiskDialog>
</div>
</template>
@ -137,6 +97,8 @@ const dialogForm = ref({
})
const riskRules = ref(rules())
const riskFormRef = ref()
const detailLoading = ref(false)
const RiskFormItems = ref(formItem)
const riskFormOptionsMap = ref({
@ -170,41 +132,41 @@ const colSpan = ref(12)
* @description: 定义请求数据方法
*/
const getRiskList = async () => {
startLoading()
const data: any = await getRiskListApi()
stopLoading()
// 保存原始数据
riskOriginData.value = data
// 处理数据
tableTreeSwitch.value = data.map((item: any) => ({
id: item.id,
name: item.name,
status: item.status,
}))
tableTreeContent.value = data.map((item: any) => ({
id: item.id,
isDefault: item.is_default,
// 单笔开仓最大数量
maxOpenPosition: item.max_opening_quantity_per_transaction,
// 单品种最大持仓数量
maxPositionPerSymbol: item.max_holding_quantity_per_variety,
// 总品种最大持仓数量
maxTotalPosition: item.max_holding_quantity_per_transaction,
// 强平比例
strongCloseRatio: item.strong_to_average_ratio,
// 每次出金最大金额
maxWithdrawalAmount: item.max_withdrawal_amount_per_transaction,
// 是否允许出金
isWithdrawalAllowed: item.withdraw_status === 1 ? '是' : '否',
// 出金时间设置
withdrawalTimeSetting: item.withdraw_time,
// 是否需要出金审核
isWithdrawalAuditRequired: item.withdraw_is_check === 1 ? '是' : '否',
// 建仓多少秒不能平仓
buildCloseTime: item.open_close_time,
// 每次出金最小金额
minWithdrawalAmount: item.min_withdrawal_amount_per_transaction,
// 滑点
startLoading()
const data: any = await getRiskListApi()
stopLoading()
// 保存原始数据
riskOriginData.value = data
// 处理数据
tableTreeSwitch.value = data.map((item: any) => ({
id: item.id,
name: item.name,
status: item.status,
}))
tableTreeContent.value = data.map((item: any) => ({
id: item.id,
isDefault: item.is_default,
// 单笔开仓最大数量
maxOpenPosition: item.max_opening_quantity_per_transaction,
// 单品种最大持仓数量
maxPositionPerSymbol: item.max_holding_quantity_per_variety,
// 总品种最大持仓数量
maxTotalPosition: item.max_holding_quantity_per_transaction,
// 强平比例
strongCloseRatio: item.strong_to_average_ratio,
// 每次出金最大金额
maxWithdrawalAmount: item.max_withdrawal_amount_per_transaction,
// 是否允许出金
isWithdrawalAllowed: item.withdraw_status === 1 ? '是' : '否',
// 出金时间设置
withdrawalTimeSetting: item.withdraw_time,
// 是否需要出金审核
isWithdrawalAuditRequired: item.withdraw_is_check === 1 ? '是' : '否',
// 建仓多少秒不能平仓
buildCloseTime: item.open_close_time,
// 每次出金最小金额
minWithdrawalAmount: item.min_withdrawal_amount_per_transaction,
// 滑点
slippage: item.slippage,
// 每次入金最小金额
minDepositAmount: item.min_recharge_amount_per_transaction,
@ -272,7 +234,7 @@ const handleModifyRisk = () => {
} as any
}
const handleChangeStatus = async (status) => {
const handleChangeStatus = async (status:any) => {
dialogTitle.value = '停用'
dialogType.value = 'status'
await editRiskApi({ ...selectedRow.value, status: status })
@ -283,6 +245,7 @@ const handleChangeStatus = async (status) => {
* @description: 定义表格方法
*/
const handleRowClick = (row: any) => {
detailLoading.value = true
// 从原始数据中匹配完整的行信息
const originRow = riskOriginData.value.find((item) => item.id === row.id)
if (originRow) {
@ -292,7 +255,7 @@ const handleRowClick = (row: any) => {
}
selectedRowId.value = row.id
// 找到对应的数据并更新右侧内容
const targetItem = tableTreeContent.value.find((item: any) => item.id === row.id)
const targetItem:any = tableTreeContent.value.find((item: any) => item.id === row.id)
const fields = [
{ text: '单笔开仓最大数量' + targetItem.maxOpenPosition },
@ -312,6 +275,8 @@ const handleRowClick = (row: any) => {
if (targetItem) {
currentContent.value = fields
}
detailLoading.value = false
}
/**

7
src/views/order/position/index.vue
View File

@ -17,6 +17,7 @@
<PositionStatTable
:table-data="orderPositionStore.positionOrderList"
:columns="tableColumnsOptions"
:loading="loading"
row-key="id"
/>
</div>
@ -35,6 +36,10 @@ import { search, tableColumns } from './options'
import { useTransactionStore } from '@/stores/modules/transaction.ts'
import { useOrderPositionStore } from '@/stores/modules/orderPosition.ts'
import { usePageLoading } from '@/composables/useLoading'
// 按钮 loading
const { loading, startLoading, stopLoading } = usePageLoading()
// 导出表格
import { exportToExcel } from '@/utils/exportToExcel'
@ -57,7 +62,9 @@ const tableColumnsOptions = ref(tableColumns)
* @description: 定义搜索方法
*/
const handleSearch = async () => {
startLoading()
const data = await checkAccountIdIsSonForUser({ account_id: searchForm.value.account_id })
stopLoading()
if (!data.flag) {
return ElMessage.warning('请输入下级ID')
}

4
src/views/order/position/options.ts
View File

@ -14,9 +14,9 @@ export const tableColumns = [
// 操作类型
{ prop: 'tradeType', label: '操作类型' },
// 金额
{ prop: 'amount', label: '金额' },
{ prop: 'amount', label: '金额', isNumber: true },
// 交易数量
{ prop: 'tradeQty', label: '交易数量' },
{ prop: 'tradeQty', label: '交易数量'},
// 交易时间
{ prop: 'tradeTime', label: '交易时间' },
// 浮动盈亏

2
src/views/order/rechange/options.ts
View File

@ -51,7 +51,7 @@ export const search = [
export const tableColumns = [
{ prop: 'orderNo', label: '订单号', align: 'center' as const },
{ prop: 'currency', label: '充值币种', align: 'center' as const },
{ prop: 'amount', label: '金额', align: 'center' as const },
{ prop: 'amount', label: '金额', align: 'center' as const, isNumber: true },
{ prop: 'statusText', label: '状态', align: 'center' as const },
{ prop: 'rechangeTime', label: '充值时间', align: 'center' as const },
{ prop: 'rechangeAccount', label: '充值账号', align: 'center' as const },

2
src/views/order/withdraw/options.ts
View File

@ -31,7 +31,7 @@ export const search = [
export const tableColumns = [
{ prop: 'orderNo', label: '订单号', align: 'center' as const },
{ prop: 'currency', label: '提现币种', align: 'center' as const },
{ prop: 'amount', label: '金额', align: 'center' as const },
{ prop: 'amount', label: '金额', align: 'center' as const, isNumber: true },
{ prop: 'statusText', label: '状态', align: 'center' as const },
{ prop: 'withdrawTime', label: '提现时间', align: 'center' as const },
{ prop: 'withdrawAccount', label: '提现账号', align: 'center' as const },

2
src/views/profile/agent/options.ts
View File

@ -38,7 +38,7 @@ export const tableColumns = [
{ prop: 'role', label: '账号角色' },
// 账号数量
{ prop: 'accountQty', label: '账号数量' },
{ prop: 'wallet_capital.amount', label: '资金', align: 'center' as const },
{ prop: 'wallet_capital.amount', label: '资金', align: 'center' as const, isNumber: true },
// 点差分配比例
{ prop: 'marginRatio', label: '点差分配比例', slotName: 'marginRatio' },
// 手续费分成比例

21
src/views/profile/business/options.ts
View File

@ -25,34 +25,35 @@ export const marketTableColumns = [
//基本账户
{ label: '基本账户', prop: 'basicAccount', align: 'center' as const, width: '200px' },
//保证金
{ label: '保证金', prop: 'margin', align: 'center' as const, width: '200px' },
{ label: '保证金', prop: 'margin', align: 'center' as const, width: '200px', isNumber: true },
//停止接单保证金
{ label: '停止接单保证金', prop: 'stopOrderMargin', align: 'center' as const, width: '200px' },
{ label: '停止接单保证金', prop: 'stopOrderMargin', align: 'center' as const, width: '200px', isNumber: true },
//持仓转移保证金
{
label: '持仓转移保证金',
prop: 'positionTransferMargin',
align: 'center' as const,
width: '200px',
isNumber: true,
},
//头寸比率
{ label: '头寸比率', prop: 'positionRatio', align: 'center' as const, width: '150px' },
{ label: '头寸比率', prop: 'positionRatio', align: 'center' as const, width: '150px', isNumber: true },
//点差返佣
{ label: '点差返佣', prop: 'pointSpreadCommission', align: 'center' as const, width: '200px' },
{ label: '点差返佣', prop: 'pointSpreadCommission', align: 'center' as const, width: '200px', isNumber: true },
//点差
{ label: '点差', slotName: 'pointSpread', align: 'center' as const, width: '150px' },
//手续费比例
{ label: '手续费比例', prop: 'commissionRatio', align: 'center' as const, width: '150px' },
{ label: '手续费比例', prop: 'commissionRatio', align: 'center' as const, width: '150px', isNumber: true },
//手续费返佣
{ label: '手续费返佣', prop: 'commissionReturn', align: 'center' as const, width: '150px' },
{ label: '手续费返佣', prop: 'commissionReturn', align: 'center' as const, width: '150px', isNumber: true },
//浮动盈亏
{ label: '浮动盈亏', prop: 'floatProfitLoss', align: 'center' as const, width: '100px' },
{ label: '浮动盈亏', prop: 'floatProfitLoss', align: 'center' as const, width: '100px', isNumber: true },
//平仓盈亏
{ label: '平仓盈亏', prop: 'closeProfitLoss', align: 'center' as const, width: '150px' },
{ label: '平仓盈亏', prop: 'closeProfitLoss', align: 'center' as const, width: '150px', isNumber: true },
//风险金
{ label: '风险金', prop: 'riskMargin', align: 'center' as const, width: '150px' },
{ label: '风险金', prop: 'riskMargin', align: 'center' as const, width: '150px', isNumber: true },
//服务费
{ label: '服务费', prop: 'serviceFee', align: 'center' as const, width: '150px' },
{ label: '服务费', prop: 'serviceFee', align: 'center' as const, width: '150px', isNumber: true },
]
//做市商添加配置

2
src/views/profile/user/options.ts
View File

@ -54,7 +54,7 @@ export const clientTableColumns = [
{ prop: 'username', label: '用户名', align: 'center' as const },
{ prop: 'createdTime', label: '注册时间', align: 'center' as const },
{ prop: 'agentUsername', label: '所属代理', align: 'center' as const },
{ prop: 'wallet_capital.amount', label: '资金', align: 'center' as const },
{ prop: 'wallet_capital.amount', label: '资金', align: 'center' as const, isNumber: true },
{ label: '状态', slotName: 'status', align: 'center' as const },
{ label: '操作', slotName: 'action', align: 'center' as const },
]

4
src/views/trade/variety/options.ts
View File

@ -33,9 +33,9 @@ export const tableColumns = [
// 交易分组
{ prop: 'tradeGroup', label: '交易分组', align: 'center' as const },
// 多头库存费
{ prop: 'longStockFee', label: '多头库存费', align: 'center' as const },
{ prop: 'longStockFee', label: '多头库存费', align: 'center' as const, isNumber: true },
// 空头库存费
{ prop: 'shortStockFee', label: '空头库存费', align: 'center' as const },
{ prop: 'shortStockFee', label: '空头库存费', align: 'center' as const, isNumber: true },
// 类型
{ prop: 'type', label: '类型', align: 'center' as const },
// 止盈水平

37
src/views/user/Login.vue
View File

@ -52,7 +52,7 @@
</el-form-item>
</Transition>
<el-form-item class="form-submit">
<el-button type="primary" @click="handleLogin">登录</el-button>
<el-button type="primary" @click="handleLogin" :loading="activeTab === 'password' && buttonLoading">登录</el-button>
</el-form-item>
<router-link to="/user/register" class="to-register">没有账号？去注册</router-link>
</el-form>
@ -74,6 +74,7 @@ import UserTabs from './components/Tabs.vue'
//公共方法/store/配置文件
import { useUserStore } from '@/stores/modules/user'
import { useButtonLoading } from '@/composables/useLoading'
import { setStorage, getStorage } from '@/utils/storage'
import { md5Encrypt } from '@/utils/crypto'
@ -83,6 +84,9 @@ import { passwordRules, emailRules, phoneRules, codeRules } from './config/rules
const router = useRouter()
// 按钮 loading
const { buttonLoading, startButtonLoading, stopButtonLoading } = useButtonLoading()
//userText 实例
const userText = ref({
backText: '',
@ -179,19 +183,26 @@ const handleLogin = async () => {
else if (currentTab === 'password') {
// 校验密码+验证码
await loginFormRef.value.validateField(['password', 'code'])
// 生成device_no并保存到变量（关键修改1）
const deviceNo = generateTimestampWithRandomNum()
// 登录参数
const loginParams = {
email: loginForm.value.email,
mobile: loginForm.value.countryCode + loginForm.value.phone,
login_type: getStorage('loginType', 'session') === 'email' ? 1 : 2,
code: loginForm.value.code,
password: loginForm.value.password,
device_no: deviceNo,
// 开启 loading
startButtonLoading()
try {
// 生成device_no并保存到变量（关键修改1）
const deviceNo = generateTimestampWithRandomNum()
// 登录参数
const loginParams = {
email: loginForm.value.email,
mobile: loginForm.value.countryCode + loginForm.value.phone,
login_type: getStorage('loginType', 'session') === 'email' ? 1 : 2,
code: loginForm.value.code,
password: loginForm.value.password,
device_no: deviceNo,
}
await userStore.login(loginParams)
setStorage('device_no', deviceNo)
} finally {
// 关闭 loading
stopButtonLoading()
}
await userStore.login(loginParams)
setStorage('device_no', deviceNo)
}
} catch (error) {
console.error('表单校验失败：', error)

36
src/views/user/Register.vue
View File

@ -94,7 +94,7 @@
>
</el-form-item>
<el-form-item class="form-submit">
<el-button type="primary" class="form-btn" @click="handleRegister">注册</el-button>
<el-button type="primary" class="form-btn" @click="handleRegister" :loading="buttonLoading">注册</el-button>
</el-form-item>
<router-link to="/user/login" class="to-login">已有账号？立即登录</router-link>
</el-form>
@ -118,6 +118,7 @@ import UserCaptcha from './components/Captcha.vue'
import { useUserStore } from '@/stores/modules/user'
import { md5Encrypt } from '@/utils/crypto'
import { sendCaptcha, initCaptchaState, clearCaptchaTimer } from '@/utils/sendCaptcha'
import { useButtonLoading } from '@/composables/useLoading'
//用户校验规则
import { countryOptions } from '@/views/user/config/mock'
@ -128,6 +129,9 @@ import { useRoute } from 'vue-router'
const userStore = useUserStore()
const route = useRoute()
// 按钮 loading
const { buttonLoading, startButtonLoading, stopButtonLoading } = useButtonLoading()
// UserText 实例
const userText = ref({
backText: '',
@ -215,19 +219,25 @@ const handleRegister = async () => {
try {
// 提交时再次验证（显示错误提示）
await registerFormRef.value.validate()
// 开启 loading
startButtonLoading()
try {
// 注册参数
const registerParams = {
email: registerForm.value.email,
mobile: registerForm.value.countryCode + registerForm.value.phone,
reg_type: activeTab.value === 'email' ? 1 : 2,
invite_code: registerForm.value.inviteCode,
code: registerForm.value.code,
password: registerForm.value.password,
}
// 注册参数
const registerParams = {
email: registerForm.value.email,
mobile: registerForm.value.countryCode + registerForm.value.phone,
reg_type: activeTab.value === 'email' ? 1 : 2,
invite_code: registerForm.value.inviteCode,
code: registerForm.value.code,
password: registerForm.value.password,
// 注册逻辑
await userStore.register(registerParams)
} finally {
// 关闭 loading
stopButtonLoading()
}
// 注册逻辑
await userStore.register(registerParams)
} catch (error) {
console.error('表单校验失败：', error)
}
@ -239,7 +249,7 @@ onUnmounted(() => {
})
onMounted(() => {
registerForm.value.inviteCode = route.query.invite_code
registerForm.value.inviteCode = route.query.invite_code || ''
})
</script>