From 87fc96500ad6a1de24a2c8d08b6c60c7dbf2bdc8 Mon Sep 17 00:00:00 2001
From: fyy <2717885210@qq.com>
Date: Tue, 19 Aug 2025 11:50:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E8=80=83=E5=8B=A4=E7=BB=84=E4=BA=BA=E5=91=98=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workforceManagement/arrangement-modal.vue   |  4 ++--
 .../workforceManagement/workforce-detail.vue    | 17 ++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/arrangement-modal.vue b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/arrangement-modal.vue
index 7d227467..c497417f 100644
--- a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/arrangement-modal.vue
+++ b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/arrangement-modal.vue
@@ -77,7 +77,7 @@ const columns = [
   },
   {
     title: '部门',
-    dataIndex: ['dept', 'unitName'],
+    dataIndex: ['dept', 'deptName'],
     key: 'dept',
     width: 120,
     customRender: ({
@@ -443,7 +443,7 @@ onMounted(() => {});
         :columns="columns"
         :dataSource="tableData"
         :pagination="false"
-        rowKey="dept.unitId"
+        rowKey="dept.deptId"
         bordered
       />
     </div>
diff --git a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/workforce-detail.vue b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/workforce-detail.vue
index c7e6f34b..de9b4d0e 100644
--- a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/workforce-detail.vue
+++ b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/workforce-detail.vue
@@ -44,7 +44,7 @@ const groupOptions = ref<any[]>([]); //考勤组
 const areaOptions = ref<any[]>([]); //区域
 const groupMap = ref<Record<string, any>>({}); // 用于快速查找
 let tableData = reactive<
-  { dept: { unitId: string | number; unitName: string }; users: PersonVO[] }[]
+  { dept: { deptId: string | number; deptName: string }; users: PersonVO[] }[]
 >([]); //存放考勤组人员列表数据
 const columns = [
   {
@@ -56,10 +56,10 @@ const columns = [
   },
   {
     title: '部门',
-    dataIndex: ['dept', 'unitName'],
+    dataIndex: ['dept', 'deptName'],
     key: 'dept',
     width: 120,
-    customRender: ({ record }: { record: any }) => record.dept.unitName,
+    customRender: ({ record }: { record: any }) => record.dept.deptName,
   },
   {
     title: '已选人数',
@@ -124,12 +124,11 @@ function handleTableData(newTableData: any) {
   if (newTableData.length === 0) {
     return;
   }
-
   // 处理有数据的情况
   for (const newItem of newTableData) {
     // 查找是否已存在相同部门
     const existingDeptIndex = tableData.findIndex(
-      (item) => item.dept.unitId === newItem.dept.unitId,
+      (item) => item.dept.deptId === newItem.dept.deptId,
     );
 
     if (existingDeptIndex !== -1) {
@@ -191,7 +190,7 @@ const [BasicModal, modalApi] = useVbenModal({
 
           if (!deptMap.has(deptId)) {
             deptMap.set(deptId, {
-              dept: { unitId: deptId, unitName: deptName },
+              dept: { deptId: deptId, deptName: deptName },
               users: [],
             });
           }
@@ -252,8 +251,8 @@ async function handleConfirm() {
     const data = formModal;
     data.userGroupList = tableData.flatMap((item) =>
       item.users.map((user) => ({
-        deptId: item.dept.unitId,
-        deptName: item.dept.unitName,
+        deptId: item.dept.deptId,
+        deptName: item.dept.deptName,
         employeeId: user.userId,
         employeeName: user.userName,
       })),
@@ -351,7 +350,7 @@ onMounted(() => {});
         :columns="columns"
         :dataSource="tableData"
         :pagination="false"
-        rowKey="dept.unitId"
+        rowKey="dept.deptId"
         bordered
       />
     </div>