diff --git a/apps/web-antd/src/api/erp/finance/payment/index.ts b/apps/web-antd/src/api/erp/finance/payment/index.ts index e87abfe16..c988b1286 100644 --- a/apps/web-antd/src/api/erp/finance/payment/index.ts +++ b/apps/web-antd/src/api/erp/finance/payment/index.ts @@ -2,7 +2,7 @@ import type { PageParam, PageResult } from '@vben/request'; import { requestClient } from '#/api/request'; -namespace ErpFinancePaymentApi { +export namespace ErpFinancePaymentApi { /** 付款单项 */ export interface FinancePaymentItem { id?: number; diff --git a/apps/web-antd/src/api/iot/alert/config/index.ts b/apps/web-antd/src/api/iot/alert/config/index.ts index 8281cf6c8..26e114c0c 100644 --- a/apps/web-antd/src/api/iot/alert/config/index.ts +++ b/apps/web-antd/src/api/iot/alert/config/index.ts @@ -92,5 +92,3 @@ export function getSimpleAlertConfigList() { '/iot/alert-config/simple-list', ); } - -export { AlertConfigApi }; diff --git a/apps/web-antd/src/api/system/dict/data/index.ts b/apps/web-antd/src/api/system/dict/data/index.ts index 674eb01e4..28f94d504 100644 --- a/apps/web-antd/src/api/system/dict/data/index.ts +++ b/apps/web-antd/src/api/system/dict/data/index.ts @@ -1,4 +1,4 @@ -import type { PageParam } from '@vben/request'; +import type { PageParam, PageResult } from '@vben/request'; import { requestClient } from '#/api/request'; @@ -20,17 +20,24 @@ export namespace SystemDictDataApi { // 查询字典数据(精简)列表 export function getSimpleDictDataList() { - return requestClient.get('/system/dict-data/simple-list'); + return requestClient.get( + '/system/dict-data/simple-list', + ); } // 查询字典数据列表 export function getDictDataPage(params: PageParam) { - return requestClient.get('/system/dict-data/page', { params }); + return requestClient.get>( + '/system/dict-data/page', + { params }, + ); } // 查询字典数据详情 export function getDictData(id: number) { - return requestClient.get(`/system/dict-data/get?id=${id}`); + return requestClient.get( + `/system/dict-data/get?id=${id}`, + ); } // 新增字典数据 diff --git a/apps/web-antd/src/api/system/dict/type/index.ts b/apps/web-antd/src/api/system/dict/type/index.ts index eb2f9c9d4..7fb426337 100644 --- a/apps/web-antd/src/api/system/dict/type/index.ts +++ b/apps/web-antd/src/api/system/dict/type/index.ts @@ -1,3 +1,5 @@ +import type { PageParam, PageResult } from '@vben/request'; + import { requestClient } from '#/api/request'; export namespace SystemDictTypeApi { @@ -14,17 +16,24 @@ export namespace SystemDictTypeApi { // 查询字典(精简)列表 export function getSimpleDictTypeList() { - return requestClient.get('/system/dict-type/list-all-simple'); + return requestClient.get( + '/system/dict-type/list-all-simple', + ); } // 查询字典列表 -export function getDictTypePage(params: any) { - return requestClient.get('/system/dict-type/page', { params }); +export function getDictTypePage(params: PageParam) { + return requestClient.get>( + '/system/dict-type/page', + { params }, + ); } // 查询字典详情 export function getDictType(id: number) { - return requestClient.get(`/system/dict-type/get?id=${id}`); + return requestClient.get( + `/system/dict-type/get?id=${id}`, + ); } // 新增字典 diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/designer/ProcessViewer.vue b/apps/web-antd/src/components/bpmn-process-designer/package/designer/ProcessViewer.vue index 4fdca3d86..eb0dd63cf 100644 --- a/apps/web-antd/src/components/bpmn-process-designer/package/designer/ProcessViewer.vue +++ b/apps/web-antd/src/components/bpmn-process-designer/package/designer/ProcessViewer.vue @@ -3,7 +3,7 @@ import { h, onBeforeUnmount, onMounted, ref, watch } from 'vue'; import { BpmProcessInstanceStatus, DICT_TYPE } from '@vben/constants'; import { UndoOutlined, ZoomInOutlined, ZoomOutOutlined } from '@vben/icons'; -import { dateFormatter, formatPast2 } from '@vben/utils'; +import { formatDate, formatPast2 } from '@vben/utils'; import { Button, ButtonGroup, Modal, Row, Table } from 'ant-design-vue'; import BpmnViewer from 'bpmn-js/lib/Viewer'; @@ -345,14 +345,14 @@ onBeforeUnmount(() => { { if (cellValue) { - return formatDateTime(cellValue); + return formatDateTime(cellValue) as string; } if (row.payRefundId) { return '退款中,等待退款结果'; diff --git a/apps/web-ele/src/api/system/dict/data/index.ts b/apps/web-ele/src/api/system/dict/data/index.ts index 674eb01e4..28f94d504 100644 --- a/apps/web-ele/src/api/system/dict/data/index.ts +++ b/apps/web-ele/src/api/system/dict/data/index.ts @@ -1,4 +1,4 @@ -import type { PageParam } from '@vben/request'; +import type { PageParam, PageResult } from '@vben/request'; import { requestClient } from '#/api/request'; @@ -20,17 +20,24 @@ export namespace SystemDictDataApi { // 查询字典数据(精简)列表 export function getSimpleDictDataList() { - return requestClient.get('/system/dict-data/simple-list'); + return requestClient.get( + '/system/dict-data/simple-list', + ); } // 查询字典数据列表 export function getDictDataPage(params: PageParam) { - return requestClient.get('/system/dict-data/page', { params }); + return requestClient.get>( + '/system/dict-data/page', + { params }, + ); } // 查询字典数据详情 export function getDictData(id: number) { - return requestClient.get(`/system/dict-data/get?id=${id}`); + return requestClient.get( + `/system/dict-data/get?id=${id}`, + ); } // 新增字典数据 diff --git a/apps/web-ele/src/api/system/dict/type/index.ts b/apps/web-ele/src/api/system/dict/type/index.ts index eb2f9c9d4..7fb426337 100644 --- a/apps/web-ele/src/api/system/dict/type/index.ts +++ b/apps/web-ele/src/api/system/dict/type/index.ts @@ -1,3 +1,5 @@ +import type { PageParam, PageResult } from '@vben/request'; + import { requestClient } from '#/api/request'; export namespace SystemDictTypeApi { @@ -14,17 +16,24 @@ export namespace SystemDictTypeApi { // 查询字典(精简)列表 export function getSimpleDictTypeList() { - return requestClient.get('/system/dict-type/list-all-simple'); + return requestClient.get( + '/system/dict-type/list-all-simple', + ); } // 查询字典列表 -export function getDictTypePage(params: any) { - return requestClient.get('/system/dict-type/page', { params }); +export function getDictTypePage(params: PageParam) { + return requestClient.get>( + '/system/dict-type/page', + { params }, + ); } // 查询字典详情 export function getDictType(id: number) { - return requestClient.get(`/system/dict-type/get?id=${id}`); + return requestClient.get( + `/system/dict-type/get?id=${id}`, + ); } // 新增字典 diff --git a/apps/web-ele/src/views/pay/demo/order/data.ts b/apps/web-ele/src/views/pay/demo/order/data.ts index 849a4a9d4..b88fba343 100644 --- a/apps/web-ele/src/views/pay/demo/order/data.ts +++ b/apps/web-ele/src/views/pay/demo/order/data.ts @@ -97,7 +97,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { minWidth: 180, formatter: ({ cellValue, row }) => { if (cellValue) { - return formatDateTime(cellValue); + return formatDateTime(cellValue) as string; } if (row.payRefundId) { return '退款中,等待退款结果';