feat：【antd】【ele】【pay 支付】pay/transfer 迁移 ele 版本

apps/web-ele/src/views/pay/transfer/data.ts

@@ -1,17 +1,17 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { PayTransferApi } from '#/api/pay/transfer';
 import type { DescriptionItemSchema } from '#/components/description';
 
 import { h } from 'vue';
 
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
 import { erpPriceInputFormatter, formatDateTime } from '@vben/utils';
 
 import { ElTag } from 'element-plus';
 
 import { DictTag } from '#/components/dict-tag';
-import { DICT_TYPE } from '@vben/constants';
-import { getDictOptions } from '@vben/hooks';
-
 import { getRangePickerDefaultProps } from '#/utils';
 
 /** 列表的搜索表单 */
@@ -22,7 +22,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '转账单号',
       component: 'Input',
       componentProps: {
-        clearable: true,
+        allowClear: true,
         placeholder: '请输入转账单号',
       },
     },
@@ -32,7 +32,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'Select',
       componentProps: {
         options: getDictOptions(DICT_TYPE.PAY_CHANNEL_CODE),
-        clearable: true,
+        allowClear: true,
         placeholder: '请选择支付渠道',
       },
     },
@@ -41,7 +41,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '商户单号',
       component: 'Input',
       componentProps: {
-        clearable: true,
+        allowClear: true,
         placeholder: '请输入商户单号',
       },
     },
@@ -51,7 +51,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'Select',
       componentProps: {
         options: getDictOptions(DICT_TYPE.PAY_TRANSFER_TYPE),
-        clearable: true,
+        allowClear: true,
         placeholder: '请选择类型',
       },
     },
@@ -61,7 +61,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'Select',
       componentProps: {
         options: getDictOptions(DICT_TYPE.PAY_TRANSFER_STATUS),
-        clearable: true,
+        allowClear: true,
         placeholder: '请选择转账状态',
       },
     },
@@ -70,16 +70,16 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '收款人姓名',
       component: 'Input',
       componentProps: {
-        clearable: true,
+        allowClear: true,
         placeholder: '请输入收款人姓名',
       },
     },
     {
-      fieldName: 'accountNo',
+      fieldName: 'userAccount',
       label: '收款人账号',
       component: 'Input',
       componentProps: {
-        clearable: true,
+        allowClear: true,
         placeholder: '请输入收款人账号',
       },
     },
@@ -88,7 +88,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '渠道单号',
       component: 'Input',
       componentProps: {
-        clearable: true,
+        allowClear: true,
         placeholder: '请输入渠道单号',
       },
     },
@@ -98,7 +98,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'RangePicker',
       componentProps: {
         ...getRangePickerDefaultProps(),
-        clearable: true,
+        allowClear: true,
       },
     },
   ];
@@ -110,96 +110,95 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'id',
       title: '编号',
-    },
+      minWidth: 100,
-    {
-      field: 'createTime',
-      title: '创建时间',
-      formatter: 'formatDateTime',
-    },
-    {
-      field: 'appName',
-      title: '支付应用',
     },
     {
       field: 'price',
       title: '转账金额',
-      formatter: 'formatFenToYuanAmount',
+      minWidth: 120,
+      formatter: 'formatAmount2',
+    },
+    {
+      field: 'merchantTransferId',
+      title: '转账单号',
+      minWidth: 350,
+      slots: {
+        default: 'no',
+      },
     },
     {
       field: 'status',
       title: '转账状态',
+      minWidth: 120,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.PAY_TRANSFER_STATUS },
       },
     },
-    {
-      field: 'type',
-      title: '类型',
-      cellRender: {
-        name: 'CellDict',
-        props: { type: DICT_TYPE.PAY_TRANSFER_TYPE },
-      },
-    },
     {
       field: 'channelCode',
-      title: '支付渠道',
+      title: '转账渠道',
+      minWidth: 140,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.PAY_CHANNEL_CODE },
       },
     },
     {
-      field: 'merchantTransferId',
+      field: 'createTime',
-      title: '商户单号',
+      title: '创建时间',
+      minWidth: 180,
+      formatter: 'formatDateTime',
     },
     {
-      field: 'channelTransferNo',
+      field: 'successTime',
-      title: '渠道单号',
+      title: '转账时间',
+      minWidth: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'subject',
+      title: '转账标题',
+      minWidth: 150,
+    },
+    {
+      field: 'appName',
+      title: '支付应用',
+      minWidth: 150,
     },
     {
       field: 'userName',
       title: '收款人姓名',
+      minWidth: 150,
     },
     {
-      field: 'accountNo',
+      field: 'userAccount',
-      title: '收款人账号',
+      title: '收款账号',
+      minWidth: 200,
     },
     {
       title: '操作',
-      width: 120,
+      width: 80,
       fixed: 'right',
       slots: { default: 'actions' },
     },
   ];
 }
 
-/** 详情的配置 */
+/** 详情的字段 */
 export function useDetailSchema(): DescriptionItemSchema[] {
   return [
-    {
-      field: 'id',
-      label: '编号',
-    },
     {
       field: 'merchantTransferId',
       label: '商户单号',
-      content: (data) => {
+      content: (data: PayTransferApi.Transfer) =>
-        return h(ElTag, {
+        h(ElTag, {}, () => data?.merchantTransferId),
-          color: 'blue',
-          content: data?.merchantTransferId,
-        });
-      },
     },
     {
       field: 'no',
       label: '转账单号',
-      content: (data) => {
+      content: (data: PayTransferApi.Transfer) =>
-        return h(ElTag, {
+        h(ElTag, { color: 'orange' }, () => data?.no),
-          color: 'blue',
-          content: data?.no,
-        });
-      },
     },
     {
       field: 'appId',
@@ -208,7 +207,7 @@ export function useDetailSchema(): DescriptionItemSchema[] {
     {
       field: 'status',
       label: '转账状态',
-      content: (data) =>
+      content: (data: any) =>
         h(DictTag, {
           type: DICT_TYPE.PAY_TRANSFER_STATUS,
           value: data?.status,
@@ -217,22 +216,24 @@ export function useDetailSchema(): DescriptionItemSchema[] {
     {
       field: 'price',
       label: '转账金额',
-      content: (data) => {
+      content: (data: PayTransferApi.Transfer) =>
-        return h(ElTag, {
+        h(
-          color: 'blue',
+          ElTag,
-          content: `￥${erpPriceInputFormatter(data?.price)}`,
+          { color: 'success' },
-        });
+          () => `￥${erpPriceInputFormatter(data?.price || 0)}`,
-      },
+        ),
     },
     {
       field: 'successTime',
       label: '转账时间',
-      content: (data) => formatDateTime(data?.successTime) as string,
+      content: (data: PayTransferApi.Transfer) =>
+        formatDateTime(data?.successTime) as string,
     },
     {
       field: 'createTime',
       label: '创建时间',
-      content: (data) => formatDateTime(data?.createTime) as string,
+      content: (data: PayTransferApi.Transfer) =>
+        formatDateTime(data?.createTime) as string,
     },
     {
       field: 'userName',
@@ -245,25 +246,23 @@ export function useDetailSchema(): DescriptionItemSchema[] {
     {
       field: 'channelCode',
       label: '支付渠道',
-      content: (data) =>
+      content: (data: PayTransferApi.Transfer) =>
         h(DictTag, {
           type: DICT_TYPE.PAY_CHANNEL_CODE,
           value: data?.channelCode,
         }),
     },
     {
-      field: 'channelCode',
+      field: 'userIp',
       label: '支付 IP',
     },
     {
       field: 'channelTransferNo',
       label: '渠道单号',
-      content: (data) => {
+      content: (data: PayTransferApi.Transfer) =>
-        return h(ElTag, {
+        data?.channelTransferNo
-          color: 'blue',
+          ? h(ElTag, { color: 'success' }, () => data.channelTransferNo)
-          content: data?.channelTransferNo,
+          : '',
-        });
-      },
     },
     {
       field: 'notifyUrl',

apps/web-ele/src/views/pay/transfer/index.vue

@@ -3,10 +3,11 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { PayTransferApi } from '#/api/pay/transfer';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
-import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElTag } from 'element-plus';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
-import { exportTransfer, getTransferPage } from '#/api/pay/transfer';
+import { getTransferPage } from '#/api/pay/transfer';
 import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
@@ -18,16 +19,10 @@ const [DetailModal, detailModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
-/** 导出表格 */
-async function handleExport() {
-  const data = await exportTransfer(await gridApi.formApi.getValues());
-  downloadFileFromBlobPart({ fileName: '转账单.xls', source: data });
-}
-
 /** 查看转账详情 */
 function handleDetail(row: PayTransferApi.Transfer) {
   detailModalApi.setData(row).open();
@@ -38,6 +33,9 @@ const [Grid, gridApi] = useVbenVxeGrid({
     schema: useGridFormSchema(),
   },
   gridOptions: {
+    cellConfig: {
+      height: 80,
+    },
     columns: useGridColumns(),
     height: 'auto',
     keepSource: true,
@@ -54,6 +52,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -69,21 +68,8 @@ const [Grid, gridApi] = useVbenVxeGrid({
       <DocAlert title="转账管理" url="https://doc.iocoder.cn/pay/transfer/" />
     </template>
 
-    <DetailModal @success="onRefresh" />
+    <DetailModal @success="handleRefresh" />
     <Grid table-title="转账单列表">
-      <template #toolbar-tools>
-        <TableAction
-          :actions="[
-            {
-              label: $t('ui.actionTitle.export'),
-              type: 'primary',
-              icon: ACTION_ICON.DOWNLOAD,
-              auth: ['pay:transfer:export'],
-              onClick: handleExport,
-            },
-          ]"
-        />
-      </template>
       <template #actions="{ row }">
         <TableAction
           :actions="[
@@ -98,6 +84,21 @@ const [Grid, gridApi] = useVbenVxeGrid({
           ]"
         />
       </template>
+      <template #no="{ row }">
+        <div class="flex flex-col gap-1 text-left">
+          <p class="text-sm">
+            <ElTag size="small" type="primary"> 商户</ElTag>
+            {{ row.merchantTransferId }}
+          </p>
+          <p class="text-sm" v-if="row.no">
+            <ElTag size="small" type="warning">转账</ElTag> {{ row.no }}
+          </p>
+          <p class="text-sm" v-if="row.channelTransferNo">
+            <ElTag size="small" type="success">渠道</ElTag>
+            {{ row.channelTransferNo }}
+          </p>
+        </div>
+      </template>
     </Grid>
   </Page>
 </template>

apps/web-ele/src/views/pay/transfer/modules/detail.vue

@@ -12,6 +12,18 @@ import { useDetailSchema } from '../data';
 
 const formData = ref<PayTransferApi.Transfer>();
 
+const [Descriptions] = useDescription({
+  componentProps: {
+    border: true,
+    column: 2,
+    direction: 'horizontal',
+    labelWidth: 140,
+    title: '',
+    extra: '',
+  },
+  schema: useDetailSchema(),
+});
+
 const [Modal, modalApi] = useVbenModal({
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
@@ -31,18 +43,6 @@ const [Modal, modalApi] = useVbenModal({
     }
   },
 });
-
-const [Description] = useDescription({
-  componentProps: {
-    title: '基本信息',
-    border: false,
-    column: 2,
-    direction: 'horizontal',
-    labelWidth: 200,
-    extra: '',
-  },
-  schema: useDetailSchema(),
-});
 </script>
 
 <template>
@@ -52,6 +52,6 @@ const [Description] = useDescription({
     :show-cancel-button="false"
     :show-confirm-button="false"
   >
-    <Description :data="formData" />
+    <Descriptions :data="formData" />
   </Modal>
 </template>