From 12f08c16ee7c7176368b5961fe104ed698227a8d Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 11 九月 2025 17:41:50 +0800
Subject: [PATCH] Merge branch 'master' into dev-v1.1
---
packages/components/src/Card/TaskCard.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/packages/components/src/Card/TaskCard.vue b/packages/components/src/Card/TaskCard.vue
index e45fad3..b983916 100644
--- a/packages/components/src/Card/TaskCard.vue
+++ b/packages/components/src/Card/TaskCard.vue
@@ -25,9 +25,7 @@
</div>
</div>
<div class="task-card-time">
- {{ dayjs(beginTime).format('YYYY骞碝M鏈圖D鏃�') }}鑷硔{
- dayjs(endTime).format('YYYY骞碝M鏈圖D鏃�')
- }}
+ {{ dayjs(beginTime).format('YYYY骞碝M鏈圖鏃�') }}鑷硔{ dayjs(endTime).format('YYYY骞碝M鏈圖鏃�') }}
</div>
</slot>
<div class="task-card-footer">
@@ -41,6 +39,7 @@
v-if="releaseStatus === EnumTaskReleaseStatus.InProcess"
type="primary"
@click="emit('apply', props.id)"
+ :disabled="!!hireStatus"
>鎶ュ悕</nut-button
>
</slot>
@@ -63,6 +62,7 @@
EnumUserGenderText,
EnumSettlementCycleText,
BillingMethodEnumUnit,
+ EnumTaskUserHireStatus,
} from '@12333/constants';
import TaskPrice from './TaskPrice.vue';
import { CommonTaskCardProps } from './card';
@@ -119,6 +119,7 @@
recommendStatus?: EnumTaskRecommendStatus;
/** 鍒涘缓鏃堕棿 */
createdTime?: string;
+ hireStatus?: EnumTaskUserHireStatus;
};
const props = withDefaults(defineProps<Props>(), {
--
Gitblit v1.9.1