diff --git a/apps/web-antd/src/views/property/costManagement/houseCharge/house-charge-detail.vue b/apps/web-antd/src/views/property/costManagement/houseCharge/house-charge-detail.vue index fa29c7e5..65d12bac 100644 --- a/apps/web-antd/src/views/property/costManagement/houseCharge/house-charge-detail.vue +++ b/apps/web-antd/src/views/property/costManagement/houseCharge/house-charge-detail.vue @@ -45,13 +45,13 @@ async function handleOpenChange(open: boolean) { - {{ costItem.id }} + {{ costItem?.id }} - {{ costItem.chargeItem }} + {{ costItem?.chargeItem }} - @@ -59,16 +59,16 @@ async function handleOpenChange(open: boolean) { {{ houseChargeDetail.startTime+' 至 '+houseChargeDetail.endTime }} - {{room.roomNumber}} + {{room?.roomNumber}} - {{`建筑面积:${room.area} 套内面积:${room.insideInArea}`}} + {{`建筑面积:${room?.area} 套内面积:${room?.insideInArea}`}} - {{ costItem.unitPrice }} + {{ costItem?.unitPrice }} - {{costItem.surcharge}} + {{costItem?.surcharge}} diff --git a/apps/web-antd/src/views/property/costManagement/houseCharge/houseCharge-update.vue b/apps/web-antd/src/views/property/costManagement/houseCharge/houseCharge-update.vue index 43014f3b..158751de 100644 --- a/apps/web-antd/src/views/property/costManagement/houseCharge/houseCharge-update.vue +++ b/apps/web-antd/src/views/property/costManagement/houseCharge/houseCharge-update.vue @@ -62,15 +62,12 @@ const [BasicModal, modalApi] = useVbenModal({ modalApi.modalLoading(true); const {id} = modalApi.getData() as { id?: number | string }; isUpdate.value = !!id; - - if (isUpdate.value && id) { - record.value = await houseChargeInfo(id); - if (record.value) { - room.value = record.value.roomVo - costItem.value = record.value.costItemsVo - } - await formApi.setValues(record.value); + record.value = await houseChargeInfo(id); + if (record.value) { + room.value = record.value.roomVo + costItem.value = record.value.costItemsVo } + await formApi.setValues(record.value); await markInitialized(); modalApi.modalLoading(false); @@ -111,14 +108,15 @@ async function handleClosed() { - {{ costItem.id }} + {{ costItem?.id }} - {{ costItem.chargeItem }} + {{ costItem?.chargeItem }} @@ -128,13 +126,13 @@ async function handleClosed() { {{ room.roomNumber }} - {{ `${room.area} (套内面积:${room.insideInArea})` }} + {{ `${room?.area} (套内面积:${room?.insideInArea})` }} - {{ costItem.unitPrice }} + {{ costItem?.unitPrice }} - {{ costItem.surcharge }} + {{ costItem?.surcharge }}