From 0a839183bc345e370f518525a2653bebaa11f99e Mon Sep 17 00:00:00 2001
From: wangxiaoxian <1094175543@qq.com>
Date: Wed, 4 Mar 2026 15:41:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/api.js               |  6 +++++
 src/views/apartment/Add.vue  |  2 +-
 src/views/apartment/Edit.vue |  2 +-
 src/views/contract/Add.vue   |  4 +--
 src/views/contract/Edit.vue  |  4 +--
 src/views/house/Add.vue      |  2 +-
 src/views/house/Edit.vue     |  2 +-
 src/views/rental/Add.vue     | 10 +++----
 src/views/rental/Detail.vue  | 51 ++++++++++++++----------------------
 src/views/rental/Edit.vue    |  6 ++---
 src/views/room/Add.vue       |  4 +--
 src/views/room/Edit.vue      |  4 +--
 12 files changed, 46 insertions(+), 51 deletions(-)

diff --git a/src/api/api.js b/src/api/api.js
index 7280d6e..62645ee 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -4,6 +4,7 @@ import { get, post, put, del } from './request';
 // 区域管理API
 export const regionApi = {
   getAll: () => get('/regions'),
+  list: (params = {}) => get('/regions/list', params),
   getById: (id) => get(`/regions/${id}`),
   create: (data) => post('/regions', data),
   update: (id, data) => put(`/regions/${id}`, data),
@@ -13,6 +14,7 @@ export const regionApi = {
 // 公寓管理API
 export const apartmentApi = {
   getAll: (params = {}) => get('/apartments', params),
+  list: (params = {}) => get('/apartments/list', params),
   getById: (id) => get(`/apartments/${id}`),
   create: (data) => post('/apartments', data),
   update: (id, data) => put(`/apartments/${id}`, data),
@@ -22,6 +24,7 @@ export const apartmentApi = {
 // 房间管理API
 export const roomApi = {
   getAll: (params = {}) => get('/rooms', params),
+  list: (params = {}) => get('/rooms/list', params),
   getById: (id) => get(`/rooms/${id}`),
   create: (data) => post('/rooms', data),
   update: (id, data) => put(`/rooms/${id}`, data),
@@ -31,6 +34,7 @@ export const roomApi = {
 // 租客管理API
 export const tenantApi = {
   getAll: () => get('/tenants'),
+  list: (params = {}) => get('/tenants/list', params),
   getById: (id) => get(`/tenants/${id}`),
   create: (data) => post('/tenants', data),
   update: (id, data) => put(`/tenants/${id}`, data),
@@ -49,6 +53,7 @@ export const contractApi = {
 // 租房管理API
 export const rentalApi = {
   getAll: (params = {}) => get('/rentals', params),
+  list: (params = {}) => get('/rentals/list', params),
   getById: (id) => get(`/rentals/${id}`),
   create: (data) => post('/rentals', data),
   update: (id, data) => put(`/rentals/${id}`, data),
@@ -67,6 +72,7 @@ export const statisticsApi = {
 // 水费管理API
 export const waterBillApi = {
   getAll: (params = {}) => get('/water-bills', params),
+  list: (params = {}) => get('/water-bills/list', params),
   getById: (id) => get(`/water-bills/${id}`),
   create: (data) => post('/water-bills', data),
   update: (id, data) => put(`/water-bills/${id}`, data),
diff --git a/src/views/apartment/Add.vue b/src/views/apartment/Add.vue
index 3991345..1bdbdc8 100644
--- a/src/views/apartment/Add.vue
+++ b/src/views/apartment/Add.vue
@@ -62,7 +62,7 @@ export default {
   methods: {
     async loadRegions() {
       try {
-        const response = await regionApi.getAll()
+        const response = await regionApi.list()
         this.regions = response
       } catch (error) {
         this.$message.error('加载区域数据失败')
diff --git a/src/views/apartment/Edit.vue b/src/views/apartment/Edit.vue
index 0511799..44c4f91 100644
--- a/src/views/apartment/Edit.vue
+++ b/src/views/apartment/Edit.vue
@@ -64,7 +64,7 @@ export default {
   methods: {
     async loadRegions() {
       try {
-        const response = await regionApi.getAll()
+        const response = await regionApi.list()
         this.regions = response
       } catch (error) {
         this.$message.error('加载区域数据失败')
diff --git a/src/views/contract/Add.vue b/src/views/contract/Add.vue
index 9dea7cc..eb45275 100644
--- a/src/views/contract/Add.vue
+++ b/src/views/contract/Add.vue
@@ -87,7 +87,7 @@ export default {
   methods: {
     async loadTenants() {
       try {
-        const response = await tenantApi.getAll()
+        const response = await tenantApi.list()
         this.tenants = response
       } catch (error) {
         this.$message.error('加载租客数据失败')
@@ -95,7 +95,7 @@ export default {
     },
     async loadRooms() {
       try {
-        const response = await roomApi.getAll()
+        const response = await roomApi.list()
         this.rooms = response
       } catch (error) {
         this.$message.error('加载房间数据失败')
diff --git a/src/views/contract/Edit.vue b/src/views/contract/Edit.vue
index bdc9ad0..21d3b08 100644
--- a/src/views/contract/Edit.vue
+++ b/src/views/contract/Edit.vue
@@ -89,7 +89,7 @@ export default {
   methods: {
     async loadTenants() {
       try {
-        const response = await tenantApi.getAll()
+        const response = await tenantApi.list()
         this.tenants = response
       } catch (error) {
         this.$message.error('加载租客数据失败')
@@ -97,7 +97,7 @@ export default {
     },
     async loadRooms() {
       try {
-        const response = await roomApi.getAll()
+        const response = await roomApi.list()
         this.rooms = response
       } catch (error) {
         this.$message.error('加载房间数据失败')
diff --git a/src/views/house/Add.vue b/src/views/house/Add.vue
index e06bf16..49aa562 100644
--- a/src/views/house/Add.vue
+++ b/src/views/house/Add.vue
@@ -81,7 +81,7 @@ export default {
   methods: {
     async loadRegions() {
       try {
-        const response = await regionApi.getAll()
+        const response = await regionApi.list()
         this.regions = response
       } catch (error) {
         this.$message.error('加载区域数据失败')
diff --git a/src/views/house/Edit.vue b/src/views/house/Edit.vue
index 0567032..8ed8c2d 100644
--- a/src/views/house/Edit.vue
+++ b/src/views/house/Edit.vue
@@ -83,7 +83,7 @@ export default {
   methods: {
     async loadRegions() {
       try {
-        const response = await regionApi.getAll()
+        const response = await regionApi.list()
         this.regions = response
       } catch (error) {
         this.$message.error('加载区域数据失败')
diff --git a/src/views/rental/Add.vue b/src/views/rental/Add.vue
index a2cb508..e62e5ac 100644
--- a/src/views/rental/Add.vue
+++ b/src/views/rental/Add.vue
@@ -140,14 +140,14 @@ export default {
   methods: {
     async loadData() {
       try {
-        // 并行加载房间和公寓数据
+        // 并行加载房间和公寓数据（使用list接口）
         const [roomsResponse, apartmentsResponse] = await Promise.all([
-          roomApi.getAll(),
-          apartmentApi.getAll()
+          roomApi.list(),
+          apartmentApi.list()
         ])
         
-        this.rooms = roomsResponse.data || roomsResponse
-        this.apartments = apartmentsResponse.data || apartmentsResponse
+        this.rooms = roomsResponse
+        this.apartments = apartmentsResponse
         
         // 检查URL参数中是否有roomId
         const roomId = this.$route.query.roomId ? Number(this.$route.query.roomId) : null
diff --git a/src/views/rental/Detail.vue b/src/views/rental/Detail.vue
index 2a23b28..1b9bf2a 100644
--- a/src/views/rental/Detail.vue
+++ b/src/views/rental/Detail.vue
@@ -16,7 +16,7 @@
         </div>
       </template>
       <div v-loading="isLoading" class="room-info-section">
-        <h2>{{ room.apartmentName }} - {{ room.roomNumber }}</h2>
+        <h2>{{ room.Apartment.name }} - {{ room.roomNumber }}</h2>
         <div class="room-basic-info">
           <div class="info-item">
             <span class="label">面积:</span>
@@ -43,7 +43,7 @@
           </div>
         </div>
       </div>
-      
+
       <el-tabs v-model="activeTab">
         <el-tab-pane label="租赁档案" name="rental">
           <el-table :data="rentalHistory" style="width: 100%">
@@ -121,7 +121,7 @@
         </el-tab-pane>
 
       </el-tabs>
-      
+
       <!-- 水费编辑对话框 -->
       <el-dialog title="编辑水费" :visible.sync="waterBillDialogVisible" width="500px">
         <el-form :model="waterBillForm" :rules="waterBillRules" ref="waterBillForm">
@@ -152,9 +152,9 @@
           <el-button type="primary" @click="handleSaveWaterBill">保存</el-button>
         </span>
       </el-dialog>
-      
 
-      
+
+
       <!-- 租赁编辑对话框 -->
       <el-dialog :title="rentalForm.id ? '编辑租赁记录' : '新增租赁记录'" :visible.sync="rentalDialogVisible" width="500px">
         <el-form :model="rentalForm" :rules="rentalRules" ref="rentalForm">
@@ -199,7 +199,7 @@
 </template>
 
 <script>
-import { roomApi, rentalApi, apartmentApi, waterBillApi } from '../../api/api'
+import { roomApi, rentalApi, waterBillApi } from '../../api/api'
 
 export default {
   name: 'RentalDetail',
@@ -207,7 +207,6 @@ export default {
     return {
       room: {},
       rentals: [],
-      apartments: [],
       rentalHistory: [],
       waterBills: [],
       isLoading: false,
@@ -284,24 +283,14 @@ export default {
       this.isLoading = true
       try {
         const roomId = this.$route.params.id
-        
+
         // 加载房间数据
         const roomResponse = await roomApi.getById(roomId)
         this.room = roomResponse
-        
-        // 加载公寓数据
-        const apartmentsResponse = await apartmentApi.getAll()
-        this.apartments = apartmentsResponse.data || apartmentsResponse
-        
-        // 添加公寓名称
-        if (this.room.apartmentId) {
-          const apartment = this.apartments.find(a => a.id == this.room.apartmentId)
-          this.room.apartmentName = apartment ? apartment.name : ''
-        }
-        
+
         // 加载租赁历史
         await this.loadRentalHistory()
-        
+
         // 如果当前激活的是水费tab，加载水费数据
         if (this.activeTab === 'water') {
           await this.loadWaterBills()
@@ -322,10 +311,10 @@ export default {
           page: this.waterCurrentPage,
           pageSize: this.waterPageSize
         })
-        
+
         // 处理返回数据
         this.waterBills = response.data || response
-        
+
         // 设置总数
         this.waterTotal = response.total || 0
       } catch (error) {
@@ -344,7 +333,7 @@ export default {
           page: this.currentPage,
           pageSize: this.pageSize
         })
-        
+
         // 处理返回数据
         const data = response.data || response
         this.rentalHistory = data.map(rental => {
@@ -353,7 +342,7 @@ export default {
             tenantName: rental.Tenant ? rental.Tenant.name : ''
           }
         })
-        
+
         // 设置总数
         this.total = response.total || 0
       } catch (error) {
@@ -451,14 +440,14 @@ export default {
           // 找到当前房间的租房记录
           const roomId = this.$route.params.id
           const rental = this.rentals.find(r => r.roomId == roomId && r.status === 'active')
-          
+
           if (rental) {
             // 更新租房记录状态
             await rentalApi.update(rental.id, { status: 'expired' })
-            
+
             // 更新房间状态
             await roomApi.update(roomId, { status: 'empty' })
-            
+
             this.$message.success('退房成功')
             this.loadData()
           } else {
@@ -597,15 +586,15 @@ export default {
       // 计算新的开始日期和结束日期
       const oldEndDate = new Date(rental.endDate)
       const newStartDate = new Date(oldEndDate)
-      
+
       // 计算租赁时长（月）
       const oldStartDate = new Date(rental.startDate)
       const monthsDiff = (oldEndDate.getFullYear() - oldStartDate.getFullYear()) * 12 + (oldEndDate.getMonth() - oldStartDate.getMonth())
-      
+
       // 计算新的结束日期
       const newEndDate = new Date(newStartDate)
       newEndDate.setMonth(newEndDate.getMonth() + monthsDiff)
-      
+
       // 预填表单，保持租客信息不变，清空ID
       this.rentalForm = {
         id: '',
@@ -750,4 +739,4 @@ export default {
   display: flex;
   gap: 10px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rental/Edit.vue b/src/views/rental/Edit.vue
index ebb51b5..8dc3c69 100644
--- a/src/views/rental/Edit.vue
+++ b/src/views/rental/Edit.vue
@@ -108,10 +108,10 @@ export default {
   methods: {
     async loadData() {
       try {
-        // 并行加载房间和公寓数据
+        // 并行加载房间和公寓数据（使用list接口）
         const [roomsResponse, apartmentsResponse] = await Promise.all([
-          roomApi.getAll(),
-          apartmentApi.getAll()
+          roomApi.list(),
+          apartmentApi.list()
         ])
         
         this.rooms = roomsResponse
diff --git a/src/views/room/Add.vue b/src/views/room/Add.vue
index 52a0c4a..bdd48fe 100644
--- a/src/views/room/Add.vue
+++ b/src/views/room/Add.vue
@@ -127,8 +127,8 @@ export default {
   methods: {
     async loadApartments() {
       try {
-        const response = await apartmentApi.getAll()
-        this.apartments = response.data || response
+        const response = await apartmentApi.list()
+        this.apartments = response
       } catch (error) {
         this.$message.error('加载公寓数据失败')
       }
diff --git a/src/views/room/Edit.vue b/src/views/room/Edit.vue
index c854281..fc876bf 100644
--- a/src/views/room/Edit.vue
+++ b/src/views/room/Edit.vue
@@ -133,8 +133,8 @@ export default {
   methods: {
     async loadApartments() {
       try {
-        const response = await apartmentApi.getAll()
-        this.apartments = response.data || response
+        const response = await apartmentApi.list()
+        this.apartments = response
       } catch (error) {
         this.$message.error('加载公寓数据失败')
       }