Merge branch 'master' of http://39.164.159.226:3000/hnsh-smart-steward/smart-steward-admin

apps/web-ele/src/api/workflow/instance/index.ts

@@ -81,7 +81,7 @@ export function workflowInstanceActive(instanceId: ID, active: boolean) {
  * @returns PageResult<Flow>
  */
 export function pageByCurrent(params?: PageQuery) {
-  return requestClient.get<PageResult<TaskInfo>>('/workOrder/order/list',
+  return requestClient.get<PageResult<TaskInfo>>('/workOrder/order/myList',
     { params },
   );
 }

apps/web-ele/src/views/system/menu/index.vue

@@ -39,7 +39,7 @@ const formOptions: VbenFormProps = {
 const gridOptions: VxeGridProps = {
   columns,
   size: 'medium',
-  height: 'auto',
+  height: '750px',
   keepSource: true,
   proxyConfig: {
     ajax: {

apps/web-ele/src/views/workflow/components/actions/flow-actions.vue

@@ -401,11 +401,11 @@ async function handleBack() {
 // 延时审批
 function handleApproveDelay() {
   // 重置表单数据
+  console.log('props', props);
   approveDelayFormData.approveRemark = '';
   approveDelayFormData.approveStatus = '1';
-  approveDelayFormData.delayId = props.task!.taskId;
+  approveDelayFormData.delayId = Number(props.task!.id);
   approveDelayFormData.newDeadline = '';
-
   // 打开抽屉
   approveDelayDrawerVisible.value = true;
 }