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

apps/web-antd/src/api/bpm/model/index.ts

@@ -20,6 +20,7 @@ export namespace BpmModelApi {
     suspensionState: number;
     formType?: number;
     formCustomViewPath?: string;
+    formFields?: string[];
   }
 
   /** 流程模型 */

apps/web-antd/src/api/bpm/processInstance/index.ts

@@ -20,6 +20,7 @@ export namespace BpmProcessInstanceApi {
 
   export interface User {
     avatar: string;
+    deptName?: string;
     id: number;
     nickname: string;
   }
@@ -101,6 +102,22 @@ export namespace BpmProcessInstanceApi {
     }[];
     taskId: string;
   }
+
+  /** 打印数据任务信息 */
+  export interface PrintTask {
+    description: string;
+    id: number;
+    name: string;
+    signPicUrl?: string;
+  }
+
+  /** 打印数据 */
+  export interface PrintData {
+    printTemplateEnable: boolean;
+    printTemplateHtml?: string;
+    processInstance: ProcessInstance;
+    tasks: PrintTask[];
+  }
 }
 
 /** 查询我的流程实例分页 */
@@ -205,3 +222,10 @@ export async function getProcessInstanceBpmnModelView(id: string) {
     `/bpm/process-instance/get-bpmn-model-view?id=${id}`,
   );
 }
+
+/** 获取流程实例打印数据 */
+export async function getProcessInstancePrintData(id: string) {
+  return requestClient.get<BpmProcessInstanceApi.PrintData>(
+    `/bpm/process-instance/get-print-data?processInstanceId=${id}`,
+  );
+}

apps/web-antd/src/api/mp/draft/index.ts

@@ -35,9 +35,13 @@ export function getDraftPage(params: PageParam) {
 
 /** 创建草稿 */
 export function createDraft(accountId: number, articles: MpDraftApi.Article[]) {
-  return requestClient.post('/mp/draft/create', articles, {
-    params: { accountId },
-  });
+  return requestClient.post(
+    '/mp/draft/create',
+    { articles },
+    {
+      params: { accountId },
+    },
+  );
 }
 
 /** 更新草稿 */
@@ -46,9 +50,13 @@ export function updateDraft(
   mediaId: string,
   articles: MpDraftApi.Article[],
 ) {
-  return requestClient.put('/mp/draft/update', articles, {
-    params: { accountId, mediaId },
-  });
+  return requestClient.put(
+    '/mp/draft/update',
+    { articles },
+    {
+      params: { accountId, mediaId },
+    },
+  );
 }
 
 /** 删除草稿 */