Commit d1dc7dc57a81bb9c2068d3e8f78415e8e041bc8f
1 parent
cd705b0a
房屋收费 查询分页问题 默认从300 改成1000
Showing
1 changed file
with
37 additions
and
24 deletions
src/views/report/reportPayFeeDetailList.vue
| @@ -11,13 +11,15 @@ | @@ -11,13 +11,15 @@ | ||
| 11 | 11 | ||
| 12 | <el-row :gutter="20"> | 12 | <el-row :gutter="20"> |
| 13 | <el-col :span="4"> | 13 | <el-col :span="4"> |
| 14 | - <el-date-picker v-model="reportPayFeeDetailInfo.conditions.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" | ||
| 15 | - :placeholder="$t('reportPayFeeDetail.search.startTime')" style="width: 100%" /> | 14 | + <el-date-picker v-model="reportPayFeeDetailInfo.conditions.startTime" type="datetime" |
| 15 | + value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('reportPayFeeDetail.search.startTime')" | ||
| 16 | + style="width: 100%" /> | ||
| 16 | </el-col> | 17 | </el-col> |
| 17 | 18 | ||
| 18 | <el-col :span="4"> | 19 | <el-col :span="4"> |
| 19 | - <el-date-picker v-model="reportPayFeeDetailInfo.conditions.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" | ||
| 20 | - :placeholder="$t('reportPayFeeDetail.search.endTime')" style="width: 100%" @change="validateDate" /> | 20 | + <el-date-picker v-model="reportPayFeeDetailInfo.conditions.endTime" type="datetime" |
| 21 | + value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('reportPayFeeDetail.search.endTime')" | ||
| 22 | + style="width: 100%" @change="validateDate" /> | ||
| 21 | </el-col> | 23 | </el-col> |
| 22 | 24 | ||
| 23 | <el-col :span="4"> | 25 | <el-col :span="4"> |
| @@ -56,7 +58,8 @@ | @@ -56,7 +58,8 @@ | ||
| 56 | <el-row v-show="reportPayFeeDetailInfo.moreCondition" :gutter="20" style="margin-top: 20px"> | 58 | <el-row v-show="reportPayFeeDetailInfo.moreCondition" :gutter="20" style="margin-top: 20px"> |
| 57 | <el-col :span="4"> | 59 | <el-col :span="4"> |
| 58 | <el-select v-model="reportPayFeeDetailInfo.conditions.feeTypeCd" | 60 | <el-select v-model="reportPayFeeDetailInfo.conditions.feeTypeCd" |
| 59 | - :placeholder="$t('reportPayFeeDetail.search.feeType')" style="width: 100%" clearable @change="_selectConfig"> | 61 | + :placeholder="$t('reportPayFeeDetail.search.feeType')" style="width: 100%" clearable |
| 62 | + @change="_selectConfig"> | ||
| 60 | <el-option v-for="(item, index) in reportPayFeeDetailInfo.feeTypeCds" :key="index" :label="item.name" | 63 | <el-option v-for="(item, index) in reportPayFeeDetailInfo.feeTypeCds" :key="index" :label="item.name" |
| 61 | :value="item.statusCd" /> | 64 | :value="item.statusCd" /> |
| 62 | </el-select> | 65 | </el-select> |
| @@ -71,13 +74,15 @@ | @@ -71,13 +74,15 @@ | ||
| 71 | </el-col> | 74 | </el-col> |
| 72 | 75 | ||
| 73 | <el-col :span="4"> | 76 | <el-col :span="4"> |
| 74 | - <el-date-picker v-model="reportPayFeeDetailInfo.conditions.feeStartTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" | ||
| 75 | - :placeholder="$t('reportPayFeeDetail.search.feeStartTime')" style="width: 100%" /> | 77 | + <el-date-picker v-model="reportPayFeeDetailInfo.conditions.feeStartTime" type="datetime" |
| 78 | + value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('reportPayFeeDetail.search.feeStartTime')" | ||
| 79 | + style="width: 100%" /> | ||
| 76 | </el-col> | 80 | </el-col> |
| 77 | 81 | ||
| 78 | <el-col :span="4"> | 82 | <el-col :span="4"> |
| 79 | - <el-date-picker v-model="reportPayFeeDetailInfo.conditions.feeEndTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" | ||
| 80 | - :placeholder="$t('reportPayFeeDetail.search.feeEndTime')" style="width: 100%" /> | 83 | + <el-date-picker v-model="reportPayFeeDetailInfo.conditions.feeEndTime" type="datetime" |
| 84 | + value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('reportPayFeeDetail.search.feeEndTime')" | ||
| 85 | + style="width: 100%" /> | ||
| 81 | </el-col> | 86 | </el-col> |
| 82 | </el-row> | 87 | </el-row> |
| 83 | 88 | ||
| @@ -163,11 +168,13 @@ | @@ -163,11 +168,13 @@ | ||
| 163 | $t('reportPayFeeDetail.summary.yuan') }}</div> | 168 | $t('reportPayFeeDetail.summary.yuan') }}</div> |
| 164 | </el-col> | 169 | </el-col> |
| 165 | <el-col :span="4"> | 170 | <el-col :span="4"> |
| 166 | - <div>{{ $t('reportPayFeeDetail.summary.preferential') }}: {{ reportPayFeeDetailInfo.totalPreferentialAmount | ||
| 167 | - }} | 171 | + <div>{{ $t('reportPayFeeDetail.summary.preferential') }}: {{ |
| 172 | + reportPayFeeDetailInfo.totalPreferentialAmount | ||
| 173 | + }} | ||
| 168 | {{ $t('reportPayFeeDetail.summary.yuan') }}</div> | 174 | {{ $t('reportPayFeeDetail.summary.yuan') }}</div> |
| 169 | - <div>{{ $t('reportPayFeeDetail.summary.deduction') }}: {{ reportPayFeeDetailInfo.totalDeductionAmount }} {{ | ||
| 170 | - $t('reportPayFeeDetail.summary.yuan') }}</div> | 175 | + <div>{{ $t('reportPayFeeDetail.summary.deduction') }}: {{ reportPayFeeDetailInfo.totalDeductionAmount }} |
| 176 | + {{ | ||
| 177 | + $t('reportPayFeeDetail.summary.yuan') }}</div> | ||
| 171 | </el-col> | 178 | </el-col> |
| 172 | <el-col :span="4"> | 179 | <el-col :span="4"> |
| 173 | <div>{{ $t('reportPayFeeDetail.summary.gift') }}: {{ reportPayFeeDetailInfo.totalGiftAmount }} {{ | 180 | <div>{{ $t('reportPayFeeDetail.summary.gift') }}: {{ reportPayFeeDetailInfo.totalGiftAmount }} {{ |
| @@ -179,13 +186,15 @@ | @@ -179,13 +186,15 @@ | ||
| 179 | <el-row style="margin-top: 10px"> | 186 | <el-row style="margin-top: 10px"> |
| 180 | <el-col :span="2">{{ $t('reportPayFeeDetail.summary.total') }}</el-col> | 187 | <el-col :span="2">{{ $t('reportPayFeeDetail.summary.total') }}</el-col> |
| 181 | <el-col :span="4"> | 188 | <el-col :span="4"> |
| 182 | - <div>{{ $t('reportPayFeeDetail.summary.receivable') }}: {{ reportPayFeeDetailInfo.allReceivableAmount }} {{ | ||
| 183 | - $t('reportPayFeeDetail.summary.yuan') }}</div> | 189 | + <div>{{ $t('reportPayFeeDetail.summary.receivable') }}: {{ reportPayFeeDetailInfo.allReceivableAmount }} |
| 190 | + {{ | ||
| 191 | + $t('reportPayFeeDetail.summary.yuan') }}</div> | ||
| 184 | <div>{{ $t('reportPayFeeDetail.summary.received') }}: {{ reportPayFeeDetailInfo.allReceivedAmount }} {{ | 192 | <div>{{ $t('reportPayFeeDetail.summary.received') }}: {{ reportPayFeeDetailInfo.allReceivedAmount }} {{ |
| 185 | $t('reportPayFeeDetail.summary.yuan') }}</div> | 193 | $t('reportPayFeeDetail.summary.yuan') }}</div> |
| 186 | </el-col> | 194 | </el-col> |
| 187 | <el-col :span="4"> | 195 | <el-col :span="4"> |
| 188 | - <div>{{ $t('reportPayFeeDetail.summary.preferential') }}: {{ reportPayFeeDetailInfo.allPreferentialAmount }} | 196 | + <div>{{ $t('reportPayFeeDetail.summary.preferential') }}: {{ reportPayFeeDetailInfo.allPreferentialAmount |
| 197 | + }} | ||
| 189 | {{ $t('reportPayFeeDetail.summary.yuan') }}</div> | 198 | {{ $t('reportPayFeeDetail.summary.yuan') }}</div> |
| 190 | <div>{{ $t('reportPayFeeDetail.summary.deduction') }}: {{ reportPayFeeDetailInfo.allDeductionAmount }} {{ | 199 | <div>{{ $t('reportPayFeeDetail.summary.deduction') }}: {{ reportPayFeeDetailInfo.allDeductionAmount }} {{ |
| 191 | $t('reportPayFeeDetail.summary.yuan') }}</div> | 200 | $t('reportPayFeeDetail.summary.yuan') }}</div> |
| @@ -219,13 +228,13 @@ | @@ -219,13 +228,13 @@ | ||
| 219 | </template> | 228 | </template> |
| 220 | 229 | ||
| 221 | <script> | 230 | <script> |
| 222 | -import { queryPayFeeDetail, exportData ,listFeeConfigs} from '@/api/report/reportPayFeeDetailApi' | 231 | +import { queryPayFeeDetail, exportData, listFeeConfigs } from '@/api/report/reportPayFeeDetailApi' |
| 223 | import { getDict } from '@/api/community/communityApi' | 232 | import { getDict } from '@/api/community/communityApi' |
| 224 | import { getCommunityId } from '@/api/community/communityApi' | 233 | import { getCommunityId } from '@/api/community/communityApi' |
| 225 | import { | 234 | import { |
| 226 | listMyEnteredCommunitys | 235 | listMyEnteredCommunitys |
| 227 | } from '@/api/report/dataReportApi' | 236 | } from '@/api/report/dataReportApi' |
| 228 | -import {dateFormat} from '@/utils/dateUtil' | 237 | +import { dateFormat } from '@/utils/dateUtil' |
| 229 | 238 | ||
| 230 | export default { | 239 | export default { |
| 231 | name: 'ReportPayFeeDetailList', | 240 | name: 'ReportPayFeeDetailList', |
| @@ -304,10 +313,13 @@ export default { | @@ -304,10 +313,13 @@ export default { | ||
| 304 | 313 | ||
| 305 | const { data, total, records, sumTotal } = await queryPayFeeDetail(params) | 314 | const { data, total, records, sumTotal } = await queryPayFeeDetail(params) |
| 306 | 315 | ||
| 307 | - this.reportPayFeeDetailInfo.fees = data.map(item => ({ | ||
| 308 | - ...item, | ||
| 309 | - lateFee: (item.lateFee * -1).toFixed(2) | ||
| 310 | - })) | 316 | + if (data && data.length > 0) { |
| 317 | + this.reportPayFeeDetailInfo.fees = data.map(item => ({ | ||
| 318 | + ...item, | ||
| 319 | + lateFee: (item.lateFee * -1).toFixed(2) | ||
| 320 | + })) | ||
| 321 | + } | ||
| 322 | + | ||
| 311 | this.reportPayFeeDetailInfo.total = total | 323 | this.reportPayFeeDetailInfo.total = total |
| 312 | this.reportPayFeeDetailInfo.records = records | 324 | this.reportPayFeeDetailInfo.records = records |
| 313 | 325 | ||
| @@ -358,7 +370,7 @@ export default { | @@ -358,7 +370,7 @@ export default { | ||
| 358 | feeTypeCd: this.reportPayFeeDetailInfo.conditions.feeTypeCd, | 370 | feeTypeCd: this.reportPayFeeDetailInfo.conditions.feeTypeCd, |
| 359 | isFlag: "0" | 371 | isFlag: "0" |
| 360 | } | 372 | } |
| 361 | - const { feeConfigs } = await listFeeConfigs( params) | 373 | + const { feeConfigs } = await listFeeConfigs(params) |
| 362 | this.reportPayFeeDetailInfo.feeConfigDtos = feeConfigs | 374 | this.reportPayFeeDetailInfo.feeConfigDtos = feeConfigs |
| 363 | } catch (error) { | 375 | } catch (error) { |
| 364 | console.error('获取费用项失败:', error) | 376 | console.error('获取费用项失败:', error) |
| @@ -471,4 +483,5 @@ export default { | @@ -471,4 +483,5 @@ export default { | ||
| 471 | margin-top: 20px; | 483 | margin-top: 20px; |
| 472 | text-align: right; | 484 | text-align: right; |
| 473 | } | 485 | } |
| 474 | -}</style> | ||
| 475 | \ No newline at end of file | 486 | \ No newline at end of file |
| 487 | +} | ||
| 488 | +</style> | ||
| 476 | \ No newline at end of file | 489 | \ No newline at end of file |