src/api/owner/ownerDetailHisFeeApi.js

@@ -8,7 +8,11 @@ export function queryFeeDetail(params) {
       params
     }).then(response => {
       const res = response.data
+      if (res.code === 0) {
         resolve(res)
+      } else {
+        reject(new Error(res.msg || '获取费用明细失败'))
+      }
     }).catch(error => {
       reject(error)
     })

src/api/owner/ownerDetailRoomFeeApi.js

@@ -1,16 +0,0 @@
-import request from '@/utils/request'
-
-export function listRoomsByOwner(params) {
-  return new Promise((resolve, reject) => {
-    request({
-      url: '/room.queryRoomsByOwner',
-      method: 'get',
-      params
-    }).then(response => {
-      const res = response.data
-        resolve(res)
-    }).catch(error => {
-      reject(error)
-    })
-  })
-}

src/components/owner/ownerDetailHis.vue

@@ -106,9 +106,9 @@ export default {
       queryHisOwner(params)
         .then(response => {
           const data = response.data
-          this.ownerDetailHisInfo.owners = data
-          this.dealOwnerAttr(data)
-          this.pagination.total = response.records
+          this.ownerDetailHisInfo.owners = data.data
+          this.dealOwnerAttr(data.data)
+          this.pagination.total = data.records
           this.pagination.currentPage = page
         })
         .catch(error => {
@@ -149,7 +149,7 @@ export default {
       this.ownerDetailHisInfo.listColumns = []
       getAttrSpecList({specCd:'building_owner_attr',page:1,row:10}).then(data => {
         this.ownerDetailHisInfo.listColumns = []
-        data.data.forEach(item => {
+        data.forEach(item => {
           if (item.listShow === 'Y') {
             this.ownerDetailHisInfo.listColumns.push(item.specName)
           }

src/components/owner/ownerDetailHisFee.vue

@@ -96,8 +96,8 @@ export default {
       }
 
       queryFeeDetail(param).then(response => {
-        this.ownerDetailHisFeeInfo.feeDetails = response.feeDetails
-        this.total = response.total
+        this.ownerDetailHisFeeInfo.feeDetails = response.data.feeDetails
+        this.total = response.data.total
       }).catch(error => {
         console.error('请求失败:', error)
       })

src/components/owner/ownerDetailRoomFee.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="">
+  <div class="margin-top">
     <div class="flex justify-end">
       <div  class="padding-right-xs padding-left-xl">
         <span class="margin-right" v-for="(item, index) in ownerDetailRoomFeeInfo.payObjs" :key="index">
@@ -20,7 +20,7 @@
         
       </div>
     </div>
-    <div class="margin-top-sm">
+    <div class="margin-top">
       <el-table :data="ownerDetailRoomFeeInfo.fees" style="width: 100%">
         <el-table-column prop="payerObjName" :label="$t('aOwnerDetailRoomFee.room')" align="center"></el-table-column>
         <el-table-column prop="feeName" :label="$t('aOwnerDetailRoomFee.feeItem')" align="center"></el-table-column>
@@ -67,7 +67,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="stateName" :label="$t('aOwnerDetailRoomFee.status')" align="center"></el-table-column>
-        <!-- <el-table-column :label="$t('common.operation')" align="center" width="300">
+        <el-table-column :label="$t('common.operation')" align="center" width="300">
           <template slot-scope="scope">
             <el-button-group>
               <el-button type="text" size="mini"
@@ -94,7 +94,7 @@
               </el-button>
             </el-button-group>
           </template>
-        </el-table-column> -->
+        </el-table-column>
       </el-table>
       <el-row>
         <el-col :span="12">
@@ -117,10 +117,8 @@
 </template>
 
 <script>
-import { listRoomsByOwner } from '@/api/owner/ownerDetailRoomFeeApi'
-import {listFee} from '@/api/fee/feeApi'
+import { listFee, listRoomsByOwner } from '@/api/owner/ownerDetailRoomFeeApi'
 import { getCommunityId } from '@/api/community/communityApi'
-import {dateFormat} from '@/utils/dateUtil'
 
 export default {
   name: 'OwnerDetailRoomFee',
@@ -180,8 +178,6 @@ export default {
 
       this.ownerDetailRoomFeeInfo.payerObjIds = []
       listRoomsByOwner(params).then(response => {
-        console.log('params',response)
-
         this.ownerDetailRoomFeeInfo.payObjs = response.rooms
         response.rooms.forEach(room => {
           this.ownerDetailRoomFeeInfo.payerObjIds.push(room.roomId)
@@ -257,13 +253,13 @@ export default {
       if (fee.state == '2009001') {
         return "-"
       }
-      return dateFormat(fee.deadlineTime)
+      return this.$options.filters.dateFormat(fee.deadlineTime)
     },
     _getRoomEndTime(fee) {
       if (fee.state == '2009001') {
         return "-"
       }
-      return dateFormat(fee.endTime)
+      return this.$options.filters.dateFormat(fee.endTime)
     },
     _chanagePayerObjId() {
       this._loadOwnerDetailRoomFeeData(1, this.pagination.pageSize)

src/components/report/commonReportTable.vue

@@ -7,12 +7,8 @@
         </div>
         <el-row :gutter="20">
           <el-col v-for="(conditionItem, conditionIndex) in item.conditions" :key="conditionIndex" :span="6">
-              <div class="el-input">
-                <input class="el-input__inner"
-                  v-model.trim="conditionItem.value"
-                  :type="conditionItem.type"
-                  :placeholder="conditionItem.holdpace" />
-              </div>
+              <el-input v-model.trim="conditionItem.value" :type="conditionItem.type"
+                :placeholder="conditionItem.holdpace" clearable />
           </el-col>
           <el-col :span="6">
             <el-button type="primary" @click="_queryReportTableMethod(item)">
@@ -161,12 +157,6 @@ export default {
         }
         const { data } = await listReportCustomComponentCondition(params)
         component.conditions = data
-        // 确保每个条件项都包含响应式的 value 字段，避免 v-model 绑定后不显示
-        component.conditions.forEach(cond => {
-          if (!Object.prototype.hasOwnProperty.call(cond, 'value')) {
-            this.$set(cond, 'value', '')
-          }
-        })
       } catch (error) {
         console.error('Failed to load conditions:', error)
       }

src/views/owner/ownerDetail.vue

@@ -270,15 +270,6 @@ export default {
       this.ownerDetailInfo._currentTab = tab || tab
       setTimeout(() => {
         if (this.$refs.currentTabComponent) {
-          if (this.ownerDetailInfo._currentTab == 'ownerDetailRoomFee') {
-            this.$refs.currentTabComponent.open({
-              ownerId:this.ownerDetailInfo.ownerId,
-              name:this.ownerDetailInfo.name,
-              link:this.ownerDetailInfo.link
-            }
-            )
-            return;
-          }
           this.$refs.currentTabComponent.open(
             this.ownerDetailInfo.ownerId,
             this.ownerDetailInfo.name,