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 c990b10e..983e43fe 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
@@ -88,6 +88,7 @@ export interface InspectionPlanVO {
* 状态
*/
state?:string
+
}
export interface InspectionPlanForm extends BaseEntity {
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/data.ts b/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/data.ts
index d9665527..95fd466a 100644
--- a/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/data.ts
+++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/data.ts
@@ -37,11 +37,11 @@ export const columns: VxeGridProps['columns'] = [
field: 'planName',
minWidth: 180,
},
- {
- title: '巡检路线',
- field: 'inspectionRouteId',
- width: 180,
- },
+ // {
+ // title: '巡检路线',
+ // field: 'inspectionRouteId',
+ // width: 180,
+ // },
{
title: '巡检周期',
field: 'inspectionPlanPeriod',
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 c0218032..a7218266 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
@@ -74,7 +74,9 @@ const [BasicModal, modalApi] = useVbenModal({
}else {
record.inspectionWorkday=record.inspectionWorkday?.split(',')
}
- record.userId=record.userId?.split(',')
+ if(record.inspectionPlanStaffVoList&&record.inspectionPlanStaffVoList.length){
+ record.userId=record.inspectionPlanStaffVoList.map(item=>item.userId)
+ }
await formApi.setValues(record);
}
await markInitialized();
@@ -95,6 +97,8 @@ async function handleConfirm() {
if (data.planDate && data.planDate.length) {
data.startDate = data.planDate[0]
data.endDate = data.planDate[1]
+ data.startTime=data.planDate[0]?.split(' ')[1]
+ data.endTime=data.planDate[1]?.split(' ')[1]
}
if(data.inspectionPlanPeriod=='1'){
data.inspectionMonth=data.inspectionMonth?.join(',')
@@ -105,7 +109,16 @@ async function handleConfirm() {
data.inspectionMonth=undefined
data.inspectionDay=undefined
}
- data.userId=data.userId?.join(',')
+ if(data.userId){
+ data.inspectionPlanStaffBoList=[]
+ data.userId.forEach(item=>
+ data.inspectionPlanStaffBoList.push({
+ userId:item,
+ startTime:data.startDate,
+ endTime:data.endDate
+ }))
+ }
+ // data.userId=data.userId?.join(',')
await (isUpdate.value ? inspectionPlanUpdate(data) : inspectionPlanAdd(data));
resetInitialized();
emit('reload');
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/plan-detail.vue b/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/plan-detail.vue
index 8838b2a0..ce8a1c81 100644
--- a/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/plan-detail.vue
+++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/plan-detail.vue
@@ -94,7 +94,9 @@ const monthArr=Array.from({ length: 12 }, (_, i) => ({
/>
- {{ inspectionPlanDetail.projectName }}
+
+ {{item.userName}}
+
{{ inspectionPlanDetail.remark }}