diff --git a/apps/web-antd/src/views/pay/demo/withdraw/modules/form.vue b/apps/web-antd/src/views/pay/demo/withdraw/modules/form.vue index 169d91e48..78240de7c 100644 --- a/apps/web-antd/src/views/pay/demo/withdraw/modules/form.vue +++ b/apps/web-antd/src/views/pay/demo/withdraw/modules/form.vue @@ -49,7 +49,7 @@ const [Modal, modalApi] = useVbenModal({ diff --git a/apps/web-ele/src/views/pay/demo/withdraw/data.ts b/apps/web-ele/src/views/pay/demo/withdraw/data.ts index 643bb5968..8b2c1b547 100644 --- a/apps/web-ele/src/views/pay/demo/withdraw/data.ts +++ b/apps/web-ele/src/views/pay/demo/withdraw/data.ts @@ -7,34 +7,38 @@ import { DICT_TYPE } from '@vben/constants'; export function useFormSchema(): VbenFormSchema[] { return [ { - component: 'Input', fieldName: 'id', + component: 'Input', dependencies: { triggerFields: [''], show: () => false, }, }, { - component: 'Input', fieldName: 'subject', label: '提现标题', + component: 'Input', rules: 'required', + componentProps: { + placeholder: '请输入提现标题', + }, }, { - component: 'InputNumber', fieldName: 'price', label: '提现金额', + component: 'InputNumber', rules: 'required', componentProps: { min: 1, precision: 2, step: 0.01, + placeholder: '请输入提现金额', }, }, { - component: 'Select', fieldName: 'type', label: '提现类型', + component: 'Select', rules: 'required', componentProps: { options: [ @@ -42,19 +46,46 @@ export function useFormSchema(): VbenFormSchema[] { { label: '微信余额', value: 2 }, { label: '钱包余额', value: 3 }, ], + placeholder: '请选择提现类型', }, }, { - component: 'Input', - fieldName: 'userName', - label: '收款人姓名', - rules: 'required', - }, - { - component: 'Input', fieldName: 'userAccount', label: '收款人账号', + component: 'Input', rules: 'required', + dependencies: { + triggerFields: ['type'], + componentProps: (values) => { + const type = values.type; + let placeholder = '请输入收款人账号'; + switch (type) { + case 1: { + placeholder = '请输入支付宝账号'; + break; + } + case 2: { + placeholder = '请输入微信 openid'; + break; + } + case 3: { + placeholder = '请输入钱包编号'; + break; + } + } + return { + placeholder, + }; + }, + }, + }, + { + fieldName: 'userName', + label: '收款人姓名', + component: 'Input', + componentProps: { + placeholder: '请输入收款人姓名', + }, }, ]; } @@ -65,41 +96,50 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'id', title: '提现单编号', + minWidth: 100, }, { field: 'subject', title: '提现标题', + minWidth: 150, }, { field: 'type', title: '提现类型', + minWidth: 100, slots: { default: 'type' }, }, { field: 'price', title: '提现金额', - formatter: 'formatFenToYuanAmount', + minWidth: 100, + formatter: 'formatAmount2', }, { field: 'userName', title: '收款人姓名', + minWidth: 120, }, { field: 'userAccount', title: '收款人账号', + minWidth: 150, }, { field: 'status', title: '提现状态', + minWidth: 100, slots: { default: 'status' }, }, { field: 'payTransferId', title: '转账单号', + minWidth: 120, }, { field: 'transferChannelCode', title: '转账渠道', + minWidth: 130, cellRender: { name: 'CellDict', props: { type: DICT_TYPE.PAY_CHANNEL_CODE }, @@ -108,15 +148,17 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'transferTime', title: '转账时间', + minWidth: 180, formatter: 'formatDateTime', }, { field: 'transferErrorMsg', title: '转账失败原因', + minWidth: 150, }, { title: '操作', - width: 130, + width: 220, fixed: 'right', slots: { default: 'actions' }, }, diff --git a/apps/web-ele/src/views/pay/demo/withdraw/index.vue b/apps/web-ele/src/views/pay/demo/withdraw/index.vue index 9173e1068..6357705d8 100644 --- a/apps/web-ele/src/views/pay/demo/withdraw/index.vue +++ b/apps/web-ele/src/views/pay/demo/withdraw/index.vue @@ -12,7 +12,6 @@ import { getDemoWithdrawPage, transferDemoWithdraw, } from '#/api/pay/demo/withdraw'; -import { $t } from '#/locales'; import { useGridColumns } from './data'; import Form from './modules/form.vue'; @@ -23,7 +22,7 @@ const [FormModal, formModalApi] = useVbenModal({ }); /** 刷新表格 */ -function onRefresh() { +function handleRefresh() { gridApi.query(); } @@ -40,7 +39,7 @@ async function handleTransfer(row: DemoWithdrawApi.Withdraw) { try { const payTransferId = await transferDemoWithdraw(row.id as number); ElMessage.success(`转账提交成功,转账单号:${payTransferId}`); - onRefresh(); + handleRefresh(); } finally { loadingInstance.close(); } @@ -64,6 +63,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, rowConfig: { keyField: 'id', + isHover: true, }, toolbarConfig: { refresh: true, @@ -86,7 +86,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ /> - +