From 876a44a82852df5845bf9105e80c98a051f863ff Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期三, 12 十一月 2025 17:55:20 +0800
Subject: [PATCH] feat: 1.3.0.2
---
packages/components/src/Card/TaskCheckFileCard.vue | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 5 deletions(-)
diff --git a/packages/components/src/Card/TaskCheckFileCard.vue b/packages/components/src/Card/TaskCheckFileCard.vue
index 74eb4a8..f44d325 100644
--- a/packages/components/src/Card/TaskCheckFileCard.vue
+++ b/packages/components/src/Card/TaskCheckFileCard.vue
@@ -1,8 +1,38 @@
<template>
<div class="taskCheckFileCard-wrapper">
<div class="taskCheckFileCard-status-wrapper">
- <div class="taskCheckFileCard-time">
- {{ props.createdTime ? dayjs(props.createdTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
+ <div class="taskCheckFileCard-time-wrapper">
+ <template v-if="OrderUtils.isContainCheckIn(checkReceiveMethods)">
+ <div class="taskCheckFileCard-time">
+ {{ userCheckLabelPrefix }}绛惧埌鏃堕棿锛歿{
+ props.userCheckInTime
+ ? dayjs(props.userCheckInTime).format('YYYY-MM-DD HH:mm:ss')
+ : ''
+ }}
+ </div>
+ <div class="taskCheckFileCard-time">
+ {{ userCheckLabelPrefix }}绛惧嚭鏃堕棿锛歿{
+ props.userCheckOutTime
+ ? dayjs(props.userCheckOutTime).format('YYYY-MM-DD HH:mm:ss')
+ : ''
+ }}
+ </div>
+ <template v-if="showCheckTime">
+ <div class="taskCheckFileCard-time">
+ 浜哄伐绛惧埌鏃堕棿锛歿{
+ props.checkInTime ? dayjs(props.checkInTime).format('YYYY-MM-DD HH:mm:ss') : ''
+ }}
+ </div>
+ <div class="taskCheckFileCard-time">
+ 浜哄伐绛惧嚭鏃堕棿锛歿{
+ props.checkOutTime ? dayjs(props.checkOutTime).format('YYYY-MM-DD HH:mm:ss') : ''
+ }}
+ </div>
+ </template>
+ </template>
+ <div class="taskCheckFileCard-time" v-else>
+ {{ props.createdTime ? dayjs(props.createdTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
+ </div>
</div>
<div
class="taskCheckFileCard-status"
@@ -45,8 +75,9 @@
Colors,
EnumTaskUserSubmitCheckReceiveStatus,
EnumTaskUserSubmitCheckReceiveStatusText,
+ EnumTaskCheckReceiveMethod,
} from '@12333/constants';
-import { setOSSLink } from '@12333/utils';
+import { setOSSLink, OrderUtils } from '@12333/utils';
import dayjs from 'dayjs';
defineOptions({
@@ -59,10 +90,26 @@
files?: string[];
showCheckReceiveStatus?: boolean;
+
+ /** 鐢ㄦ埛绛惧埌鏃堕棿 */
+ userCheckInTime?: string;
+ /** 鐢ㄦ埛绛惧嚭鏃堕棿 */
+ userCheckOutTime?: string;
+ /** 浜哄伐绛惧埌鏃堕棿 */
+ checkInTime?: string;
+ /** 浜哄伐绛惧嚭鏃堕棿 */
+ checkOutTime?: string;
+
+ /** 楠屾敹鏂瑰紡 */
+ checkReceiveMethods?: EnumTaskCheckReceiveMethod[];
+ userCheckLabelPrefix?: string;
+ showCheckTime?: boolean;
};
const props = withDefaults(defineProps<Props>(), {
showCheckReceiveStatus: false,
+ userCheckLabelPrefix: '',
+ showCheckTime: false,
});
</script>
@@ -72,7 +119,7 @@
.taskCheckFileCard-wrapper {
.taskCheckFileCard-status-wrapper {
display: flex;
- align-items: center;
+ align-items: flex-start;
justify-content: space-between;
}
@@ -80,7 +127,7 @@
font-weight: 400;
font-size: 24px;
color: boleGetCssVar('text-color', 'regular');
- line-height: 32px;
+ line-height: 44px;
}
.taskCheckFileCard-img-grid {
--
Gitblit v1.9.1