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

Merge pull request !323 from Jason/dev

apps/web-antd/src/views/bpm/processInstance/detail/index.vue

@@ -9,7 +9,7 @@ import {
   BpmFieldPermissionType,
   BpmModelFormType,
   BpmModelType,
-  BpmTaskStatusEnum,
+  BpmProcessInstanceStatus,
   DICT_TYPE,
 } from '@vben/constants';
 import {
@@ -61,13 +61,10 @@ const auditIconsMap: {
     | typeof SvgBpmRejectIcon
     | typeof SvgBpmRunningIcon;
 } = {
-  [BpmTaskStatusEnum.RUNNING]: SvgBpmRunningIcon,
-  [BpmTaskStatusEnum.APPROVE]: SvgBpmApproveIcon,
-  [BpmTaskStatusEnum.REJECT]: SvgBpmRejectIcon,
-  [BpmTaskStatusEnum.CANCEL]: SvgBpmCancelIcon,
-  [BpmTaskStatusEnum.APPROVING]: SvgBpmApproveIcon,
-  [BpmTaskStatusEnum.RETURN]: SvgBpmRejectIcon,
-  [BpmTaskStatusEnum.WAIT]: SvgBpmRunningIcon,
+  [BpmProcessInstanceStatus.RUNNING]: SvgBpmRunningIcon,
+  [BpmProcessInstanceStatus.APPROVE]: SvgBpmApproveIcon,
+  [BpmProcessInstanceStatus.REJECT]: SvgBpmRejectIcon,
+  [BpmProcessInstanceStatus.CANCEL]: SvgBpmCancelIcon,
 };
 const activityNodes = ref<BpmProcessInstanceApi.ApprovalNodeInfo[]>([]); // 审批节点信息
 const userOptions = ref<SystemUserApi.User[]>([]); // 用户列表

apps/web-antd/src/views/bpm/processInstance/detail/modules/time-line.vue

@@ -419,11 +419,13 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
                     task.signPicUrl &&
                     activity.nodeType === BpmNodeTypeEnum.USER_TASK_NODE
                   "
-                  class="mt-1 w-full rounded-md bg-gray-100 p-2 text-sm text-gray-500"
+                  class="mt-1 flex w-full items-center rounded-md bg-gray-100 p-2 text-sm text-gray-500"
                 >
                   签名：
                   <Image
-                    class="ml-1 h-10 w-24"
+                    class="ml-2"
+                    :width="180"
+                    :height="60"
                     :src="task.signPicUrl"
                     :preview="{ src: task.signPicUrl }"
                   />