diff --git a/src/api/modules/account/agent.ts b/src/api/modules/account/agent.ts deleted file mode 100644 index 910720b..0000000 --- a/src/api/modules/account/agent.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { request } from '@/api'; -import type { searchParams, pointDiffConfigParams } from '@/api/types/account/agent' - -// 获取代理列表 -export async function getAgentListApi(params: searchParams): Promise { - return request.get('/agent/getAgentList2', { ...params }) -} -//获取代理点差配置 -export async function getPointDiffConfigApi(params: pointDiffConfigParams): Promise { - return request.get('/agent/getSelfVarietyPointDiffConfig',{...params}) -} -//获取风控模板选项 -export async function getRiskTemplateOptionsApi(): Promise { - return request.get('/agent/getRiskControlOptions') -} -//获取手续费模板选项 -export async function getFeeTemplateOptionsApi(): Promise { - return request.get('user/getFeeSettingOptions') -} -//编辑代理点差 -export async function editPointDiffApi(params: pointDiffConfigParams): Promise { - return request.post('/agent/editAgent',{...params}) -} \ No newline at end of file diff --git a/src/api/modules/profile/agent.ts b/src/api/modules/profile/agent.ts new file mode 100644 index 0000000..e8c5272 --- /dev/null +++ b/src/api/modules/profile/agent.ts @@ -0,0 +1,7 @@ +import { request } from '@/api'; +import type { searchParams, pointDiffConfigParams } from '@/api/types/account/agent' + +// 获取代理列表 +export async function getAgentListApi(params: searchParams): Promise { + return request.get('/agent/getAgentList2', { ...params }) +} \ No newline at end of file diff --git a/src/views/order/transfer/index.vue b/src/views/order/transfer/index.vue index 4b08e11..4528ba4 100644 --- a/src/views/order/transfer/index.vue +++ b/src/views/order/transfer/index.vue @@ -1,21 +1,32 @@ diff --git a/src/views/order/transfer/options.ts b/src/views/order/transfer/options.ts index ccb07ea..26534c9 100644 --- a/src/views/order/transfer/options.ts +++ b/src/views/order/transfer/options.ts @@ -2,36 +2,36 @@ * @description: 搜索配置 */ export const search = [ - //存款账户 - { - label: '转账账户', - prop: 'transferAccount', - type: 'input' as const, - placeholder: '请输入转账账户' - }, - //级别 - { - label: '转账类型', - prop: 'level', - type: 'select' as const, - placeholder: '请选择转账类型', - options: [ - { label: '客户', value: '1' }, - { label: '三方', value: '2' }, - ] - }, - //选择时间 - { - label: '时间', - prop: 'transferTime', - type: 'date' as const, - dateType: 'datetimerange' as const, - placeholder: '请选择转账时间', - format: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'YYYY-MM-DD HH:mm:ss', - startPlaceholder: '开始时间', - endPlaceholder: '结束时间', - }, + //存款账户 + { + label: '转账账户', + prop: 'transferAccount', + type: 'input' as const, + placeholder: '请输入转账账户', + }, + //级别 + { + label: '转账类型', + prop: 'type', + type: 'select' as const, + placeholder: '请选择转账类型', + options: [ + { label: '客户', value: '1' }, + { label: '三方', value: '2' }, + ], + }, + //选择时间 + { + label: '时间', + prop: 'transferTime', + type: 'date' as const, + dateType: 'datetimerange' as const, + placeholder: '请选择转账时间', + format: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'YYYY-MM-DD HH:mm:ss', + startPlaceholder: '开始时间', + endPlaceholder: '结束时间', + }, ] // 表格配置 diff --git a/src/views/profile/agent/index.vue b/src/views/profile/agent/index.vue index b725fdc..a94116e 100644 --- a/src/views/profile/agent/index.vue +++ b/src/views/profile/agent/index.vue @@ -1,52 +1,98 @@ diff --git a/src/views/profile/business/options.ts b/src/views/profile/business/options.ts index 1ab43a9..8772b68 100644 --- a/src/views/profile/business/options.ts +++ b/src/views/profile/business/options.ts @@ -75,12 +75,17 @@ export const countryOptions = ref([ ]) //编辑点差表格列配置 -export const marketPointTableColumns = ([ - { prop: 'varietyName', label: '名称', align: 'center' as const }, - { prop: 'varietyCode', label: '编号', align: 'center' as const }, - { prop: 'pointDifference', label: '可分配点差', align: 'center' as const }, - { prop: 'assignedPointDifference', label: '已分配点差', align: 'center' as const, slotName: 'assignedPointDiff' }, -]) +export const marketPointTableColumns = [ + { prop: 'varietyName', label: '名称', align: 'center' as const }, + { prop: 'varietyCode', label: '编号', align: 'center' as const }, + { prop: 'point_diff', label: '可分配点差', align: 'center' as const }, + { + prop: 'pointDifference', + label: '已分配点差', + align: 'center' as const, + slotName: 'assignedPointDiff', + }, +] // 查看点差表格列配置 export const viewMarketPointTableColumns = ([ diff --git a/src/views/profile/user/index.vue b/src/views/profile/user/index.vue index 3a5729c..0b08c4b 100644 --- a/src/views/profile/user/index.vue +++ b/src/views/profile/user/index.vue @@ -85,7 +85,7 @@ import { rules } from './rules' const clientSearchOptions = ref(clientSearch) const clientSearchForm = ref({ username: '', - status: '正常', + status: 1, startDateTime: '', endDateTime: '', }) @@ -172,7 +172,7 @@ const getClientList = async () => { page: currentPage.value, page_size: pageSize.value, username: clientSearchForm.value.username, - status: clientSearchForm.value.status === '正常' ? 1 : 2, + status: clientSearchForm.value.status || '', reg_start_time: clientSearchForm.value.startDateTime.length > 0 ? `${clientSearchForm.value.startDateTime} 0:00:00` : '', reg_end_time: clientSearchForm.value.endDateTime.length > 0 ? `${clientSearchForm.value.endDateTime} 23:59:59` : '', } diff --git a/src/views/trade/variety/index.vue b/src/views/trade/variety/index.vue index d1d51f5..2792115 100644 --- a/src/views/trade/variety/index.vue +++ b/src/views/trade/variety/index.vue @@ -306,12 +306,14 @@ const handleEdit = () => { dialogVisible.value = true dialogTitle.value = '编辑合约品种' dialogType.value = 'edit' + dialogFormItemOptions.value[4]!.disabled = true } const handleAdd = () => { dialogVisible.value = true dialogTitle.value = '添加合约品种' dialogType.value = 'add' + dialogFormItemOptions.value[4]!.disabled = false varietyForm.value = { varietyName: '', varietyCode: '', @@ -420,6 +422,8 @@ const handleSubmit = async () => { if (dialogType.value === 'edit') { console.log(params) + if (params.point_diff_max < params.point_diff) + return ElMessage.warning('最大点差不能小于最小点差') await editVarietyApi({ ...params, is_default: varietyForm.value.isDefault,