Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vben into dev

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;

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<SystemDictDataApi.DictData[]>(
+    '/system/dict-data/simple-list',
+  );
 }
 
 // 查询字典数据列表
 export function getDictDataPage(params: PageParam) {
-  return requestClient.get('/system/dict-data/page', { params });
+  return requestClient.get<PageResult<SystemDictDataApi.DictData>>(
+    '/system/dict-data/page',
+    { params },
+  );
 }
 
 // 查询字典数据详情
 export function getDictData(id: number) {
-  return requestClient.get(`/system/dict-data/get?id=${id}`);
+  return requestClient.get<SystemDictDataApi.DictData>(
+    `/system/dict-data/get?id=${id}`,
+  );
 }
 
 // 新增字典数据

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<SystemDictTypeApi.DictType[]>(
+    '/system/dict-type/list-all-simple',
+  );
 }
 
 // 查询字典列表
-export function getDictTypePage(params: any) {
+export function getDictTypePage(params: PageParam) {
-  return requestClient.get('/system/dict-type/page', { params });
+  return requestClient.get<PageResult<SystemDictTypeApi.DictType>>(
+    '/system/dict-type/page',
+    { params },
+  );
 }
 
 // 查询字典详情
 export function getDictType(id: number) {
-  return requestClient.get(`/system/dict-type/get?id=${id}`);
+  return requestClient.get<SystemDictTypeApi.DictType>(
+    `/system/dict-type/get?id=${id}`,
+  );
 }
 
 // 新增字典

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(() => {
             </template>
           </Table.Column>
           <Table.Column
-            :custom-render="({ text }) => dateFormatter(text)"
+            :custom-render="({ text }) => formatDate(text)"
             align="center"
             title="开始时间"
             data-index="createTime"
             width="140"
           />
           <Table.Column
-            :custom-render="({ text }) => dateFormatter(text)"
+            :custom-render="({ text }) => formatDate(text)"
             align="center"
             title="结束时间"
             data-index="endTime"

apps/web-antd/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 '退款中，等待退款结果';

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<SystemDictDataApi.DictData[]>(
+    '/system/dict-data/simple-list',
+  );
 }
 
 // 查询字典数据列表
 export function getDictDataPage(params: PageParam) {
-  return requestClient.get('/system/dict-data/page', { params });
+  return requestClient.get<PageResult<SystemDictDataApi.DictData>>(
+    '/system/dict-data/page',
+    { params },
+  );
 }
 
 // 查询字典数据详情
 export function getDictData(id: number) {
-  return requestClient.get(`/system/dict-data/get?id=${id}`);
+  return requestClient.get<SystemDictDataApi.DictData>(
+    `/system/dict-data/get?id=${id}`,
+  );
 }
 
 // 新增字典数据

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<SystemDictTypeApi.DictType[]>(
+    '/system/dict-type/list-all-simple',
+  );
 }
 
 // 查询字典列表
-export function getDictTypePage(params: any) {
+export function getDictTypePage(params: PageParam) {
-  return requestClient.get('/system/dict-type/page', { params });
+  return requestClient.get<PageResult<SystemDictTypeApi.DictType>>(
+    '/system/dict-type/page',
+    { params },
+  );
 }
 
 // 查询字典详情
 export function getDictType(id: number) {
-  return requestClient.get(`/system/dict-type/get?id=${id}`);
+  return requestClient.get<SystemDictTypeApi.DictType>(
+    `/system/dict-type/get?id=${id}`,
+  );
 }
 
 // 新增字典

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 '退款中，等待退款结果';