From 84cade81df5fc27d62e7f4f3738d0603039a21ff Mon Sep 17 00:00:00 2001
From: dev_ljl <2590379346@qq.com>
Date: Tue, 29 Jul 2025 15:26:41 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=B7=A1=E6=A3=80=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E7=BC=96=E8=BE=91=E3=80=81=E4=BF=9D=E5=85=BB=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attendanceGroupSettings/model.d.ts             | 10 ++++++++--
 .../equipmentManagement/maintainPlan/model.d.ts    |  2 ++
 .../inspectionManagement/inspectionPlan/model.d.ts |  2 +-
 .../attendance-group-detail.vue                    |  6 +++---
 .../attendanceGroupSettings/group-modal.vue        |  2 +-
 .../equipmentManagement/maintainPlan/data.ts       |  2 +-
 .../maintainPlan/maintainPlan-modal.vue            | 14 +++++++-------
 .../maintainPlan/plan-detail.vue                   |  8 ++++++--
 .../inspectionPlan/inspectionPlan-modal.vue        | 12 ++++++------
 9 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts b/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts
index 0bc06bd2..21ade3dc 100644
--- a/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts
+++ b/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts
@@ -19,9 +19,15 @@ export interface GroupVO {
   /**
    * 考勤类型(0:固定班制,1:排班制)
    */
-  attendanceType: number;
+  attendanceType: number| string;
 
-  isAutomatic: number;
+  isAutomatic: boolean;
+
+  clockDateList: any[];
+
+  weekList: any[];
+
+  attendanceList:any[];
 
 }
 
diff --git a/apps/web-antd/src/api/property/equipmentManagement/maintainPlan/model.d.ts b/apps/web-antd/src/api/property/equipmentManagement/maintainPlan/model.d.ts
index 6350b7c2..4f89a0b2 100644
--- a/apps/web-antd/src/api/property/equipmentManagement/maintainPlan/model.d.ts
+++ b/apps/web-antd/src/api/property/equipmentManagement/maintainPlan/model.d.ts
@@ -61,6 +61,8 @@ export interface MaintainPlanVO {
   userId: string[];
 
   machineMaintainPlanStaffBoList:any[];
+
+  machineMaintainPlanStaffVos:any[];
 }
 
 export interface MaintainPlanForm extends BaseEntity {
diff --git a/apps/web-antd/src/api/property/inspectionManagement/inspectionPlan/model.d.ts b/apps/web-antd/src/api/property/inspectionManagement/inspectionPlan/model.d.ts
index 56008843..7467c144 100644
--- a/apps/web-antd/src/api/property/inspectionManagement/inspectionPlan/model.d.ts
+++ b/apps/web-antd/src/api/property/inspectionManagement/inspectionPlan/model.d.ts
@@ -19,7 +19,7 @@ export interface InspectionPlanVO {
   /**
    * 巡检周期
    */
-  inspectionPlanPeriod: number;
+  inspectionPlanPeriod: string;
 
   /**
    * 任务提前分组
diff --git a/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/attendance-group-detail.vue b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/attendance-group-detail.vue
index def438ed..95c1db8e 100644
--- a/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/attendance-group-detail.vue
+++ b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/attendance-group-detail.vue
@@ -45,7 +45,7 @@ async function handleOpenChange(open: boolean) {
   }
   modalApi.modalLoading(true);
   const {id,attendanceType} = modalApi.getData() as { id?: number | string,attendanceType?:string };
-  const res = await groupInfo(id,attendanceType);
+  const res = await groupInfo(id as string,attendanceType as string);
   groupDetail.value=res;
   if(res.attendanceType==0){
     unCheckInData.value=res.clockDateList.filter(item=>item.mustNoCheck==0)
@@ -65,7 +65,7 @@ async function handleOpenChange(open: boolean) {
     })
     groupDetail.value.isAutomatic=true
   }else {
-    cycleData.value=res;
+    cycleData.value=[];
   }
   modalApi.modalLoading(false);
 }
@@ -115,7 +115,7 @@ async function showHoliday() {
               size="small"
               :pagination="false"
             >
-              <template #bodyCell="{ column, record, index }">
+              <template #bodyCell="{ column, record }">
                 <template v-if="column.dataIndex === 'dayOfWeek'">
                  <component :is="renderDict(record.dayOfWeek,'wy_kqgzr')"></component>
                 </template>
diff --git a/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/group-modal.vue b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/group-modal.vue
index bce2bccb..25246edf 100644
--- a/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/group-modal.vue
+++ b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/group-modal.vue
@@ -89,7 +89,7 @@ const [BasicModal, modalApi] = useVbenModal({
     };
     isUpdate.value = !!id;
     if (isUpdate.value && id) {
-      const record = await groupInfo(id, attendanceType);
+      const record = await groupInfo(id, attendanceType as string);
       record.attendanceType = record.attendanceType.toString()
       if (record.attendanceType == '0') {
         settingData.unCheckInData = record.clockDateList.filter(item => item.mustNoCheck == 0)
diff --git a/apps/web-antd/src/views/property/equipmentManagement/maintainPlan/data.ts b/apps/web-antd/src/views/property/equipmentManagement/maintainPlan/data.ts
index a599cef5..0565d614 100644
--- a/apps/web-antd/src/views/property/equipmentManagement/maintainPlan/data.ts
+++ b/apps/web-antd/src/views/property/equipmentManagement/maintainPlan/data.ts
@@ -177,7 +177,7 @@ export const modalSchema: FormSchemaGetter = () => [
     rules:'required'
   },
   {
-    label: '巡检人员',
+    label: '保养人员',
     fieldName: 'userId',
     component: 'ApiSelect',
     componentProps:{
diff --git a/apps/web-antd/src/views/property/equipmentManagement/maintainPlan/maintainPlan-modal.vue b/apps/web-antd/src/views/property/equipmentManagement/maintainPlan/maintainPlan-modal.vue
index c2562fe5..3e1c1c07 100644
--- a/apps/web-antd/src/views/property/equipmentManagement/maintainPlan/maintainPlan-modal.vue
+++ b/apps/web-antd/src/views/property/equipmentManagement/maintainPlan/maintainPlan-modal.vue
@@ -15,8 +15,8 @@ import {defaultFormValueGetter, useBeforeCloseDiff} from '#/utils/popup';
 
 import {modalSchema} from './data';
 import {getMachineTypeTree} from "#/api/property/machineType";
-import {personList} from "#/api/property/resident/person";
 import {renderDictValue} from "#/utils/render";
+import {userList} from "#/api/system/user";
 
 const emit = defineEmits<{ reload: [] }>();
 
@@ -72,8 +72,8 @@ const [BasicModal, modalApi] = useVbenModal({
         record.maintainMonth = record.maintainMonth?.split(',')
         record.maintainDay = record.maintainDay?.split(',')
       }
-      if (record.machineMaintainPlanStaffBoList) {
-        record.userId =  record.machineMaintainPlanStaffBoList.map(item=>item.userId)
+      if (record.machineMaintainPlanStaffVos) {
+        record.userId =  record.machineMaintainPlanStaffVos.map(item=>item.userId.toString())
       }
       await formApi.setValues(record);
     }
@@ -161,11 +161,11 @@ async function queryPersonData() {
     pageSize: 1000,
     pageNum: 1,
   }
-  const res = await personList(params);
+  const res = await userList(params);
   const options = res.rows.map((user) => ({
-    label: user.userName + '-' + renderDictValue(user.gender, 'sys_user_sex')
-      + '-' + user.phone + '-' + user.unitName,
-    value: user.id,
+    label: user.nickName + '-' + renderDictValue(user.sex, 'sys_user_sex')
+      + '-' + user.phonenumber,
+    value: user.userId.toString(),
   }));
   formApi.updateSchema([{
     componentProps: () => ({
diff --git a/apps/web-antd/src/views/property/equipmentManagement/maintainPlan/plan-detail.vue b/apps/web-antd/src/views/property/equipmentManagement/maintainPlan/plan-detail.vue
index 895b6e20..150c3007 100644
--- a/apps/web-antd/src/views/property/equipmentManagement/maintainPlan/plan-detail.vue
+++ b/apps/web-antd/src/views/property/equipmentManagement/maintainPlan/plan-detail.vue
@@ -10,7 +10,6 @@ import {renderDict} from "#/utils/render";
 dayjs.extend(duration);
 dayjs.extend(relativeTime);
 import {CheckboxGroup} from 'ant-design-vue'
-import {getDictOptions} from "#/utils/dict";
 import {maintainPlanInfo} from "#/api/property/equipmentManagement/maintainPlan";
 import type {MaintainPlanVO} from "#/api/property/equipmentManagement/maintainPlan/model";
 
@@ -78,11 +77,16 @@ const monthArr=Array.from({ length: 12 }, (_, i) => ({
       <DescriptionsItem label="计划日期" :span="2">
         {{ maintainPlanDetail.startDate + '\xa0至\xa0' + maintainPlanDetail.endDate }}
       </DescriptionsItem>
-      <DescriptionsItem label="状态" v-if="maintainPlanDetail.state!=null">
+      <DescriptionsItem label="状态" v-if="maintainPlanDetail.state!=null" :span="2">
         <component
           :is="renderDict(maintainPlanDetail.state,'wy_state')"
         />
       </DescriptionsItem>
+      <DescriptionsItem label="保养人员" :span="2">
+        <span style="margin-right: 10px;" v-for="item in maintainPlanDetail.machineMaintainPlanStaffVos">
+          {{item.userName}}
+        </span>
+      </DescriptionsItem>
     </Descriptions>
   </BasicModal>
 </template>
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/inspectionPlan-modal.vue b/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/inspectionPlan-modal.vue
index bbd5bab6..870e35bc 100644
--- a/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/inspectionPlan-modal.vue
+++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/inspectionPlan-modal.vue
@@ -14,10 +14,10 @@ import {
 import {defaultFormValueGetter, useBeforeCloseDiff} from '#/utils/popup';
 
 import {modalSchema} from './data';
-import {personList} from "#/api/property/resident/person";
 import {renderDictValue} from "#/utils/render";
 import {inspectionRouteList} from "#/api/property/inspectionManagement/inspectionRoute";
 import {InputNumber} from 'ant-design-vue'
+import {userList} from "#/api/system/user";
 
 const emit = defineEmits<{ reload: [] }>();
 
@@ -75,7 +75,7 @@ const [BasicModal, modalApi] = useVbenModal({
         record.inspectionWorkday = record.inspectionWorkday?.split(',')
       }
       if (record.inspectionPlanStaffVoList && record.inspectionPlanStaffVoList.length) {
-        record.userId = record.inspectionPlanStaffVoList.map(item => item.userId)
+        record.userId = record.inspectionPlanStaffVoList.map(item => item.userId.toString())
       }
       await formApi.setValues(record);
     }
@@ -140,11 +140,11 @@ async function queryPersonData() {
     pageSize: 1000,
     pageNum: 1,
   }
-  const res = await personList(params);
+  const res = await userList(params);
   const options = res.rows.map((user) => ({
-    label: user.userName + '-' + renderDictValue(user.gender, 'sys_user_sex')
-      + '-' + user.phone + '-' + user.unitName,
-    value: user.id,
+    label: user.nickName + '-' + renderDictValue(user.sex, 'sys_user_sex')
+      + '-' + user.phonenumber,
+    value: user.userId.toString(),
   }));
   formApi.updateSchema([{
     componentProps: () => ({