From 0b0e0aabd1d35bab82d18393def140c9f8198e5e Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Mon, 7 Jul 2025 18:44:46 +0800
Subject: [PATCH] 费用详情页面开发完成

---
 src/api/fee/feeDetailConfigApi.js        |   6 ++----
 src/components/fee/FeeDetailFeeObj.vue   |   4 ++++
 src/components/fee/feeDetailConfig.vue   |  28 ++++++++++++++--------------
 src/components/fee/feeDetailDiscount.vue |   3 ++-
 src/components/fee/feeDetailHis.vue      |  69 +++++++++++++++++++--------------------------------------------------
 src/components/fee/feeDetailImport.vue   |   3 ++-
 src/components/fee/feeDetailMeter.vue    |   3 ++-
 src/components/fee/feeDetailOwner.vue    | 145 ++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------
 src/components/fee/feeDetailReceipt.vue  | 132 +++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------
 src/components/oa/newOaWorkflowPool.vue  |   3 ++-
 src/views/fee/feeDetail.vue              |   2 +-
 src/views/fee/feeDetailLang.js           |   4 ++--
 12 files changed, 129 insertions(+), 273 deletions(-)

diff --git a/src/api/fee/feeDetailConfigApi.js b/src/api/fee/feeDetailConfigApi.js
index 42ca7f8..8f9b7c2 100644
--- a/src/api/fee/feeDetailConfigApi.js
+++ b/src/api/fee/feeDetailConfigApi.js
@@ -12,11 +12,9 @@ export function listFeeConfigs(params) {
       }
     }).then(response => {
       const res = response.data
-      if (res.code == 0) {
+
         resolve(res)
-      } else {
-        reject(new Error(res.msg || 'Failed to list fee configs'))
-      }
+
     }).catch(error => {
       reject(error)
     })
diff --git a/src/components/fee/FeeDetailFeeObj.vue b/src/components/fee/FeeDetailFeeObj.vue
index a0e1cf4..446b5ab 100644
--- a/src/components/fee/FeeDetailFeeObj.vue
+++ b/src/components/fee/FeeDetailFeeObj.vue
@@ -53,6 +53,10 @@ export default {
     }
   },
   methods: {
+    open(params) {
+      this.configId = params.configId
+      this.loadData()
+    },
     switchTab(params) {
       this.configId = params.configId
       this.loadData()
diff --git a/src/components/fee/feeDetailConfig.vue b/src/components/fee/feeDetailConfig.vue
index 96e4cd0..48fc455 100644
--- a/src/components/fee/feeDetailConfig.vue
+++ b/src/components/fee/feeDetailConfig.vue
@@ -5,29 +5,33 @@
         <el-table-column prop="feeTypeCdName" :label="$t('feeDetailConfig.feeType')" align="center"></el-table-column>
         <el-table-column prop="feeName" :label="$t('feeDetailConfig.feeItem')" align="center"></el-table-column>
         <el-table-column prop="feeFlagName" :label="$t('feeDetailConfig.feeFlag')" align="center"></el-table-column>
-        <el-table-column prop="billTypeName" :label="$t('feeDetailConfig.reminderType')" align="center"></el-table-column>
+        <el-table-column prop="billTypeName" :label="$t('feeDetailConfig.reminderType')"
+          align="center"></el-table-column>
         <el-table-column :label="$t('feeDetailConfig.paymentType')" align="center">
           <template slot-scope="scope">
-            {{scope.row.paymentCd == '1200' ? $t('feeDetailConfig.prepaid') : $t('feeDetailConfig.postpaid')}}
+            {{ scope.row.paymentCd == '1200' ? $t('feeDetailConfig.prepaid') : $t('feeDetailConfig.postpaid') }}
           </template>
         </el-table-column>
-        <el-table-column prop="paymentCycle" :label="$t('feeDetailConfig.paymentCycle')" align="center"></el-table-column>
+        <el-table-column prop="paymentCycle" :label="$t('feeDetailConfig.paymentCycle')"
+          align="center"></el-table-column>
         <el-table-column prop="units" :label="$t('feeDetailConfig.unit')" align="center"></el-table-column>
-        <el-table-column prop="computingFormulaName" :label="$t('feeDetailConfig.formula')" align="center"></el-table-column>
+        <el-table-column prop="computingFormulaName" :label="$t('feeDetailConfig.formula')"
+          align="center"></el-table-column>
         <el-table-column :label="$t('feeDetailConfig.unitPrice')" align="center">
           <template slot-scope="scope">
-            {{scope.row.computingFormula == '2002' ? '-' : scope.row.squarePrice}}
+            {{ scope.row.computingFormula == '2002' ? '-' : scope.row.squarePrice }}
           </template>
         </el-table-column>
-        <el-table-column prop="additionalAmount" :label="$t('feeDetailConfig.additionalFee')" align="center"></el-table-column>
+        <el-table-column prop="additionalAmount" :label="$t('feeDetailConfig.additionalFee')"
+          align="center"></el-table-column>
         <el-table-column :label="$t('feeDetailConfig.accountDeduction')" align="center">
           <template slot-scope="scope">
-            {{scope.row.deductFrom == 'Y' ? $t('feeDetailConfig.yes') : $t('feeDetailConfig.no')}}
+            {{ scope.row.deductFrom == 'Y' ? $t('feeDetailConfig.yes') : $t('feeDetailConfig.no') }}
           </template>
         </el-table-column>
         <el-table-column :label="$t('feeDetailConfig.mobilePayment')" align="center">
           <template slot-scope="scope">
-            {{scope.row.payOnline == 'Y' ? $t('feeDetailConfig.yes') : $t('feeDetailConfig.no')}}
+            {{ scope.row.payOnline == 'Y' ? $t('feeDetailConfig.yes') : $t('feeDetailConfig.no') }}
           </template>
         </el-table-column>
         <el-table-column prop="scale" :label="$t('feeDetailConfig.decimalPlaces')" align="center"></el-table-column>
@@ -36,12 +40,8 @@
       <el-row class="margin-top">
         <el-col :span="12"></el-col>
         <el-col :span="12">
-          <el-pagination
-            @current-change="handleCurrentChange"
-            :current-page="pagination.currentPage"
-            :page-size="pagination.pageSize"
-            layout="total, prev, pager, next"
-            :total="pagination.total">
+          <el-pagination @current-change="handleCurrentChange" :current-page="pagination.currentPage"
+            :page-size="pagination.pageSize" layout="total, prev, pager, next" :total="pagination.total">
           </el-pagination>
         </el-col>
       </el-row>
diff --git a/src/components/fee/feeDetailDiscount.vue b/src/components/fee/feeDetailDiscount.vue
index d38965f..7a38c79 100644
--- a/src/components/fee/feeDetailDiscount.vue
+++ b/src/components/fee/feeDetailDiscount.vue
@@ -104,6 +104,7 @@
 
 <script>
 import { queryApplyRoomDiscount } from '@/api/fee/feeDetailDiscountApi'
+import { getCommunityId } from '@/api/community/communityApi' 
 
 export default {
   name: 'FeeDetailDiscount',
@@ -130,7 +131,7 @@ export default {
     async _loadFeeDetailDiscountData(page, row) {
       try {
         const params = {
-          communityId: this.$store.getters.communityId,
+          communityId: getCommunityId(),
           feeId: this.feeDetailDiscountInfo.feeId,
           page,
           row
diff --git a/src/components/fee/feeDetailHis.vue b/src/components/fee/feeDetailHis.vue
index 3f4596d..5ffc0aa 100644
--- a/src/components/fee/feeDetailHis.vue
+++ b/src/components/fee/feeDetailHis.vue
@@ -4,61 +4,29 @@
       <el-col :span="24" class="text-right"></el-col>
     </el-row>
     <div class="margin-top">
-      <el-table
-        :data="feeDetailHisInfo.fees"
-        border
-        style="width: 100%"
-      >
-        <el-table-column
-          prop="feeName"
-          :label="$t('feeDetailHis.feeName')"
-          align="center"
-        >
-          <template #default="{row}">
-            {{row.feeName}}
-            <span v-if="row.payerObjName">({{row.payerObjName}})</span>
+      <el-table :data="feeDetailHisInfo.fees" border style="width: 100%">
+        <el-table-column prop="feeName" :label="$t('feeDetailHis.feeName')" align="center">
+          <template #default="{ row }">
+            {{ row.feeName }}
+            <span v-if="row.payerObjName">({{ row.payerObjName }})</span>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="startTime"
-          :label="$t('feeDetailHis.startTime')"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="endTime"
-          :label="$t('feeDetailHis.endTime')"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          :label="$t('feeDetailHis.operation')"
-          align="center"
-        >
-          <template #default="{row}">
-            {{_getFeeHisOperate(row)}}
+        <el-table-column prop="startTime" :label="$t('feeDetailHis.startTime')" align="center"></el-table-column>
+        <el-table-column prop="endTime" :label="$t('feeDetailHis.endTime')" align="center"></el-table-column>
+        <el-table-column :label="$t('feeDetailHis.operation')" align="center">
+          <template #default="{ row }">
+            {{ _getFeeHisOperate(row) }}
           </template>
         </el-table-column>
-        <el-table-column
-          prop="userName"
-          :label="$t('feeDetailHis.operator')"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="createTime"
-          :label="$t('feeDetailHis.operationTime')"
-          align="center"
-        ></el-table-column>
+        <el-table-column prop="userName" :label="$t('feeDetailHis.operator')" align="center"></el-table-column>
+        <el-table-column prop="createTime" :label="$t('feeDetailHis.operationTime')" align="center"></el-table-column>
       </el-table>
 
       <el-row class="margin-top">
         <el-col :span="4"></el-col>
         <el-col :span="20">
-          <el-pagination
-            @current-change="handleCurrentChange"
-            :current-page="currentPage"
-            :page-size="pageSize"
-            layout="total, prev, pager, next, jumper"
-            :total="total"
-          ></el-pagination>
+          <el-pagination @current-change="handleCurrentChange" :current-page="currentPage" :page-size="pageSize"
+            layout="total, prev, pager, next, jumper" :total="total"></el-pagination>
         </el-col>
       </el-row>
     </div>
@@ -67,6 +35,7 @@
 
 <script>
 import { queryHisFee } from '@/api/fee/feeDetailHisApi'
+import { getCommunityId } from '@/api/community/communityApi'
 
 export default {
   name: 'FeeDetailHis',
@@ -98,7 +67,7 @@ export default {
     async _loadFeeDetailHisData(page, row) {
       try {
         const params = {
-          communityId: this.$store.getters.communityId,
+          communityId: getCommunityId(),
           feeId: this.feeDetailHisInfo.feeId,
           staffNameLike: this.feeDetailHisInfo.staffNameLike,
           feeNameLike: this.feeDetailHisInfo.feeNameLike,
@@ -108,7 +77,7 @@ export default {
           page,
           row
         }
-        
+
         const res = await queryHisFee(params)
         this.feeDetailHisInfo.fees = res.data
         this.total = res.records
@@ -123,13 +92,13 @@ export default {
           feeCount += 1
         }
       })
-      
+
       if (feeCount <= 1) {
         if (fee.operate === 'ADD') return this.$t('feeDetailHis.add')
         if (fee.operate === 'DEL') return this.$t('feeDetailHis.delete')
         return '-'
       }
-      
+
       if (fee.operate === 'ADD') return this.$t('feeDetailHis.modifyNew')
       if (fee.operate === 'DEL') return this.$t('feeDetailHis.modifyOld')
       return '-'
diff --git a/src/components/fee/feeDetailImport.vue b/src/components/fee/feeDetailImport.vue
index dff23d5..1a426da 100644
--- a/src/components/fee/feeDetailImport.vue
+++ b/src/components/fee/feeDetailImport.vue
@@ -77,6 +77,7 @@
 
 <script>
 import { queryImportFeeDetail } from '@/api/fee/feeDetailImportApi'
+import { getCommunityId } from '@/api/community/communityApi' 
 
 export default {
   name: 'FeeDetailImport',
@@ -103,7 +104,7 @@ export default {
     async _loadFeeDetailImportData(page, row) {
       try {
         const params = {
-          communityId: this.$store.getters.communityId,
+          communityId: getCommunityId(),
           feeId: this.feeDetailImportInfo.feeId,
           page,
           row
diff --git a/src/components/fee/feeDetailMeter.vue b/src/components/fee/feeDetailMeter.vue
index e602382..3d6d621 100644
--- a/src/components/fee/feeDetailMeter.vue
+++ b/src/components/fee/feeDetailMeter.vue
@@ -66,6 +66,7 @@
 
 <script>
 import { listMeterWaters } from '@/api/fee/feeDetailMeterApi'
+import { getCommunityId } from '@/api/community/communityApi'   
 
 export default {
   name: 'FeeDetailMeter',
@@ -92,7 +93,7 @@ export default {
     async _loadFeeDetailMeterData(page, row) {
       try {
         const params = {
-          communityId: this.$store.getters.communityId,
+          communityId: getCommunityId(),
           feeId: this.feeDetailMeterInfo.feeId,
           page,
           row
diff --git a/src/components/fee/feeDetailOwner.vue b/src/components/fee/feeDetailOwner.vue
index d9e748a..2c5cc58 100644
--- a/src/components/fee/feeDetailOwner.vue
+++ b/src/components/fee/feeDetailOwner.vue
@@ -1,133 +1,72 @@
 <template>
   <div>
     <div class="margin-top">
-      <el-table
-        :data="feeDetailOwnerInfo.owners"
-        border
-        style="width: 100%"
-      >
-        <el-table-column
-          :label="$t('feeDetailOwner.ownerFace')"
-          align="center"
-        >
-          <template #default="{row}">
-            <el-image
-              style="width: 60px; height: 60px;"
-              class="border-radius"
-              :src="row.url || '/img/noPhoto.jpg'"
-              :preview-src-list="[row.url]"
-              v-if="row.url"
-            ></el-image>
-            <el-image
-              style="width: 60px; height: 60px;"
-              class="border-radius"
-              src="/img/noPhoto.jpg"
-              v-else
-            ></el-image>
+      <el-table :data="feeDetailOwnerInfo.owners" border style="width: 100%">
+        <el-table-column :label="$t('feeDetailOwner.ownerFace')" align="center">
+          <template #default="{ row }">
+            <el-image style="width: 60px; height: 60px;" class="border-radius" :src="row.url || '/img/noPhoto.jpg'"
+              :preview-src-list="[row.url]" v-if="row.url"></el-image>
+            <el-image style="width: 60px; height: 60px;" class="border-radius" src="/img/noPhoto.jpg" v-else></el-image>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="name"
-          :label="$t('feeDetailOwner.name')"
-          align="center"
-        >
-          <template #default="{row}">
-            {{row.name}}({{row.link}})
+        <el-table-column prop="name" :label="$t('feeDetailOwner.name')" align="center">
+          <template #default="{ row }">
+            {{ row.name }}({{ row.link }})
           </template>
         </el-table-column>
-        <el-table-column
-          prop="sex"
-          :label="$t('feeDetailOwner.gender')"
-          align="center"
-        >
-          <template #default="{row}">
-            {{row.sex === 0 ? $t('feeDetailOwner.male') : $t('feeDetailOwner.female')}}
+        <el-table-column prop="sex" :label="$t('feeDetailOwner.gender')" align="center">
+          <template #default="{ row }">
+            {{ row.sex === 0 ? $t('feeDetailOwner.male') : $t('feeDetailOwner.female') }}
           </template>
         </el-table-column>
-        <el-table-column
-          prop="idCard"
-          :label="$t('feeDetailOwner.idCard')"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="address"
-          :label="$t('feeDetailOwner.address')"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="roomCount"
-          :label="$t('feeDetailOwner.roomCount')"
-          align="center"
-        >
-          <template #default="{row}">
+        <el-table-column prop="idCard" :label="$t('feeDetailOwner.idCard')" align="center"></el-table-column>
+        <el-table-column prop="address" :label="$t('feeDetailOwner.address')" align="center"></el-table-column>
+        <el-table-column prop="roomCount" :label="$t('feeDetailOwner.roomCount')" align="center">
+          <template #default="{ row }">
             <el-link type="primary" @click="_viewOwnerRooms(row)">
-              {{row.roomCount || 0}}
+              {{ row.roomCount || 0 }}
             </el-link>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="memberCount"
-          :label="$t('feeDetailOwner.memberCount')"
-          align="center"
-        >
-          <template #default="{row}">
+        <el-table-column prop="memberCount" :label="$t('feeDetailOwner.memberCount')" align="center">
+          <template #default="{ row }">
             <el-link type="primary" @click="_viewOwnerMembers(row)">
-              {{row.memberCount || 0}}
+              {{ row.memberCount || 0 }}
             </el-link>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="carCount"
-          :label="$t('feeDetailOwner.carCount')"
-          align="center"
-        >
-          <template #default="{row}">
+        <el-table-column prop="carCount" :label="$t('feeDetailOwner.carCount')" align="center">
+          <template #default="{ row }">
             <el-link type="primary" @click="_viewOwnerCars(row)">
-              {{row.carCount || 0}}
+              {{ row.carCount || 0 }}
             </el-link>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="complaintCount"
-          :label="$t('feeDetailOwner.complaintCount')"
-          align="center"
-        >
-          <template #default="{row}">
+        <el-table-column prop="complaintCount" :label="$t('feeDetailOwner.complaintCount')" align="center">
+          <template #default="{ row }">
             <el-link type="primary" @click="_viewComplaints(row)">
-              {{row.complaintCount || 0}}
+              {{ row.complaintCount || 0 }}
             </el-link>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="repairCount"
-          :label="$t('feeDetailOwner.repairCount')"
-          align="center"
-        >
-          <template #default="{row}">
+        <el-table-column prop="repairCount" :label="$t('feeDetailOwner.repairCount')" align="center">
+          <template #default="{ row }">
             <el-link type="primary" @click="_viewRepairs(row)">
-              {{row.repairCount || 0}}
+              {{ row.repairCount || 0 }}
             </el-link>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="oweFee"
-          :label="$t('feeDetailOwner.oweFee')"
-          align="center"
-        >
-          <template #default="{row}">
+        <el-table-column prop="oweFee" :label="$t('feeDetailOwner.oweFee')" align="center">
+          <template #default="{ row }">
             <el-link type="primary" @click="_viewOweFees(row)">
-              {{row.oweFee || '0.00'}}
+              {{ row.oweFee || '0.00' }}
             </el-link>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="contractCount"
-          :label="$t('feeDetailOwner.contractCount')"
-          align="center"
-        >
-          <template #default="{row}">
+        <el-table-column prop="contractCount" :label="$t('feeDetailOwner.contractCount')" align="center">
+          <template #default="{ row }">
             <el-link type="primary" @click="_viewRoomContracts(row)">
-              {{row.contractCount || 0}}
+              {{ row.contractCount || 0 }}
             </el-link>
           </template>
         </el-table-column>
@@ -136,13 +75,8 @@
       <el-row class="margin-top">
         <el-col :span="4"></el-col>
         <el-col :span="20">
-          <el-pagination
-            @current-change="handleCurrentChange"
-            :current-page="currentPage"
-            :page-size="pageSize"
-            layout="total, prev, pager, next, jumper"
-            :total="total"
-          ></el-pagination>
+          <el-pagination @current-change="handleCurrentChange" :current-page="currentPage" :page-size="pageSize"
+            layout="total, prev, pager, next, jumper" :total="total"></el-pagination>
         </el-col>
       </el-row>
     </div>
@@ -166,6 +100,7 @@ import OwnerComplaints from '@/components/owner/ownerComplaints'
 import OwnerRepairs from '@/components/owner/ownerRepairs'
 import OwnerOweFees from '@/components/owner/ownerOweFees'
 import RoomContracts from '@/components/room/roomContracts'
+import { getCommunityId } from '@/api/community/communityApi'
 
 export default {
   name: 'FeeDetailOwner',
@@ -203,12 +138,12 @@ export default {
       try {
         const params = {
           ownerId: this.feeDetailOwnerInfo.ownerId,
-          communityId: this.$store.getters.communityId,
+          communityId: getCommunityId(),
           ownerTypeCd: '1001',
           page,
           row
         }
-        
+
         const res = await queryOwners(params)
         this.feeDetailOwnerInfo.owners = res.data
         this.total = res.records
diff --git a/src/components/fee/feeDetailReceipt.vue b/src/components/fee/feeDetailReceipt.vue
index 8aa9fce..f1da79d 100644
--- a/src/components/fee/feeDetailReceipt.vue
+++ b/src/components/fee/feeDetailReceipt.vue
@@ -1,103 +1,48 @@
 <template>
   <div>
-    <el-row class="margin-top-lg">
-      <el-col :span="12"></el-col>
-      <el-col :span="12" class="text-right">
-        <el-button
-          type="primary"
-          size="small"
-          @click="_printFeeReceipt"
-        >{{ $t('feeDetailReceipt.print') }}</el-button>
-        <el-button
-          type="primary"
-          size="small"
-          @click="_printFeeSmallReceipt"
-        >{{ $t('feeDetailReceipt.printSmall') }}</el-button>
-        <el-button
-          type="primary"
-          size="small"
-          @click="_printApplyFeeReceipt"
-        >{{ $t('feeDetailReceipt.printApply') }}</el-button>
-      </el-col>
-    </el-row>
-    
+    <div class="flex justify-between">
+      <div ></div>
+      <div  class="text-right">
+        <el-button type="primary" size="small" @click="_printFeeReceipt">{{ $t('feeDetailReceipt.print') }}</el-button>
+        <el-button type="primary" size="small" @click="_printFeeSmallReceipt">{{ $t('feeDetailReceipt.printSmall')
+          }}</el-button>
+        <el-button type="primary" size="small" @click="_printApplyFeeReceipt">{{ $t('feeDetailReceipt.printApply')
+          }}</el-button>
+      </div>
+    </div>
+
     <div class="margin-top">
-      <el-table
-        :data="feeDetailReceiptInfo.feeReceipts"
-        border
-        style="width: 100%"
-      >
-        <el-table-column
-          width="60"
-          align="center"
-        >
+      <el-table :data="feeDetailReceiptInfo.feeReceipts" border style="width: 100%">
+        <el-table-column width="60" align="center">
           <template #header>
-            <el-checkbox
-              v-model="feeDetailReceiptInfo.quan"
-              @change="checkAllReceipt"
-            ></el-checkbox>
+            <el-checkbox v-model="feeDetailReceiptInfo.quan" @change="checkAllReceipt"></el-checkbox>
           </template>
-          <template #default="{row}">
-            <el-checkbox
-              v-model="feeDetailReceiptInfo.selectReceipts"
-              :label="row.receiptId"
-            ></el-checkbox>
+          <template #default="{ row }">
+            <el-checkbox v-model="feeDetailReceiptInfo.selectReceipts" :label="row.receiptId"></el-checkbox>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="objName"
-          :label="$t('feeDetailReceipt.feeType')"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="payObjName"
-          :label="$t('feeDetailReceipt.owner')"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="feeName"
-          :label="$t('feeDetailReceipt.feeItem')"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          :label="$t('feeDetailReceipt.feePeriod')"
-          align="center"
-        >
-          <template #default="{row}">
-            {{$dayjs(row.startTime).format('YYYY-MM-DD')}}~<br/>
-            {{$dayjs(row.endTime).format('YYYY-MM-DD')}}
+        <el-table-column prop="objName" :label="$t('feeDetailReceipt.feeType')" align="center"></el-table-column>
+        <el-table-column prop="payObjName" :label="$t('feeDetailReceipt.owner')" align="center"></el-table-column>
+        <el-table-column prop="feeName" :label="$t('feeDetailReceipt.feeItem')" align="center"></el-table-column>
+        <el-table-column :label="$t('feeDetailReceipt.feePeriod')" align="center">
+          <template #default="{ row }">
+            {{ $dayjs(row.startTime).format('YYYY-MM-DD') }}~<br />
+            {{ $dayjs(row.endTime).format('YYYY-MM-DD') }}
           </template>
         </el-table-column>
-        <el-table-column
-          prop="amount"
-          :label="$t('feeDetailReceipt.totalAmount')"
-          align="center"
-        >
-          <template #default="{row}">
-            {{row.amount}}{{$t('feeDetailReceipt.yuan')}}
+        <el-table-column prop="amount" :label="$t('feeDetailReceipt.totalAmount')" align="center">
+          <template #default="{ row }">
+            {{ row.amount }}{{ $t('feeDetailReceipt.yuan') }}
           </template>
         </el-table-column>
-        <el-table-column
-          prop="createTime"
-          :label="$t('feeDetailReceipt.paymentTime')"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="receiptId"
-          :label="$t('feeDetailReceipt.receiptId')"
-          align="center"
-        ></el-table-column>
+        <el-table-column prop="createTime" :label="$t('feeDetailReceipt.paymentTime')" align="center"></el-table-column>
+        <el-table-column prop="receiptId" :label="$t('feeDetailReceipt.receiptId')" align="center"></el-table-column>
       </el-table>
 
       <el-row class="margin-top">
         <el-col :span="24" class="float-right">
-          <el-pagination
-            @current-change="handleCurrentChange"
-            :current-page="currentPage"
-            :page-size="pageSize"
-            layout="total, prev, pager, next, jumper"
-            :total="total"
-          ></el-pagination>
+          <el-pagination @current-change="handleCurrentChange" :current-page="currentPage" :page-size="pageSize"
+            layout="total, prev, pager, next, jumper" :total="total"></el-pagination>
         </el-col>
       </el-row>
     </div>
@@ -106,6 +51,7 @@
 
 <script>
 import { queryFeeReceipt, listFeePrintPage } from '@/api/fee/feeDetailReceiptApi'
+import { getCommunityId } from '@/api/community/communityApi'
 
 export default {
   name: 'FeeDetailReceipt',
@@ -147,14 +93,14 @@ export default {
       try {
         this.feeDetailReceiptInfo.selectReceipts = []
         this.feeDetailReceiptInfo.quan = false
-        
+
         const params = {
           page,
           row: rows,
           feeId: this.feeDetailReceiptInfo.feeId,
-          communityId: this.$store.getters.communityId
+          communityId: getCommunityId()
         }
-        
+
         const res = await queryFeeReceipt(params)
         this.feeDetailReceiptInfo.total = res.total
         this.feeDetailReceiptInfo.records = res.records
@@ -168,7 +114,7 @@ export default {
         this.$message.warning(this.$t('feeDetailReceipt.selectPrintReceipt'))
         return
       }
-      
+
       const receiptIds = this.feeDetailReceiptInfo.selectReceipts.join(',')
       window.open(`${this.feeDetailReceiptInfo.printUrl}?receiptIds=${receiptIds}&apply=N`)
     },
@@ -177,7 +123,7 @@ export default {
         this.$message.warning(this.$t('feeDetailReceipt.selectPrintApply'))
         return
       }
-      
+
       const receiptIds = this.feeDetailReceiptInfo.selectReceipts.join(',')
       window.open(`/print.html#/pages/property/printPayFee?receiptIds=${receiptIds}&apply=Y`)
     },
@@ -186,7 +132,7 @@ export default {
         this.$message.warning(this.$t('feeDetailReceipt.selectPrintReceipt'))
         return
       }
-      
+
       const receiptIds = this.feeDetailReceiptInfo.selectReceipts.join(',')
       window.open(`/smallPrint.html#/pages/property/printSmallPayFee?receiptIds=${receiptIds}`)
     },
@@ -203,9 +149,9 @@ export default {
           page: 1,
           row: 1,
           state: 'T',
-          communityId: this.$store.getters.communityId
+          communityId: getCommunityId()
         }
-        
+
         const res = await listFeePrintPage(params)
         if (res.data && res.data.length > 0) {
           this.feeDetailReceiptInfo.printUrl = res.data[0].url
diff --git a/src/components/oa/newOaWorkflowPool.vue b/src/components/oa/newOaWorkflowPool.vue
index f6473c6..4a5bc08 100644
--- a/src/components/oa/newOaWorkflowPool.vue
+++ b/src/components/oa/newOaWorkflowPool.vue
@@ -71,6 +71,7 @@
 <script>
 import { queryOaWorkflowForm, queryOaWorkflowFormData } from '@/api/oa/newOaWorkflowApi'
 import ViewImage from '@/components/system/viewImage'
+import { getCommunityId } from '@/api/community/communityApi'
 
 export default {
   name: 'NewOaWorkflowPool',
@@ -155,7 +156,7 @@ export default {
     async openNewOaWorkflowPoolImg(pool) {
       try {
         const res = await this.$api.workflow.listRunWorkflowImage({
-          communityId: this.$store.getters.communityId,
+          communityId: getCommunityId(),
           businessKey: pool.id
         })
         if (res.code !== '0') {
diff --git a/src/views/fee/feeDetail.vue b/src/views/fee/feeDetail.vue
index b84c85d..fc39135 100644
--- a/src/views/fee/feeDetail.vue
+++ b/src/views/fee/feeDetail.vue
@@ -50,7 +50,7 @@
               <el-col :span="6">
                 <div class="form-group">
                   <label class="col-form-label">
-                    {{ $t('feeDetail.feeItem') }}
+                    {{ $t('feeDetail.feeItem') }}：
                   </label>
                   <label>{{ feeDetailInfo.feeName }}</label>
                 </div>
diff --git a/src/views/fee/feeDetailLang.js b/src/views/fee/feeDetailLang.js
index 73f09e2..42d8fb4 100644
--- a/src/views/fee/feeDetailLang.js
+++ b/src/views/fee/feeDetailLang.js
@@ -5,7 +5,7 @@ export const messages = {
       title: 'Fee Information',
       feeId: 'Fee ID:',
       feeFlag: 'Fee Flag:',
-      feeType: 'Fee Type:',
+      feeType: 'Fee Type',
       payerObj: 'Payer:',
       feeItem: 'Fee Item:',
       feeStatus: 'Fee Status:',
@@ -252,7 +252,7 @@ export const messages = {
       feeFlag: '费用标识：',
       feeType: '费用类型：',
       payerObj: '付费对象：',
-      feeItem: '费用项：',
+      feeItem: '费用项',
       feeStatus: '费用状态：',
       createTime: '建账时间：',
       batchId: '批次：',
--
libgit2 0.21.4