Merge remote-tracking branch 'yudao/dev' into dev

apps/web-antd/src/views/bpm/processInstance/detail/modules/process-print.vue

@@ -18,7 +18,7 @@ import { decodeFields } from '#/components/form-create';
 
 const userStore = useUserStore();
 
-const printData = ref<BpmProcessInstanceApi.PrintData>();
+const printData = ref<BpmProcessInstanceApi.ProcessPrintDataRespVO>();
 const userName = computed(() => userStore.userInfo?.nickname ?? '');
 const printTime = ref(formatDate(new Date(), 'YYYY-MM-DD HH:mm'));
 const formFields = ref<any[]>([]);

apps/web-antd/src/views/bpm/task/copy/index.vue

@@ -14,7 +14,7 @@ import { useGridColumns, useGridFormSchema } from './data';
 defineOptions({ name: 'BpmCopyTask' });
 
 /** 任务详情 */
-function handleDetail(row: BpmProcessInstanceApi.Copy) {
+function handleDetail(row: BpmProcessInstanceApi.ProcessInstanceCopyRespVO) {
   const query = {
     id: row.processInstanceId,
     ...(row.activityId && { activityId: row.activityId }),
@@ -52,7 +52,7 @@ const [Grid] = useVbenVxeGrid({
       refresh: true,
       search: true,
     },
-  } as VxeTableGridOptions<BpmProcessInstanceApi.Copy>,
+  } as VxeTableGridOptions<BpmProcessInstanceApi.ProcessInstanceCopyRespVO>,
 });
 </script>
 

apps/web-antd/src/views/bpm/task/manager/index.vue

@@ -49,7 +49,7 @@ const [Grid] = useVbenVxeGrid({
       refresh: true,
       search: true,
     },
-  } as VxeTableGridOptions<BpmTaskApi.TaskManager>,
+  } as VxeTableGridOptions<BpmTaskApi.Task>,
 });
 </script>