1、房屋收费缴费

apps/web-antd/src/views/property/costManagement/houseCharge/house-charge-detail.vue

@@ -45,13 +45,13 @@ async function handleOpenChange(open: boolean) {
     <Descriptions v-if="houseChargeDetail" size="small" :column="2" bordered
                   :labelStyle="{width:'100px'}">
       <DescriptionsItem label="费用编号">
-        {{ costItem.id }}
+        {{ costItem?.id }}
       </DescriptionsItem>
       <DescriptionsItem label="费用项目">
-        {{ costItem.chargeItem }}
+        {{ costItem?.chargeItem }}
       </DescriptionsItem>
       <DescriptionsItem label="费用类型">
-        <component
+        <component v-if="costItem"
           :is="renderDict(costItem.costType,'pro_expense_type')"
         />
       </DescriptionsItem>
@@ -59,16 +59,16 @@ async function handleOpenChange(open: boolean) {
         {{ houseChargeDetail.startTime+' 至 '+houseChargeDetail.endTime }}
       </DescriptionsItem>
       <DescriptionsItem label="房间">
-        {{room.roomNumber}}
+        {{room?.roomNumber}}
       </DescriptionsItem>
       <DescriptionsItem label="房间面积">
-        {{`建筑面积：${room.area} 套内面积：${room.insideInArea}`}}
+        {{`建筑面积：${room?.area} 套内面积：${room?.insideInArea}`}}
       </DescriptionsItem>
       <DescriptionsItem label="单价">
-        {{ costItem.unitPrice }}
+        {{ costItem?.unitPrice }}
       </DescriptionsItem>
       <DescriptionsItem label="附加费">
-        {{costItem.surcharge}}
+        {{costItem?.surcharge}}
       </DescriptionsItem>
       <DescriptionsItem label="应收金额">
         <span style="font-size: 16px;font-weight: 600;color: red" v-if="houseChargeDetail.amountReceivable">

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;
-
+    record.value = await houseChargeInfo(id);
-    if (isUpdate.value && id) {
+    if (record.value) {
-      record.value = await houseChargeInfo(id);
+      room.value = record.value.roomVo
-      if (record.value) {
+      costItem.value = record.value.costItemsVo
-        room.value = record.value.roomVo
-        costItem.value = record.value.costItemsVo
-      }
-      await formApi.setValues(record.value);
     }
+    await formApi.setValues(record.value);
     await markInitialized();
 
     modalApi.modalLoading(false);
@@ -111,14 +108,15 @@ async function handleClosed() {
     <Descriptions v-if="record" size="small" :column="2"
                   :labelStyle="{width:'80px'}">
       <DescriptionsItem label="费用编号">
-        {{ costItem.id }}
+        {{ costItem?.id }}
       </DescriptionsItem>
       <DescriptionsItem label="费用项目">
-        {{ costItem.chargeItem }}
+        {{ costItem?.chargeItem }}
       </DescriptionsItem>
       <DescriptionsItem label="费用类型">
         <component
-          :is="renderDict(costItem.costType,'pro_expense_type')"
+            v-if="costItem"
+          :is="renderDict(costItem?.costType,'pro_expense_type')"
         />
       </DescriptionsItem>
       <DescriptionsItem label="计费起始">
@@ -128,13 +126,13 @@ async function handleClosed() {
         {{ room.roomNumber }}
       </DescriptionsItem>
       <DescriptionsItem label="面积(㎡)">
-        {{ `${room.area} （套内面积：${room.insideInArea}）` }}
+        {{ `${room?.area} （套内面积：${room?.insideInArea}）` }}
       </DescriptionsItem>
       <DescriptionsItem label="单价">
-        {{ costItem.unitPrice }}
+        {{ costItem?.unitPrice }}
       </DescriptionsItem>
       <DescriptionsItem label="附加费">
-        {{ costItem.surcharge }}
+        {{ costItem?.surcharge }}
       </DescriptionsItem>
       <DescriptionsItem label="应收金额" :span="2">
         <span style="font-size: 16px;font-weight: 600;color: red" v-if="record.amountReceivable">