From b331f884097a2dc5086c8cf043c8c8f52e7640fe Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 12 九月 2025 17:34:39 +0800
Subject: [PATCH] Merge branch 'master' into dev-v1.1
---
src/views/EmploymentManage/CheckReceiveTaskDetail.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/EmploymentManage/CheckReceiveTaskDetail.vue b/src/views/EmploymentManage/CheckReceiveTaskDetail.vue
index d52653d..a16ce8b 100644
--- a/src/views/EmploymentManage/CheckReceiveTaskDetail.vue
+++ b/src/views/EmploymentManage/CheckReceiveTaskDetail.vue
@@ -32,7 +32,7 @@
</ProFormItemV2>
</ProFormColItem>
<ProFormColItem :span="8">
- <ProFormItemV2 label="鍙戝竷鏃ユ湡:">
+ <ProFormItemV2 label="缁撴潫鏃ユ湡:">
{{ dayjs(taskInfo.endTime ?? '').format('YYYY-MM-DD') }}
</ProFormItemV2>
</ProFormColItem>
@@ -88,7 +88,7 @@
},
extraProps: {
hide: (row: API.GetCheckReceiveTaskQueryResultItem) =>
- row.checkReceiveStatus !== EnumTaskCheckReceiveStatus.WaitCheckReceive,
+ row.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed,
},
},
{
--
Gitblit v1.9.1