diff --git a/.vscode/settings.json b/.vscode/settings.json index d51511a2c7873c443cc4a2a343b02178f2be7e5f..dc371b9b04933e9119e04e4aee0e748d1b876503 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -100,7 +100,7 @@ "**/.stylelintcache": true, "**/.DS_Store": true, "**/vite.config.mts.*": true, - "**/tea.yaml": true, + "**/tea.yaml": true }, "files.watcherExclude": { "**/.git/objects/**": true, @@ -110,7 +110,7 @@ "**/tmp/**": true, "**/bower_components/**": true, "**/dist/**": true, - "**/yarn.lock": true, + "**/yarn.lock": true }, "typescript.tsserver.exclude": ["**/node_modules", "**/dist", "**/.turbo"], diff --git a/apps/web-antd/src/adapter/vxe-table.ts b/apps/web-antd/src/adapter/vxe-table.ts index e14c38c255f49a389790f478b38fc253ab477d2e..c4dcb2a86b2d032af371c323d835c5e3c64c054a 100644 --- a/apps/web-antd/src/adapter/vxe-table.ts +++ b/apps/web-antd/src/adapter/vxe-table.ts @@ -269,7 +269,7 @@ setupVbenVxeTable({ // vxeUI.formats.add // add by 星语:数量格式化,例如说:金额 vxeUI.formats.add('formatNumber', { - cellFormatMethod({ cellValue }, digits = 2) { + tableCellFormatMethod({ cellValue }, digits = 2) { if (cellValue === null || cellValue === undefined) { return ''; } @@ -283,6 +283,22 @@ setupVbenVxeTable({ return cellValue.toFixed(digits); }, }); + + vxeUI.formats.add('formatFraction', { + tableCellFormatMethod({ cellValue }) { + if (cellValue === null || cellValue === undefined) { + return '0.00'; + } + if (isString(cellValue)) { + cellValue = Number.parseFloat(cellValue); + } + // 如果非 number,则直接返回空串 + if (Number.isNaN(cellValue)) { + return '0.00'; + } + return `${(cellValue / 100).toFixed(2)}元`; + }, + }); }, useVbenForm, }); diff --git a/apps/web-antd/src/api/pay/app/index.ts b/apps/web-antd/src/api/pay/app/index.ts index 1eae34420265c2726f9f67df5b05366d24a375d7..2b09c57d20f9de9abc8358c32a583c00d582bc82 100644 --- a/apps/web-antd/src/api/pay/app/index.ts +++ b/apps/web-antd/src/api/pay/app/index.ts @@ -23,10 +23,21 @@ export namespace PayAppApi { id: number; status: number; } + + export interface AppPageReqVO extends PageParam { + name?: string; + status?: number; + remark?: string; + payNotifyUrl?: string; + refundNotifyUrl?: string; + transferNotifyUrl?: string; + merchantName?: string; + createTime?: Date[]; + } } /** 查询支付应用列表 */ -export function getAppPage(params: PageParam) { +export function getAppPage(params: PayAppApi.AppPageReqVO) { return requestClient.get>('/pay/app/page', { params, }); diff --git a/apps/web-antd/src/api/pay/demo/index.ts b/apps/web-antd/src/api/pay/demo/order/index.ts similarity index 41% rename from apps/web-antd/src/api/pay/demo/index.ts rename to apps/web-antd/src/api/pay/demo/order/index.ts index a0f3c6886796603b603e33310b3f20db178c00d3..2623510593383e80a41b35153cd71cfb01623c29 100644 --- a/apps/web-antd/src/api/pay/demo/index.ts +++ b/apps/web-antd/src/api/pay/demo/order/index.ts @@ -2,29 +2,38 @@ import type { PageParam, PageResult } from '@vben/request'; import { requestClient } from '#/api/request'; -export namespace PayDemoApi { +export namespace DemoOrderApi { /** 示例订单信息 */ - export interface DemoOrder { - spuId: number; - createTime: Date; + export interface Order { + id?: number; + userId?: number; + spuName?: string; + price?: number; + payStatus?: boolean; + payOrderId?: number; + payTime?: Date; + payChannelCode?: string; + payRefundId?: number; + refundPrice?: number; + refundTime?: Date; + spuId?: number; + createTime?: Date; + } + + export interface OrderPageReqVO extends PageParam { + spuId?: number; + createTime?: Date[]; } } /** 创建示例订单 */ -export function createDemoOrder(data: PayDemoApi.DemoOrder) { +export function createDemoOrder(data: DemoOrderApi.Order) { return requestClient.post('/pay/demo-order/create', data); } -/** 获得示例订单 */ -export function getDemoOrder(id: number) { - return requestClient.get( - `/pay/demo-order/get?id=${id}`, - ); -} - /** 获得示例订单分页 */ -export function getDemoOrderPage(params: PageParam) { - return requestClient.get>( +export function getDemoOrderPage(params: DemoOrderApi.OrderPageReqVO) { + return requestClient.get>( '/pay/demo-order/page', { params, diff --git a/apps/web-antd/src/api/pay/demo/transfer/index.ts b/apps/web-antd/src/api/pay/demo/transfer/index.ts deleted file mode 100644 index e06dbec8b76c91d99bdc2a3db8c444430790bb48..0000000000000000000000000000000000000000 --- a/apps/web-antd/src/api/pay/demo/transfer/index.ts +++ /dev/null @@ -1,29 +0,0 @@ -import type { PageParam, PageResult } from '@vben/request'; - -import { requestClient } from '#/api/request'; - -export namespace PayDemoTransferApi { - /** 示例转账单信息 */ - export interface DemoTransfer { - price: number; - type: number; - userName: string; - alipayLogonId: string; - openid: string; - } -} - -/** 创建示例转账单 */ -export function createDemoTransfer(data: PayDemoTransferApi.DemoTransfer) { - return requestClient.post('/pay/demo-transfer/create', data); -} - -/** 获得示例转账单分页 */ -export function getDemoTransferPage(params: PageParam) { - return requestClient.get>( - '/pay/demo-transfer/page', - { - params, - }, - ); -} diff --git a/apps/web-antd/src/api/pay/demo/withdraw/index.ts b/apps/web-antd/src/api/pay/demo/withdraw/index.ts new file mode 100644 index 0000000000000000000000000000000000000000..3711ff9e3029d5fdc4360a6d677081cf3629832b --- /dev/null +++ b/apps/web-antd/src/api/pay/demo/withdraw/index.ts @@ -0,0 +1,40 @@ +import type { PageParam, PageResult } from '@vben/request'; + +import { requestClient } from '#/api/request'; + +export namespace DemoWithdrawApi { + /** 示例提现单信息 */ + export interface Withdraw { + id?: number; + subject: string; + price: number; + userName: string; + userAccount: string; + type: number; + status?: number; + payTransferId?: number; + transferChannelCode?: string; + transferTime?: Date; + transferErrorMsg?: string; + } +} + +/** 查询示例提现单列表 */ +export function getDemoWithdrawPage(params: PageParam) { + return requestClient.get>( + '/pay/demo-withdraw/page', + { + params, + }, + ); +} + +/** 创建示例提现单 */ +export function createDemoWithdraw(data: DemoWithdrawApi.Withdraw) { + return requestClient.post('/pay/demo-withdraw/create', data); +} + +/** 发起提现单转账 */ +export function transferDemoWithdraw(id: number) { + return requestClient.post(`/pay/demo-withdraw/transfer?id=${id}`); +} diff --git a/apps/web-antd/src/api/pay/transfer/index.ts b/apps/web-antd/src/api/pay/transfer/index.ts index fd8bc9d3a5cf618711da5c0debb5b224a0478fb3..ba206ec5ce97d90e8eb9b86defe9c413dd8f274a 100644 --- a/apps/web-antd/src/api/pay/transfer/index.ts +++ b/apps/web-antd/src/api/pay/transfer/index.ts @@ -52,7 +52,9 @@ export function getTransfer(id: number) { ); } -/** 创建转账单 */ -export function createTransfer(data: PayTransferApi.Transfer) { - return requestClient.post('/pay/transfer/create', data); +/** 导出转账单 */ +export function exportTransfer(params: any) { + return requestClient.download('/pay/transfer/export-excel', { + params, + }); } diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/start-user-node-config.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/start-user-node-config.vue index 80b7b3a116bb37ec26295e094de6fbc0cda115a6..348a47317b00ddbf5fa2ec77e17e2a628fdd6467 100644 --- a/apps/web-antd/src/components/simple-process-design/components/nodes-config/start-user-node-config.vue +++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/start-user-node-config.vue @@ -12,10 +12,11 @@ import { useVbenDrawer } from '@vben/common-ui'; import { IconifyIcon } from '@vben/icons'; import { - Divider, + Col, Input, Radio, RadioGroup, + Row, TabPane, Tabs, Tooltip, @@ -91,8 +92,8 @@ const getDeptNames = (deptIds: number[]): string => { // 使用 VbenDrawer const [Drawer, drawerApi] = useVbenDrawer({ - header: false, - closable: false, + header: true, + closable: true, onCancel() { drawerApi.close(); }, @@ -142,28 +143,28 @@ defineExpose({ showStartUserNodeConfig }); -
-
字段权限
-
-
字段名称
-
- - 只读 - - - 可编辑 - - - 隐藏 - -
-
-
-
{{ item.title }}
- -
- - - -
-
- - - -
-
- - - -
-
+
+
字段权限
+ + + + 字段名称 + + + + + 只读 + + + + + 可编辑 + + + + + 隐藏 + + + + + + + +
+ + + {{ item.title }} + + + + + + + + + + + + + + + + +
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/user-task-node-config.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/user-task-node-config.vue new file mode 100644 index 0000000000000000000000000000000000000000..fdeac0433c6095de77e98c1b6913fff68d993a4a --- /dev/null +++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/user-task-node-config.vue @@ -0,0 +1,1252 @@ + +