From c8a804e84c59153ae84a2a848bd03686cf9dfd04 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期五, 29 八月 2025 13:49:41 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp --- packages/components/src/Card/TaskCard.vue | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/components/src/Card/TaskCard.vue b/packages/components/src/Card/TaskCard.vue index 254b6c5..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"> @@ -37,7 +35,11 @@ </div> <div class="task-card-actions" v-if="showActions"> <slot name="actions"> - <nut-button v-if="releaseStatus === EnumTaskReleaseStatus.InProcess" type="primary" + <nut-button + v-if="releaseStatus === EnumTaskReleaseStatus.InProcess" + type="primary" + @click="emit('apply', props.id)" + :disabled="!!hireStatus" >鎶ュ悕</nut-button > </slot> @@ -60,6 +62,7 @@ EnumUserGenderText, EnumSettlementCycleText, BillingMethodEnumUnit, + EnumTaskUserHireStatus, } from '@12333/constants'; import TaskPrice from './TaskPrice.vue'; import { CommonTaskCardProps } from './card'; @@ -116,6 +119,7 @@ recommendStatus?: EnumTaskRecommendStatus; /** 鍒涘缓鏃堕棿 */ createdTime?: string; + hireStatus?: EnumTaskUserHireStatus; }; const props = withDefaults(defineProps<Props>(), { -- Gitblit v1.9.1