zhaoyang/sunProduct
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8/31 dev 权限,sse,账单,bug

Browse Source
This commit is contained in:
Zy
2026-08-31 18:00:11 +08:00
parent 466ec4675e
commit de4bae3bc1
51 changed files with 575 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/views/system/report/arrears.vue
View File

@@ -4,11 +4,11 @@
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" @submit.prevent="handleQuery" :inline="true">
<el-form ref="queryFormRef" :inline="true" :model="queryParams" @submit.prevent="handleQuery">
<div class="flex justify-between">
<div>
<el-form-item label="小区" prop="villageId">
<el-select @change="handleVillageChange" v-model="queryParams.villageId" placeholder="请选择">
<el-select v-model="queryParams.villageId" placeholder="请选择" @change="handleVillageChange">
<el-option v-for="item in villageList" :key="item.villageId" :label="item.villageName" :value="item.villageId" />
</el-select>
</el-form-item>
@@ -33,15 +33,15 @@
</div>
</transition>
<el-card shadow="never" class="flex-1">
<el-card class="flex-1" shadow="never">
<template #header>
<el-row :gutter="10" style="margin-bottom: 30px">
<el-col :span="5">
<div class="flex items-center">
<div style="width: 200px; font-size: 15px; margin-right: 10px">应收欠费汇总列表</div>
<el-select @change="handleViewTypeChange" v-model="queryParams.viewType" placeholder="请选择视图类型">
<el-option label="维度1（按收费类型）" :value="1" />
<el-option label="维度2（按房屋类型）" :value="2" />
<el-select v-model="queryParams.viewType" placeholder="请选择视图类型" @change="handleViewTypeChange">
<el-option :value="1" label="维度1（按收费类型）" />
<el-option :value="2" label="维度2（按房屋类型）" />
</el-select>
</div>
</el-col>
@@ -54,15 +54,15 @@
<el-table
:key="queryParams.viewType"
v-loading="loading"
:data="ArrearsList"
:row-class-name="handleRowClass"
:span-method="mergeSpanMethod"
v-loading="loading"
border
:data="ArrearsList"
>
<el-table-column label="小区" align="center" prop="villageName" />
<el-table-column align="center" label="小区" prop="villageName" />
<template v-if="queryParams.viewType === 1">
<el-table-column label="收费项目" align="center" prop="chargeItemName" />
<el-table-column align="center" label="收费项目" prop="chargeItemName" />
<el-table-column v-for="(item, index) in houseTypeKeys" :key="index" :label="item" align="center">
<template #default="scope">
<span>{{ scope.row.houseTypeAmounts?.[item] || '---' }}</span>
@@ -70,21 +70,21 @@
</el-table-column>
</template>
<template v-if="queryParams.viewType === 2">
<el-table-column label="房屋类型" align="center" prop="houseTypeName" />
<el-table-column align="center" label="房屋类型" prop="houseTypeName" />
<el-table-column v-for="(item, index) in houseTypeKeys2" :key="index" :label="item" align="center">
<template #default="scope">
<span>{{ scope.row.chargeItemAmounts?.[item] || '---' }}</span>
</template>
</el-table-column>
</template>
<el-table-column label="金额" align="center" prop="totalAmount" />
<el-table-column align="center" label="金额" prop="totalAmount" />
</el-table>
<!-- <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />-->
</el-card>
</div>
</template>
<script setup name="Arrears" lang="ts">
<script lang="ts" name="Arrears" setup>
// import pagination from '@/components/Pagination/index.vue';
import pageHeader from '@/components/Pageheader/index.vue';
import { getArrearsList } from '@/api/system/report/arrears/arrears';
@@ -312,7 +312,6 @@ const handleExport = () => {
}
return obj;
});
console.log(processedData, columns);
const mergeSpanMethod = ({ row, columnIndex, rowIndex }) => {
const lastRowIndex = ArrearsList.value.length - 1;
if (rowIndex === lastRowIndex) {