Commit 0b0e0aabd1d35bab82d18393def140c9f8198e5e

Authored by wuxw
1 parent f80ea09a

费用详情页面开发完成

src/api/fee/feeDetailConfigApi.js
@@ -12,11 +12,9 @@ export function listFeeConfigs(params) { @@ -12,11 +12,9 @@ export function listFeeConfigs(params) {
12 } 12 }
13 }).then(response => { 13 }).then(response => {
14 const res = response.data 14 const res = response.data
15 - if (res.code == 0) { 15 +
16 resolve(res) 16 resolve(res)
17 - } else {  
18 - reject(new Error(res.msg || 'Failed to list fee configs'))  
19 - } 17 +
20 }).catch(error => { 18 }).catch(error => {
21 reject(error) 19 reject(error)
22 }) 20 })
src/components/fee/FeeDetailFeeObj.vue
@@ -53,6 +53,10 @@ export default { @@ -53,6 +53,10 @@ export default {
53 } 53 }
54 }, 54 },
55 methods: { 55 methods: {
  56 + open(params) {
  57 + this.configId = params.configId
  58 + this.loadData()
  59 + },
56 switchTab(params) { 60 switchTab(params) {
57 this.configId = params.configId 61 this.configId = params.configId
58 this.loadData() 62 this.loadData()
src/components/fee/feeDetailConfig.vue
@@ -5,29 +5,33 @@ @@ -5,29 +5,33 @@
5 <el-table-column prop="feeTypeCdName" :label="$t('feeDetailConfig.feeType')" align="center"></el-table-column> 5 <el-table-column prop="feeTypeCdName" :label="$t('feeDetailConfig.feeType')" align="center"></el-table-column>
6 <el-table-column prop="feeName" :label="$t('feeDetailConfig.feeItem')" align="center"></el-table-column> 6 <el-table-column prop="feeName" :label="$t('feeDetailConfig.feeItem')" align="center"></el-table-column>
7 <el-table-column prop="feeFlagName" :label="$t('feeDetailConfig.feeFlag')" align="center"></el-table-column> 7 <el-table-column prop="feeFlagName" :label="$t('feeDetailConfig.feeFlag')" align="center"></el-table-column>
8 - <el-table-column prop="billTypeName" :label="$t('feeDetailConfig.reminderType')" align="center"></el-table-column> 8 + <el-table-column prop="billTypeName" :label="$t('feeDetailConfig.reminderType')"
  9 + align="center"></el-table-column>
9 <el-table-column :label="$t('feeDetailConfig.paymentType')" align="center"> 10 <el-table-column :label="$t('feeDetailConfig.paymentType')" align="center">
10 <template slot-scope="scope"> 11 <template slot-scope="scope">
11 - {{scope.row.paymentCd == '1200' ? $t('feeDetailConfig.prepaid') : $t('feeDetailConfig.postpaid')}} 12 + {{ scope.row.paymentCd == '1200' ? $t('feeDetailConfig.prepaid') : $t('feeDetailConfig.postpaid') }}
12 </template> 13 </template>
13 </el-table-column> 14 </el-table-column>
14 - <el-table-column prop="paymentCycle" :label="$t('feeDetailConfig.paymentCycle')" align="center"></el-table-column> 15 + <el-table-column prop="paymentCycle" :label="$t('feeDetailConfig.paymentCycle')"
  16 + align="center"></el-table-column>
15 <el-table-column prop="units" :label="$t('feeDetailConfig.unit')" align="center"></el-table-column> 17 <el-table-column prop="units" :label="$t('feeDetailConfig.unit')" align="center"></el-table-column>
16 - <el-table-column prop="computingFormulaName" :label="$t('feeDetailConfig.formula')" align="center"></el-table-column> 18 + <el-table-column prop="computingFormulaName" :label="$t('feeDetailConfig.formula')"
  19 + align="center"></el-table-column>
17 <el-table-column :label="$t('feeDetailConfig.unitPrice')" align="center"> 20 <el-table-column :label="$t('feeDetailConfig.unitPrice')" align="center">
18 <template slot-scope="scope"> 21 <template slot-scope="scope">
19 - {{scope.row.computingFormula == '2002' ? '-' : scope.row.squarePrice}} 22 + {{ scope.row.computingFormula == '2002' ? '-' : scope.row.squarePrice }}
20 </template> 23 </template>
21 </el-table-column> 24 </el-table-column>
22 - <el-table-column prop="additionalAmount" :label="$t('feeDetailConfig.additionalFee')" align="center"></el-table-column> 25 + <el-table-column prop="additionalAmount" :label="$t('feeDetailConfig.additionalFee')"
  26 + align="center"></el-table-column>
23 <el-table-column :label="$t('feeDetailConfig.accountDeduction')" align="center"> 27 <el-table-column :label="$t('feeDetailConfig.accountDeduction')" align="center">
24 <template slot-scope="scope"> 28 <template slot-scope="scope">
25 - {{scope.row.deductFrom == 'Y' ? $t('feeDetailConfig.yes') : $t('feeDetailConfig.no')}} 29 + {{ scope.row.deductFrom == 'Y' ? $t('feeDetailConfig.yes') : $t('feeDetailConfig.no') }}
26 </template> 30 </template>
27 </el-table-column> 31 </el-table-column>
28 <el-table-column :label="$t('feeDetailConfig.mobilePayment')" align="center"> 32 <el-table-column :label="$t('feeDetailConfig.mobilePayment')" align="center">
29 <template slot-scope="scope"> 33 <template slot-scope="scope">
30 - {{scope.row.payOnline == 'Y' ? $t('feeDetailConfig.yes') : $t('feeDetailConfig.no')}} 34 + {{ scope.row.payOnline == 'Y' ? $t('feeDetailConfig.yes') : $t('feeDetailConfig.no') }}
31 </template> 35 </template>
32 </el-table-column> 36 </el-table-column>
33 <el-table-column prop="scale" :label="$t('feeDetailConfig.decimalPlaces')" align="center"></el-table-column> 37 <el-table-column prop="scale" :label="$t('feeDetailConfig.decimalPlaces')" align="center"></el-table-column>
@@ -36,12 +40,8 @@ @@ -36,12 +40,8 @@
36 <el-row class="margin-top"> 40 <el-row class="margin-top">
37 <el-col :span="12"></el-col> 41 <el-col :span="12"></el-col>
38 <el-col :span="12"> 42 <el-col :span="12">
39 - <el-pagination  
40 - @current-change="handleCurrentChange"  
41 - :current-page="pagination.currentPage"  
42 - :page-size="pagination.pageSize"  
43 - layout="total, prev, pager, next"  
44 - :total="pagination.total"> 43 + <el-pagination @current-change="handleCurrentChange" :current-page="pagination.currentPage"
  44 + :page-size="pagination.pageSize" layout="total, prev, pager, next" :total="pagination.total">
45 </el-pagination> 45 </el-pagination>
46 </el-col> 46 </el-col>
47 </el-row> 47 </el-row>
src/components/fee/feeDetailDiscount.vue
@@ -104,6 +104,7 @@ @@ -104,6 +104,7 @@
104 104
105 <script> 105 <script>
106 import { queryApplyRoomDiscount } from '@/api/fee/feeDetailDiscountApi' 106 import { queryApplyRoomDiscount } from '@/api/fee/feeDetailDiscountApi'
  107 +import { getCommunityId } from '@/api/community/communityApi'
107 108
108 export default { 109 export default {
109 name: 'FeeDetailDiscount', 110 name: 'FeeDetailDiscount',
@@ -130,7 +131,7 @@ export default { @@ -130,7 +131,7 @@ export default {
130 async _loadFeeDetailDiscountData(page, row) { 131 async _loadFeeDetailDiscountData(page, row) {
131 try { 132 try {
132 const params = { 133 const params = {
133 - communityId: this.$store.getters.communityId, 134 + communityId: getCommunityId(),
134 feeId: this.feeDetailDiscountInfo.feeId, 135 feeId: this.feeDetailDiscountInfo.feeId,
135 page, 136 page,
136 row 137 row
src/components/fee/feeDetailHis.vue
@@ -4,61 +4,29 @@ @@ -4,61 +4,29 @@
4 <el-col :span="24" class="text-right"></el-col> 4 <el-col :span="24" class="text-right"></el-col>
5 </el-row> 5 </el-row>
6 <div class="margin-top"> 6 <div class="margin-top">
7 - <el-table  
8 - :data="feeDetailHisInfo.fees"  
9 - border  
10 - style="width: 100%"  
11 - >  
12 - <el-table-column  
13 - prop="feeName"  
14 - :label="$t('feeDetailHis.feeName')"  
15 - align="center"  
16 - >  
17 - <template #default="{row}">  
18 - {{row.feeName}}  
19 - <span v-if="row.payerObjName">({{row.payerObjName}})</span> 7 + <el-table :data="feeDetailHisInfo.fees" border style="width: 100%">
  8 + <el-table-column prop="feeName" :label="$t('feeDetailHis.feeName')" align="center">
  9 + <template #default="{ row }">
  10 + {{ row.feeName }}
  11 + <span v-if="row.payerObjName">({{ row.payerObjName }})</span>
20 </template> 12 </template>
21 </el-table-column> 13 </el-table-column>
22 - <el-table-column  
23 - prop="startTime"  
24 - :label="$t('feeDetailHis.startTime')"  
25 - align="center"  
26 - ></el-table-column>  
27 - <el-table-column  
28 - prop="endTime"  
29 - :label="$t('feeDetailHis.endTime')"  
30 - align="center"  
31 - ></el-table-column>  
32 - <el-table-column  
33 - :label="$t('feeDetailHis.operation')"  
34 - align="center"  
35 - >  
36 - <template #default="{row}">  
37 - {{_getFeeHisOperate(row)}} 14 + <el-table-column prop="startTime" :label="$t('feeDetailHis.startTime')" align="center"></el-table-column>
  15 + <el-table-column prop="endTime" :label="$t('feeDetailHis.endTime')" align="center"></el-table-column>
  16 + <el-table-column :label="$t('feeDetailHis.operation')" align="center">
  17 + <template #default="{ row }">
  18 + {{ _getFeeHisOperate(row) }}
38 </template> 19 </template>
39 </el-table-column> 20 </el-table-column>
40 - <el-table-column  
41 - prop="userName"  
42 - :label="$t('feeDetailHis.operator')"  
43 - align="center"  
44 - ></el-table-column>  
45 - <el-table-column  
46 - prop="createTime"  
47 - :label="$t('feeDetailHis.operationTime')"  
48 - align="center"  
49 - ></el-table-column> 21 + <el-table-column prop="userName" :label="$t('feeDetailHis.operator')" align="center"></el-table-column>
  22 + <el-table-column prop="createTime" :label="$t('feeDetailHis.operationTime')" align="center"></el-table-column>
50 </el-table> 23 </el-table>
51 24
52 <el-row class="margin-top"> 25 <el-row class="margin-top">
53 <el-col :span="4"></el-col> 26 <el-col :span="4"></el-col>
54 <el-col :span="20"> 27 <el-col :span="20">
55 - <el-pagination  
56 - @current-change="handleCurrentChange"  
57 - :current-page="currentPage"  
58 - :page-size="pageSize"  
59 - layout="total, prev, pager, next, jumper"  
60 - :total="total"  
61 - ></el-pagination> 28 + <el-pagination @current-change="handleCurrentChange" :current-page="currentPage" :page-size="pageSize"
  29 + layout="total, prev, pager, next, jumper" :total="total"></el-pagination>
62 </el-col> 30 </el-col>
63 </el-row> 31 </el-row>
64 </div> 32 </div>
@@ -67,6 +35,7 @@ @@ -67,6 +35,7 @@
67 35
68 <script> 36 <script>
69 import { queryHisFee } from '@/api/fee/feeDetailHisApi' 37 import { queryHisFee } from '@/api/fee/feeDetailHisApi'
  38 +import { getCommunityId } from '@/api/community/communityApi'
70 39
71 export default { 40 export default {
72 name: 'FeeDetailHis', 41 name: 'FeeDetailHis',
@@ -98,7 +67,7 @@ export default { @@ -98,7 +67,7 @@ export default {
98 async _loadFeeDetailHisData(page, row) { 67 async _loadFeeDetailHisData(page, row) {
99 try { 68 try {
100 const params = { 69 const params = {
101 - communityId: this.$store.getters.communityId, 70 + communityId: getCommunityId(),
102 feeId: this.feeDetailHisInfo.feeId, 71 feeId: this.feeDetailHisInfo.feeId,
103 staffNameLike: this.feeDetailHisInfo.staffNameLike, 72 staffNameLike: this.feeDetailHisInfo.staffNameLike,
104 feeNameLike: this.feeDetailHisInfo.feeNameLike, 73 feeNameLike: this.feeDetailHisInfo.feeNameLike,
@@ -108,7 +77,7 @@ export default { @@ -108,7 +77,7 @@ export default {
108 page, 77 page,
109 row 78 row
110 } 79 }
111 - 80 +
112 const res = await queryHisFee(params) 81 const res = await queryHisFee(params)
113 this.feeDetailHisInfo.fees = res.data 82 this.feeDetailHisInfo.fees = res.data
114 this.total = res.records 83 this.total = res.records
@@ -123,13 +92,13 @@ export default { @@ -123,13 +92,13 @@ export default {
123 feeCount += 1 92 feeCount += 1
124 } 93 }
125 }) 94 })
126 - 95 +
127 if (feeCount <= 1) { 96 if (feeCount <= 1) {
128 if (fee.operate === 'ADD') return this.$t('feeDetailHis.add') 97 if (fee.operate === 'ADD') return this.$t('feeDetailHis.add')
129 if (fee.operate === 'DEL') return this.$t('feeDetailHis.delete') 98 if (fee.operate === 'DEL') return this.$t('feeDetailHis.delete')
130 return '-' 99 return '-'
131 } 100 }
132 - 101 +
133 if (fee.operate === 'ADD') return this.$t('feeDetailHis.modifyNew') 102 if (fee.operate === 'ADD') return this.$t('feeDetailHis.modifyNew')
134 if (fee.operate === 'DEL') return this.$t('feeDetailHis.modifyOld') 103 if (fee.operate === 'DEL') return this.$t('feeDetailHis.modifyOld')
135 return '-' 104 return '-'
src/components/fee/feeDetailImport.vue
@@ -77,6 +77,7 @@ @@ -77,6 +77,7 @@
77 77
78 <script> 78 <script>
79 import { queryImportFeeDetail } from '@/api/fee/feeDetailImportApi' 79 import { queryImportFeeDetail } from '@/api/fee/feeDetailImportApi'
  80 +import { getCommunityId } from '@/api/community/communityApi'
80 81
81 export default { 82 export default {
82 name: 'FeeDetailImport', 83 name: 'FeeDetailImport',
@@ -103,7 +104,7 @@ export default { @@ -103,7 +104,7 @@ export default {
103 async _loadFeeDetailImportData(page, row) { 104 async _loadFeeDetailImportData(page, row) {
104 try { 105 try {
105 const params = { 106 const params = {
106 - communityId: this.$store.getters.communityId, 107 + communityId: getCommunityId(),
107 feeId: this.feeDetailImportInfo.feeId, 108 feeId: this.feeDetailImportInfo.feeId,
108 page, 109 page,
109 row 110 row
src/components/fee/feeDetailMeter.vue
@@ -66,6 +66,7 @@ @@ -66,6 +66,7 @@
66 66
67 <script> 67 <script>
68 import { listMeterWaters } from '@/api/fee/feeDetailMeterApi' 68 import { listMeterWaters } from '@/api/fee/feeDetailMeterApi'
  69 +import { getCommunityId } from '@/api/community/communityApi'
69 70
70 export default { 71 export default {
71 name: 'FeeDetailMeter', 72 name: 'FeeDetailMeter',
@@ -92,7 +93,7 @@ export default { @@ -92,7 +93,7 @@ export default {
92 async _loadFeeDetailMeterData(page, row) { 93 async _loadFeeDetailMeterData(page, row) {
93 try { 94 try {
94 const params = { 95 const params = {
95 - communityId: this.$store.getters.communityId, 96 + communityId: getCommunityId(),
96 feeId: this.feeDetailMeterInfo.feeId, 97 feeId: this.feeDetailMeterInfo.feeId,
97 page, 98 page,
98 row 99 row
src/components/fee/feeDetailOwner.vue
1 <template> 1 <template>
2 <div> 2 <div>
3 <div class="margin-top"> 3 <div class="margin-top">
4 - <el-table  
5 - :data="feeDetailOwnerInfo.owners"  
6 - border  
7 - style="width: 100%"  
8 - >  
9 - <el-table-column  
10 - :label="$t('feeDetailOwner.ownerFace')"  
11 - align="center"  
12 - >  
13 - <template #default="{row}">  
14 - <el-image  
15 - style="width: 60px; height: 60px;"  
16 - class="border-radius"  
17 - :src="row.url || '/img/noPhoto.jpg'"  
18 - :preview-src-list="[row.url]"  
19 - v-if="row.url"  
20 - ></el-image>  
21 - <el-image  
22 - style="width: 60px; height: 60px;"  
23 - class="border-radius"  
24 - src="/img/noPhoto.jpg"  
25 - v-else  
26 - ></el-image> 4 + <el-table :data="feeDetailOwnerInfo.owners" border style="width: 100%">
  5 + <el-table-column :label="$t('feeDetailOwner.ownerFace')" align="center">
  6 + <template #default="{ row }">
  7 + <el-image style="width: 60px; height: 60px;" class="border-radius" :src="row.url || '/img/noPhoto.jpg'"
  8 + :preview-src-list="[row.url]" v-if="row.url"></el-image>
  9 + <el-image style="width: 60px; height: 60px;" class="border-radius" src="/img/noPhoto.jpg" v-else></el-image>
27 </template> 10 </template>
28 </el-table-column> 11 </el-table-column>
29 - <el-table-column  
30 - prop="name"  
31 - :label="$t('feeDetailOwner.name')"  
32 - align="center"  
33 - >  
34 - <template #default="{row}">  
35 - {{row.name}}({{row.link}}) 12 + <el-table-column prop="name" :label="$t('feeDetailOwner.name')" align="center">
  13 + <template #default="{ row }">
  14 + {{ row.name }}({{ row.link }})
36 </template> 15 </template>
37 </el-table-column> 16 </el-table-column>
38 - <el-table-column  
39 - prop="sex"  
40 - :label="$t('feeDetailOwner.gender')"  
41 - align="center"  
42 - >  
43 - <template #default="{row}">  
44 - {{row.sex === 0 ? $t('feeDetailOwner.male') : $t('feeDetailOwner.female')}} 17 + <el-table-column prop="sex" :label="$t('feeDetailOwner.gender')" align="center">
  18 + <template #default="{ row }">
  19 + {{ row.sex === 0 ? $t('feeDetailOwner.male') : $t('feeDetailOwner.female') }}
45 </template> 20 </template>
46 </el-table-column> 21 </el-table-column>
47 - <el-table-column  
48 - prop="idCard"  
49 - :label="$t('feeDetailOwner.idCard')"  
50 - align="center"  
51 - ></el-table-column>  
52 - <el-table-column  
53 - prop="address"  
54 - :label="$t('feeDetailOwner.address')"  
55 - align="center"  
56 - ></el-table-column>  
57 - <el-table-column  
58 - prop="roomCount"  
59 - :label="$t('feeDetailOwner.roomCount')"  
60 - align="center"  
61 - >  
62 - <template #default="{row}"> 22 + <el-table-column prop="idCard" :label="$t('feeDetailOwner.idCard')" align="center"></el-table-column>
  23 + <el-table-column prop="address" :label="$t('feeDetailOwner.address')" align="center"></el-table-column>
  24 + <el-table-column prop="roomCount" :label="$t('feeDetailOwner.roomCount')" align="center">
  25 + <template #default="{ row }">
63 <el-link type="primary" @click="_viewOwnerRooms(row)"> 26 <el-link type="primary" @click="_viewOwnerRooms(row)">
64 - {{row.roomCount || 0}} 27 + {{ row.roomCount || 0 }}
65 </el-link> 28 </el-link>
66 </template> 29 </template>
67 </el-table-column> 30 </el-table-column>
68 - <el-table-column  
69 - prop="memberCount"  
70 - :label="$t('feeDetailOwner.memberCount')"  
71 - align="center"  
72 - >  
73 - <template #default="{row}"> 31 + <el-table-column prop="memberCount" :label="$t('feeDetailOwner.memberCount')" align="center">
  32 + <template #default="{ row }">
74 <el-link type="primary" @click="_viewOwnerMembers(row)"> 33 <el-link type="primary" @click="_viewOwnerMembers(row)">
75 - {{row.memberCount || 0}} 34 + {{ row.memberCount || 0 }}
76 </el-link> 35 </el-link>
77 </template> 36 </template>
78 </el-table-column> 37 </el-table-column>
79 - <el-table-column  
80 - prop="carCount"  
81 - :label="$t('feeDetailOwner.carCount')"  
82 - align="center"  
83 - >  
84 - <template #default="{row}"> 38 + <el-table-column prop="carCount" :label="$t('feeDetailOwner.carCount')" align="center">
  39 + <template #default="{ row }">
85 <el-link type="primary" @click="_viewOwnerCars(row)"> 40 <el-link type="primary" @click="_viewOwnerCars(row)">
86 - {{row.carCount || 0}} 41 + {{ row.carCount || 0 }}
87 </el-link> 42 </el-link>
88 </template> 43 </template>
89 </el-table-column> 44 </el-table-column>
90 - <el-table-column  
91 - prop="complaintCount"  
92 - :label="$t('feeDetailOwner.complaintCount')"  
93 - align="center"  
94 - >  
95 - <template #default="{row}"> 45 + <el-table-column prop="complaintCount" :label="$t('feeDetailOwner.complaintCount')" align="center">
  46 + <template #default="{ row }">
96 <el-link type="primary" @click="_viewComplaints(row)"> 47 <el-link type="primary" @click="_viewComplaints(row)">
97 - {{row.complaintCount || 0}} 48 + {{ row.complaintCount || 0 }}
98 </el-link> 49 </el-link>
99 </template> 50 </template>
100 </el-table-column> 51 </el-table-column>
101 - <el-table-column  
102 - prop="repairCount"  
103 - :label="$t('feeDetailOwner.repairCount')"  
104 - align="center"  
105 - >  
106 - <template #default="{row}"> 52 + <el-table-column prop="repairCount" :label="$t('feeDetailOwner.repairCount')" align="center">
  53 + <template #default="{ row }">
107 <el-link type="primary" @click="_viewRepairs(row)"> 54 <el-link type="primary" @click="_viewRepairs(row)">
108 - {{row.repairCount || 0}} 55 + {{ row.repairCount || 0 }}
109 </el-link> 56 </el-link>
110 </template> 57 </template>
111 </el-table-column> 58 </el-table-column>
112 - <el-table-column  
113 - prop="oweFee"  
114 - :label="$t('feeDetailOwner.oweFee')"  
115 - align="center"  
116 - >  
117 - <template #default="{row}"> 59 + <el-table-column prop="oweFee" :label="$t('feeDetailOwner.oweFee')" align="center">
  60 + <template #default="{ row }">
118 <el-link type="primary" @click="_viewOweFees(row)"> 61 <el-link type="primary" @click="_viewOweFees(row)">
119 - {{row.oweFee || '0.00'}} 62 + {{ row.oweFee || '0.00' }}
120 </el-link> 63 </el-link>
121 </template> 64 </template>
122 </el-table-column> 65 </el-table-column>
123 - <el-table-column  
124 - prop="contractCount"  
125 - :label="$t('feeDetailOwner.contractCount')"  
126 - align="center"  
127 - >  
128 - <template #default="{row}"> 66 + <el-table-column prop="contractCount" :label="$t('feeDetailOwner.contractCount')" align="center">
  67 + <template #default="{ row }">
129 <el-link type="primary" @click="_viewRoomContracts(row)"> 68 <el-link type="primary" @click="_viewRoomContracts(row)">
130 - {{row.contractCount || 0}} 69 + {{ row.contractCount || 0 }}
131 </el-link> 70 </el-link>
132 </template> 71 </template>
133 </el-table-column> 72 </el-table-column>
@@ -136,13 +75,8 @@ @@ -136,13 +75,8 @@
136 <el-row class="margin-top"> 75 <el-row class="margin-top">
137 <el-col :span="4"></el-col> 76 <el-col :span="4"></el-col>
138 <el-col :span="20"> 77 <el-col :span="20">
139 - <el-pagination  
140 - @current-change="handleCurrentChange"  
141 - :current-page="currentPage"  
142 - :page-size="pageSize"  
143 - layout="total, prev, pager, next, jumper"  
144 - :total="total"  
145 - ></el-pagination> 78 + <el-pagination @current-change="handleCurrentChange" :current-page="currentPage" :page-size="pageSize"
  79 + layout="total, prev, pager, next, jumper" :total="total"></el-pagination>
146 </el-col> 80 </el-col>
147 </el-row> 81 </el-row>
148 </div> 82 </div>
@@ -166,6 +100,7 @@ import OwnerComplaints from &#39;@/components/owner/ownerComplaints&#39; @@ -166,6 +100,7 @@ import OwnerComplaints from &#39;@/components/owner/ownerComplaints&#39;
166 import OwnerRepairs from '@/components/owner/ownerRepairs' 100 import OwnerRepairs from '@/components/owner/ownerRepairs'
167 import OwnerOweFees from '@/components/owner/ownerOweFees' 101 import OwnerOweFees from '@/components/owner/ownerOweFees'
168 import RoomContracts from '@/components/room/roomContracts' 102 import RoomContracts from '@/components/room/roomContracts'
  103 +import { getCommunityId } from '@/api/community/communityApi'
169 104
170 export default { 105 export default {
171 name: 'FeeDetailOwner', 106 name: 'FeeDetailOwner',
@@ -203,12 +138,12 @@ export default { @@ -203,12 +138,12 @@ export default {
203 try { 138 try {
204 const params = { 139 const params = {
205 ownerId: this.feeDetailOwnerInfo.ownerId, 140 ownerId: this.feeDetailOwnerInfo.ownerId,
206 - communityId: this.$store.getters.communityId, 141 + communityId: getCommunityId(),
207 ownerTypeCd: '1001', 142 ownerTypeCd: '1001',
208 page, 143 page,
209 row 144 row
210 } 145 }
211 - 146 +
212 const res = await queryOwners(params) 147 const res = await queryOwners(params)
213 this.feeDetailOwnerInfo.owners = res.data 148 this.feeDetailOwnerInfo.owners = res.data
214 this.total = res.records 149 this.total = res.records
src/components/fee/feeDetailReceipt.vue
1 <template> 1 <template>
2 <div> 2 <div>
3 - <el-row class="margin-top-lg">  
4 - <el-col :span="12"></el-col>  
5 - <el-col :span="12" class="text-right">  
6 - <el-button  
7 - type="primary"  
8 - size="small"  
9 - @click="_printFeeReceipt"  
10 - >{{ $t('feeDetailReceipt.print') }}</el-button>  
11 - <el-button  
12 - type="primary"  
13 - size="small"  
14 - @click="_printFeeSmallReceipt"  
15 - >{{ $t('feeDetailReceipt.printSmall') }}</el-button>  
16 - <el-button  
17 - type="primary"  
18 - size="small"  
19 - @click="_printApplyFeeReceipt"  
20 - >{{ $t('feeDetailReceipt.printApply') }}</el-button>  
21 - </el-col>  
22 - </el-row>  
23 - 3 + <div class="flex justify-between">
  4 + <div ></div>
  5 + <div class="text-right">
  6 + <el-button type="primary" size="small" @click="_printFeeReceipt">{{ $t('feeDetailReceipt.print') }}</el-button>
  7 + <el-button type="primary" size="small" @click="_printFeeSmallReceipt">{{ $t('feeDetailReceipt.printSmall')
  8 + }}</el-button>
  9 + <el-button type="primary" size="small" @click="_printApplyFeeReceipt">{{ $t('feeDetailReceipt.printApply')
  10 + }}</el-button>
  11 + </div>
  12 + </div>
  13 +
24 <div class="margin-top"> 14 <div class="margin-top">
25 - <el-table  
26 - :data="feeDetailReceiptInfo.feeReceipts"  
27 - border  
28 - style="width: 100%"  
29 - >  
30 - <el-table-column  
31 - width="60"  
32 - align="center"  
33 - > 15 + <el-table :data="feeDetailReceiptInfo.feeReceipts" border style="width: 100%">
  16 + <el-table-column width="60" align="center">
34 <template #header> 17 <template #header>
35 - <el-checkbox  
36 - v-model="feeDetailReceiptInfo.quan"  
37 - @change="checkAllReceipt"  
38 - ></el-checkbox> 18 + <el-checkbox v-model="feeDetailReceiptInfo.quan" @change="checkAllReceipt"></el-checkbox>
39 </template> 19 </template>
40 - <template #default="{row}">  
41 - <el-checkbox  
42 - v-model="feeDetailReceiptInfo.selectReceipts"  
43 - :label="row.receiptId"  
44 - ></el-checkbox> 20 + <template #default="{ row }">
  21 + <el-checkbox v-model="feeDetailReceiptInfo.selectReceipts" :label="row.receiptId"></el-checkbox>
45 </template> 22 </template>
46 </el-table-column> 23 </el-table-column>
47 - <el-table-column  
48 - prop="objName"  
49 - :label="$t('feeDetailReceipt.feeType')"  
50 - align="center"  
51 - ></el-table-column>  
52 - <el-table-column  
53 - prop="payObjName"  
54 - :label="$t('feeDetailReceipt.owner')"  
55 - align="center"  
56 - ></el-table-column>  
57 - <el-table-column  
58 - prop="feeName"  
59 - :label="$t('feeDetailReceipt.feeItem')"  
60 - align="center"  
61 - ></el-table-column>  
62 - <el-table-column  
63 - :label="$t('feeDetailReceipt.feePeriod')"  
64 - align="center"  
65 - >  
66 - <template #default="{row}">  
67 - {{$dayjs(row.startTime).format('YYYY-MM-DD')}}~<br/>  
68 - {{$dayjs(row.endTime).format('YYYY-MM-DD')}} 24 + <el-table-column prop="objName" :label="$t('feeDetailReceipt.feeType')" align="center"></el-table-column>
  25 + <el-table-column prop="payObjName" :label="$t('feeDetailReceipt.owner')" align="center"></el-table-column>
  26 + <el-table-column prop="feeName" :label="$t('feeDetailReceipt.feeItem')" align="center"></el-table-column>
  27 + <el-table-column :label="$t('feeDetailReceipt.feePeriod')" align="center">
  28 + <template #default="{ row }">
  29 + {{ $dayjs(row.startTime).format('YYYY-MM-DD') }}~<br />
  30 + {{ $dayjs(row.endTime).format('YYYY-MM-DD') }}
69 </template> 31 </template>
70 </el-table-column> 32 </el-table-column>
71 - <el-table-column  
72 - prop="amount"  
73 - :label="$t('feeDetailReceipt.totalAmount')"  
74 - align="center"  
75 - >  
76 - <template #default="{row}">  
77 - {{row.amount}}{{$t('feeDetailReceipt.yuan')}} 33 + <el-table-column prop="amount" :label="$t('feeDetailReceipt.totalAmount')" align="center">
  34 + <template #default="{ row }">
  35 + {{ row.amount }}{{ $t('feeDetailReceipt.yuan') }}
78 </template> 36 </template>
79 </el-table-column> 37 </el-table-column>
80 - <el-table-column  
81 - prop="createTime"  
82 - :label="$t('feeDetailReceipt.paymentTime')"  
83 - align="center"  
84 - ></el-table-column>  
85 - <el-table-column  
86 - prop="receiptId"  
87 - :label="$t('feeDetailReceipt.receiptId')"  
88 - align="center"  
89 - ></el-table-column> 38 + <el-table-column prop="createTime" :label="$t('feeDetailReceipt.paymentTime')" align="center"></el-table-column>
  39 + <el-table-column prop="receiptId" :label="$t('feeDetailReceipt.receiptId')" align="center"></el-table-column>
90 </el-table> 40 </el-table>
91 41
92 <el-row class="margin-top"> 42 <el-row class="margin-top">
93 <el-col :span="24" class="float-right"> 43 <el-col :span="24" class="float-right">
94 - <el-pagination  
95 - @current-change="handleCurrentChange"  
96 - :current-page="currentPage"  
97 - :page-size="pageSize"  
98 - layout="total, prev, pager, next, jumper"  
99 - :total="total"  
100 - ></el-pagination> 44 + <el-pagination @current-change="handleCurrentChange" :current-page="currentPage" :page-size="pageSize"
  45 + layout="total, prev, pager, next, jumper" :total="total"></el-pagination>
101 </el-col> 46 </el-col>
102 </el-row> 47 </el-row>
103 </div> 48 </div>
@@ -106,6 +51,7 @@ @@ -106,6 +51,7 @@
106 51
107 <script> 52 <script>
108 import { queryFeeReceipt, listFeePrintPage } from '@/api/fee/feeDetailReceiptApi' 53 import { queryFeeReceipt, listFeePrintPage } from '@/api/fee/feeDetailReceiptApi'
  54 +import { getCommunityId } from '@/api/community/communityApi'
109 55
110 export default { 56 export default {
111 name: 'FeeDetailReceipt', 57 name: 'FeeDetailReceipt',
@@ -147,14 +93,14 @@ export default { @@ -147,14 +93,14 @@ export default {
147 try { 93 try {
148 this.feeDetailReceiptInfo.selectReceipts = [] 94 this.feeDetailReceiptInfo.selectReceipts = []
149 this.feeDetailReceiptInfo.quan = false 95 this.feeDetailReceiptInfo.quan = false
150 - 96 +
151 const params = { 97 const params = {
152 page, 98 page,
153 row: rows, 99 row: rows,
154 feeId: this.feeDetailReceiptInfo.feeId, 100 feeId: this.feeDetailReceiptInfo.feeId,
155 - communityId: this.$store.getters.communityId 101 + communityId: getCommunityId()
156 } 102 }
157 - 103 +
158 const res = await queryFeeReceipt(params) 104 const res = await queryFeeReceipt(params)
159 this.feeDetailReceiptInfo.total = res.total 105 this.feeDetailReceiptInfo.total = res.total
160 this.feeDetailReceiptInfo.records = res.records 106 this.feeDetailReceiptInfo.records = res.records
@@ -168,7 +114,7 @@ export default { @@ -168,7 +114,7 @@ export default {
168 this.$message.warning(this.$t('feeDetailReceipt.selectPrintReceipt')) 114 this.$message.warning(this.$t('feeDetailReceipt.selectPrintReceipt'))
169 return 115 return
170 } 116 }
171 - 117 +
172 const receiptIds = this.feeDetailReceiptInfo.selectReceipts.join(',') 118 const receiptIds = this.feeDetailReceiptInfo.selectReceipts.join(',')
173 window.open(`${this.feeDetailReceiptInfo.printUrl}?receiptIds=${receiptIds}&apply=N`) 119 window.open(`${this.feeDetailReceiptInfo.printUrl}?receiptIds=${receiptIds}&apply=N`)
174 }, 120 },
@@ -177,7 +123,7 @@ export default { @@ -177,7 +123,7 @@ export default {
177 this.$message.warning(this.$t('feeDetailReceipt.selectPrintApply')) 123 this.$message.warning(this.$t('feeDetailReceipt.selectPrintApply'))
178 return 124 return
179 } 125 }
180 - 126 +
181 const receiptIds = this.feeDetailReceiptInfo.selectReceipts.join(',') 127 const receiptIds = this.feeDetailReceiptInfo.selectReceipts.join(',')
182 window.open(`/print.html#/pages/property/printPayFee?receiptIds=${receiptIds}&apply=Y`) 128 window.open(`/print.html#/pages/property/printPayFee?receiptIds=${receiptIds}&apply=Y`)
183 }, 129 },
@@ -186,7 +132,7 @@ export default { @@ -186,7 +132,7 @@ export default {
186 this.$message.warning(this.$t('feeDetailReceipt.selectPrintReceipt')) 132 this.$message.warning(this.$t('feeDetailReceipt.selectPrintReceipt'))
187 return 133 return
188 } 134 }
189 - 135 +
190 const receiptIds = this.feeDetailReceiptInfo.selectReceipts.join(',') 136 const receiptIds = this.feeDetailReceiptInfo.selectReceipts.join(',')
191 window.open(`/smallPrint.html#/pages/property/printSmallPayFee?receiptIds=${receiptIds}`) 137 window.open(`/smallPrint.html#/pages/property/printSmallPayFee?receiptIds=${receiptIds}`)
192 }, 138 },
@@ -203,9 +149,9 @@ export default { @@ -203,9 +149,9 @@ export default {
203 page: 1, 149 page: 1,
204 row: 1, 150 row: 1,
205 state: 'T', 151 state: 'T',
206 - communityId: this.$store.getters.communityId 152 + communityId: getCommunityId()
207 } 153 }
208 - 154 +
209 const res = await listFeePrintPage(params) 155 const res = await listFeePrintPage(params)
210 if (res.data && res.data.length > 0) { 156 if (res.data && res.data.length > 0) {
211 this.feeDetailReceiptInfo.printUrl = res.data[0].url 157 this.feeDetailReceiptInfo.printUrl = res.data[0].url
src/components/oa/newOaWorkflowPool.vue
@@ -71,6 +71,7 @@ @@ -71,6 +71,7 @@
71 <script> 71 <script>
72 import { queryOaWorkflowForm, queryOaWorkflowFormData } from '@/api/oa/newOaWorkflowApi' 72 import { queryOaWorkflowForm, queryOaWorkflowFormData } from '@/api/oa/newOaWorkflowApi'
73 import ViewImage from '@/components/system/viewImage' 73 import ViewImage from '@/components/system/viewImage'
  74 +import { getCommunityId } from '@/api/community/communityApi'
74 75
75 export default { 76 export default {
76 name: 'NewOaWorkflowPool', 77 name: 'NewOaWorkflowPool',
@@ -155,7 +156,7 @@ export default { @@ -155,7 +156,7 @@ export default {
155 async openNewOaWorkflowPoolImg(pool) { 156 async openNewOaWorkflowPoolImg(pool) {
156 try { 157 try {
157 const res = await this.$api.workflow.listRunWorkflowImage({ 158 const res = await this.$api.workflow.listRunWorkflowImage({
158 - communityId: this.$store.getters.communityId, 159 + communityId: getCommunityId(),
159 businessKey: pool.id 160 businessKey: pool.id
160 }) 161 })
161 if (res.code !== '0') { 162 if (res.code !== '0') {
src/views/fee/feeDetail.vue
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 <el-col :span="6"> 50 <el-col :span="6">
51 <div class="form-group"> 51 <div class="form-group">
52 <label class="col-form-label"> 52 <label class="col-form-label">
53 - {{ $t('feeDetail.feeItem') }} 53 + {{ $t('feeDetail.feeItem') }}
54 </label> 54 </label>
55 <label>{{ feeDetailInfo.feeName }}</label> 55 <label>{{ feeDetailInfo.feeName }}</label>
56 </div> 56 </div>
src/views/fee/feeDetailLang.js
@@ -5,7 +5,7 @@ export const messages = { @@ -5,7 +5,7 @@ export const messages = {
5 title: 'Fee Information', 5 title: 'Fee Information',
6 feeId: 'Fee ID:', 6 feeId: 'Fee ID:',
7 feeFlag: 'Fee Flag:', 7 feeFlag: 'Fee Flag:',
8 - feeType: 'Fee Type:', 8 + feeType: 'Fee Type',
9 payerObj: 'Payer:', 9 payerObj: 'Payer:',
10 feeItem: 'Fee Item:', 10 feeItem: 'Fee Item:',
11 feeStatus: 'Fee Status:', 11 feeStatus: 'Fee Status:',
@@ -252,7 +252,7 @@ export const messages = { @@ -252,7 +252,7 @@ export const messages = {
252 feeFlag: '费用标识:', 252 feeFlag: '费用标识:',
253 feeType: '费用类型:', 253 feeType: '费用类型:',
254 payerObj: '付费对象:', 254 payerObj: '付费对象:',
255 - feeItem: '费用项', 255 + feeItem: '费用项',
256 feeStatus: '费用状态:', 256 feeStatus: '费用状态:',
257 createTime: '建账时间:', 257 createTime: '建账时间:',
258 batchId: '批次:', 258 batchId: '批次:',