diff --git a/src/components/fee/editFee.vue b/src/components/fee/editFee.vue index 9e7e56eaa..d2f48f437 100644 --- a/src/components/fee/editFee.vue +++ b/src/components/fee/editFee.vue @@ -1,59 +1,30 @@ @@ -281,6 +281,7 @@ import EditFee from '@/components/fee/editFee' import RoomCreateFeeAdd from '@/components/fee/roomCreateFeeAdd' import AddMeterWater from '@/components/fee/addMeterWater' import AddProxyFee from '@/components/fee/addProxyFee' +import FinishFee from '@/components/fee/finishFee' export default { name: 'SimplifyRoomFee', @@ -291,6 +292,7 @@ export default { RoomCreateFeeAdd, AddMeterWater, AddProxyFee, + FinishFee }, data() { return { @@ -459,13 +461,13 @@ export default { }) }, deleteFee(fee) { - this.$emit('openDeleteFeeModal', { + this.$refs.deleteFee.open({ communityId: getCommunityId(), feeId: fee.feeId }) }, - finishFee(fee) { - this.$emit('openFinishFeeModal', { + finishFee(fee) { + this.$refs.finishFee.open({ communityId: getCommunityId(), feeId: fee.feeId }) diff --git a/src/components/room/roomTreeDiv.vue b/src/components/room/roomTreeDiv.vue index 7f6903c07..c5129b617 100644 --- a/src/components/room/roomTreeDiv.vue +++ b/src/components/room/roomTreeDiv.vue @@ -117,7 +117,7 @@ export default { roomName: `${room.floorNum}-${room.unitNum}-${room.roomNum}`, icon: "/img/room.png", text: room.ownerName - ? `${room.roomNum}${room.ownerName})` + ? `${room.roomNum}(${room.ownerName})` : `${room.roomNum}` }))