diff --git a/apps/web-antd/src/views/property/equipmentManagement/deviceLocation/data.ts b/apps/web-antd/src/views/property/equipmentManagement/deviceLocation/data.ts index a4f6b9f9..d51b68d7 100644 --- a/apps/web-antd/src/views/property/equipmentManagement/deviceLocation/data.ts +++ b/apps/web-antd/src/views/property/equipmentManagement/deviceLocation/data.ts @@ -42,10 +42,6 @@ export const columns: VxeGridProps['columns'] = [ }, }, }, - { - title: '位置对象', - field: 'locationObject', - }, { title: '备注', field: 'remark', diff --git a/apps/web-antd/src/views/property/equipmentManagement/deviceLocation/deviceLocation-modal.vue b/apps/web-antd/src/views/property/equipmentManagement/deviceLocation/deviceLocation-modal.vue index 5d8a8542..a992bbbc 100644 --- a/apps/web-antd/src/views/property/equipmentManagement/deviceLocation/deviceLocation-modal.vue +++ b/apps/web-antd/src/views/property/equipmentManagement/deviceLocation/deviceLocation-modal.vue @@ -105,9 +105,11 @@ const [BasicModal, modalApi] = useVbenModal({ isUpdate.value = !!id; if (isUpdate.value && id) { const record = await deviceLocationInfo(id); + await setupCommunitySelect(record.locationType); record.locationType = record.locationType?.toString(); await formApi.setValues(record); } + await markInitialized(); modalApi.modalLoading(false); },