From 0ef755133054cb0edc9455803c7b7bd23f563aa8 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期日, 19 十月 2025 16:51:34 +0800
Subject: [PATCH] fix: s

---
 src/views/EmploymentManage/constants/columns.ts |    6 +++---
 src/views/EmploymentManage/TaskManageList.vue   |   18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/views/EmploymentManage/TaskManageList.vue b/src/views/EmploymentManage/TaskManageList.vue
index 4f8ffae..a19bbc4 100644
--- a/src/views/EmploymentManage/TaskManageList.vue
+++ b/src/views/EmploymentManage/TaskManageList.vue
@@ -81,6 +81,7 @@
 import { format } from '@/utils';
 import { ModelValueType } from 'element-plus';
 import { Message } from '@bole-core/core';
+import dayjs from 'dayjs';
 
 defineOptions({
   name: 'TaskManageList',
@@ -228,6 +229,23 @@
           return `${row.serviceFee}${EnumBillingMethodUnitText[row.billingMethod]}`;
         },
       },
+      applyBeginTime: { type: 'date', format: 'YYYY-MM-DD' },
+      applyEndTime: { type: 'date', format: 'YYYY-MM-DD' },
+      //@ts-ignore
+      applyStatus: {
+        formatter: (row: API.GetTaskInfosQueryResultItem) => {
+          const applyBeginTime = dayjs(row.applyBeginTime);
+          const applyEndTime = dayjs(row.applyEndTime);
+          const now = dayjs();
+          if (applyEndTime.isBefore(now)) {
+            return '宸茬粨鏉�';
+          } else if (applyBeginTime.isAfter(now)) {
+            return '寰呭紑濮�';
+          } else {
+            return '杩涜涓�';
+          }
+        },
+      },
     },
   }
 );
diff --git a/src/views/EmploymentManage/constants/columns.ts b/src/views/EmploymentManage/constants/columns.ts
index 371213b..2cd5a95 100644
--- a/src/views/EmploymentManage/constants/columns.ts
+++ b/src/views/EmploymentManage/constants/columns.ts
@@ -38,17 +38,17 @@
   },
   {
     id: '8',
-    enCode: 'userCount',
+    enCode: 'applyBeginTime',
     name: '鎶ュ悕寮�濮�',
   },
   {
     id: '9',
-    enCode: 'userCount',
+    enCode: 'applyEndTime',
     name: '鎶ュ悕缁撴潫',
   },
   {
     id: '10',
-    enCode: 'userCount',
+    enCode: 'applyStatus',
     name: '鎶ュ悕鐘舵��',
   },
   {

--
Gitblit v1.9.1