fix：巡检计划编辑、保养计划编辑

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:{

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: () => ({

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>