v1.9 优化业主详情房屋费用不显示bug

wuxw
1 parent d05a0ef2
Showing 6 changed files with 42 additions and 17 deletions
src/api/owner/ownerDetailHisFeeApi.js
src/api/owner/ownerDetailRoomFeeApi.js
src/components/owner/ownerDetailHis.vue
src/components/owner/ownerDetailHisFee.vue
src/components/owner/ownerDetailRoomFee.vue
src/views/owner/ownerDetail.vue
@@ -8,11 +8,7 @@ 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)
     })
+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)
+    })
+  })
+}
 \ No newline at end of file
@@ -106,9 +106,9 @@ export default {
       queryHisOwner(params)
         .then(response => {
           const data = response.data
-          this.ownerDetailHisInfo.owners = data.data
-          this.dealOwnerAttr(data.data)
-          this.pagination.total = data.records
+          this.ownerDetailHisInfo.owners = data
+          this.dealOwnerAttr(data)
+          this.pagination.total = response.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.forEach(item => {
+        data.data.forEach(item => {
           if (item.listShow === 'Y') {
             this.ownerDetailHisInfo.listColumns.push(item.specName)
           }
@@ -96,8 +96,8 @@ export default {
       }
       queryFeeDetail(param).then(response => {
-        this.ownerDetailHisFeeInfo.feeDetails = response.data.feeDetails
-        this.total = response.data.total
+        this.ownerDetailHisFeeInfo.feeDetails = response.feeDetails
+        this.total = response.total
       }).catch(error => {
         console.error('请求失败:', error)
       })
 <template>
-  <div class="margin-top">
+  <div class="">
     <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">
+    <div class="margin-top-sm">
       <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,8 +117,10 @@
 </template>
 <script>
-import { listFee, listRoomsByOwner } from '@/api/owner/ownerDetailRoomFeeApi'
+import { listRoomsByOwner } from '@/api/owner/ownerDetailRoomFeeApi'
+import {listFee} from '@/api/fee/feeApi'
 import { getCommunityId } from '@/api/community/communityApi'
+import {dateFormat} from '@/utils/dateUtil'
 export default {
   name: 'OwnerDetailRoomFee',
@@ -178,6 +180,8 @@ 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)
@@ -253,13 +257,13 @@ export default {
       if (fee.state == '2009001') {
         return "-"
       }
-      return this.$options.filters.dateFormat(fee.deadlineTime)
+      return dateFormat(fee.deadlineTime)
     },
     _getRoomEndTime(fee) {
       if (fee.state == '2009001') {
         return "-"
       }
-      return this.$options.filters.dateFormat(fee.endTime)
+      return dateFormat(fee.endTime)
     },
     _chanagePayerObjId() {
       this._loadOwnerDetailRoomFeeData(1, this.pagination.pageSize)
@@ -270,6 +270,15 @@ 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,