From 13f79986f8920374f1b75275c715ea3f1c0bce28 Mon Sep 17 00:00:00 2001
From: fyy <2717885210@qq.com>
Date: Tue, 12 Aug 2025 17:30:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=92=E7=8F=AD=E8=AF=A6?=
 =?UTF-8?q?=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workforceManagement/arrangement-modal.vue |  2 +-
 .../workforceManagement/data.ts               |  3 ++-
 .../workforceManagement/unit-person-modal.vue |  1 -
 .../workforceManagement/workforce-detail.vue  | 26 ++++++++++++-------
 4 files changed, 19 insertions(+), 13 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 85d4c4ec..13251334 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
@@ -207,8 +207,8 @@ const [BasicModal, modalApi] = useVbenModal({
     if (!isOpen) {
       return null;
     }
-    await getGroupList();
     modalApi.modalLoading(true);
+    await getGroupList();
     // await markInitialized();
     modalApi.modalLoading(false);
   },
diff --git a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/data.ts b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/data.ts
index 27466c77..42f47b65 100644
--- a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/data.ts
+++ b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/data.ts
@@ -120,12 +120,13 @@ export const columns: VxeGridProps['columns'] = [
     minWidth: 200,
     slots: {
       default: ({ row }) => {
+        if(!row.attendanceShift) return '/';
         if (row.attendanceShift.startTime && row.attendanceShift.endTime) {
           if (
             row.attendanceShift.restEndTime &&
             row.attendanceShift.restStartTime
           ) {
-            return `${row.attendanceShift.startTime}～${row.attendanceShift.endTime} ${row.shift.restStartTime}～${row.shift.restEndTime}`;
+            return `${row.attendanceShift.startTime}～${row.attendanceShift.endTime} ${row.attendanceShift.restStartTime}～${row.attendanceShift.restEndTime}`;
           } else {
             return `${row.attendanceShift.startTime}～${row.attendanceShift.endTime}`;
           }
diff --git a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/unit-person-modal.vue b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/unit-person-modal.vue
index 425ef105..d8d7ae92 100644
--- a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/unit-person-modal.vue
+++ b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/unit-person-modal.vue
@@ -192,7 +192,6 @@ async function handleConfirm() {
         });
       }
     }
-    console.log(tableData);
     resetInitialized();
     emit('reload', tableData);
     tableData = [];
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 900d0d29..496b3bc4 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
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { reactive, onMounted } from 'vue';
+import { reactive, onMounted,computed } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 import {
@@ -102,7 +102,7 @@ const columns = [
 ];
 const editDate = ref<string | undefined>('');
 function handleRemoveUser(row: any, user: any) {
-  row.users = row.users.filter((u: any) => u.id !== user.id);
+  row.users = row.users.filter((u: any) => u.userId !== user.userId);
 }
 function handleRemoveRow(index: number) {
   tableData.splice(index, 1);
@@ -133,7 +133,7 @@ function handleTableData(newTableData: any) {
       for (const newUser of newItem.users) {
         // 检查该用户是否已存在
         const userExists = existingDept?.users.some(
-          (existingUser) => existingUser.id === newUser.id,
+          (existingUser) => existingUser.userId === newUser.userId,
         );
         if (!userExists) {
           // 用户不存在，添加到现有部门
@@ -159,8 +159,8 @@ const [BasicModal, modalApi] = useVbenModal({
     if (!isOpen) {
       return null;
     }
-    await getGroupList();
     modalApi.modalLoading(true);
+    await getGroupList();
     const { id, date } = modalApi.getData() as {
       id?: number | string;
       date?: string;
@@ -178,8 +178,8 @@ const [BasicModal, modalApi] = useVbenModal({
         const deptMap = new Map();
 
         for (const item of record.userGroupList) {
-          const deptId = item.deptId;
-          const deptName = item.deptName;
+          const deptId = item.sysUser.deptId;
+          const deptName = item.sysUser.deptName;
 
           if (!deptMap.has(deptId)) {
             deptMap.set(deptId, {
@@ -188,19 +188,23 @@ const [BasicModal, modalApi] = useVbenModal({
             });
           }
           deptMap.get(deptId).users.push({
-            id: item.employeeId,
-            userName: item.employeeName,
+            userId: item.sysUser.userId,
+            userName: item.sysUser.userName,
           });
         }
         // 转换为 tableData 格式
         tableData.splice(0, 0, ...Array.from(deptMap.values()));
       }
     }
+    console.log(tableData);
+
     // await markInitialized();
     modalApi.modalLoading(false);
   },
 });
-const totalSelected: number = 0;
+const totalSelected = computed(() =>
+  tableData.reduce((sum, row) => sum + (row.users?.length || 0), 0),
+);
 async function getGroupList() {
   const res = await groupList({
     pageSize: 1000000000,
@@ -233,11 +237,13 @@ async function handleConfirm() {
     modalApi.lock(true);
     await formRef.value.validate(); // 先校验
     const data = formModal;
+    console.log(tableData);
+    
     data.userGroupList = tableData.flatMap((item) =>
       item.users.map((user) => ({
         deptId: item.dept.unitId,
         deptName: item.dept.unitName,
-        employeeId: user.id,
+        employeeId: user.userId,
         employeeName: user.userName,
       })),
     );