8/19 月报

.env.development

@@ -9,9 +9,9 @@ VITE_APP_ENV='development'
 # 开发环境
 VITE_APP_BASE_API='/dev-api'
 # # 开发环境  接口代理地址
-VITE_APP_PROXY_API='http://192.168.1.222:8080'
+#VITE_APP_PROXY_API='http://192.168.1.222:8080'
 # 开发环境  接口代理地址
-#VITE_APP_PROXY_API='http://192.168.1.6:8080'
+VITE_APP_PROXY_API='http://192.168.1.6:8080'
 # 图片基础地址
 VITE_IMG_URL='http://192.168.1.222:8080'
 

src/api/system/report/aging/index.ts

@@ -18,13 +18,3 @@ export const getDetailList = (query): Promise<AgingListResponse> => {
     params: query
   });
 };
-
-
-export const getDetailList = (query): Promise<AgingListResponse> => {
-  return request({
-    url: '/agingAnalysis/detail',
-    method: 'get',
-    params: query
-  });
-};
-

src/api/system/report/dailyFeeReport/type.ts

@@ -1,135 +1,35 @@
-/**
- * 每日缴费记录列表
- *
- * RListDailyFeeReportVo
- */
 export type Response = {
-  code?: number;
+  code: number;
-  data?: DailyFeeReportVo[];
+  rows: Datum[];
-  msg?: string;
+  total: number;
+  msg: string;
 };
 
-/**
+export type Datum = {
- * org.community.report.domain.vo.DailyFeeReportVo
+  alipayAmount: string;
- *
+  cashAmount: string;
- * DailyFeeReportVo
+  chargeTypeAmounts: ChargeTypeAmounts;
- */
+  deposit: string;
-export type DailyFeeReportVo = {
+  depositAmount: string;
-  /**
+  discountAmount: string;
-   * 卡表
+  electricFee: string;
-   */
+  handler: null | string;
-  cardMeter?: number;
+  houseName: string;
-  /**
+  payTime: string;
-   * 现金类-现金
+  propertyOffsetAmount: string;
-   */
+  remark: null;
-  cashAmount?: number;
+  residentName: string;
-  /**
+  transferAmount: string;
-   * 押金
+  unionPayAmount: string;
-   */
+  waterFee: string;
-  deposit?: number;
+  wechatAmount: string;
-  /**
+  yiDangFuAmount: string;
-   * 押金抵顶
+};
-   */
+
-  depositAmount?: number;
+export type ChargeTypeAmounts = {
-  /**
+  [property: string]: {
-   * 预缴类-减免优惠
+    amount?: string;
-   */
+    endDate?: string;
-  discountAmount?: number;
+    startDate?: string;
-  /**
+  };
-   * 电费
-   */
-  electricFee?: number;
-  /**
-   * 代收生活垃圾处理费-截止时间
-   */
-  garbageEndTime?: string;
-  /**
-   * 代收生活垃圾处理费-金额
-   */
-  garbageFee?: number;
-  /**
-   * 代收生活垃圾处理费-开始时间
-   */
-  garbageStartTime?: string;
-  /**
-   * 经办人
-   */
-  handler?: string;
-  /**
-   * 其他
-   */
-  otherAmount?: number;
-  /**
-   * 车位服务费-截止时间
-   */
-  parkingEndTime?: string;
-  /**
-   * 车位服务费-金额
-   */
-  parkingFee?: number;
-  /**
-   * 车位服务费-开始时间
-   */
-  parkingStartTime?: string;
-  /**
-   * 日期
-   */
-  payTime?: string;
-  /**
-   * 物业服务费-余额
-   */
-  propertyBalance?: number;
-  /**
-   * 物业服务费-截止时间
-   */
-  propertyEndTime?: string;
-  /**
-   * 预缴类-房产抵顶
-   */
-  propertyOffsetAmount?: number;
-  /**
-   * 物业服务费-开始时间
-   */
-  propertyStartTime?: string;
-  /**
-   * 备注
-   */
-  remark?: string;
-  /**
-   * 户主姓名
-   */
-  residentName?: string;
-  /**
-   * 现金类-转账
-   */
-  transferAmount?: number;
-  /**
-   * 现金类-银联
-   */
-  unionPayAmount?: number;
-  /**
-   * 房号
-   */
-  unitNo?: string;
-  /**
-   * 使用费-截止时间
-   */
-  usageEndTime?: string;
-  /**
-   * 使用费-金额
-   */
-  usageFee?: number;
-  /**
-   * 使用费-开始时间
-   */
-  usageStartTime?: string;
-  /**
-   * 水费
-   */
-  waterFee?: number;
-  /**
-   * 微信商户
-   */
-  wechatAmount?: number;
-  [property: string]: any;
 };

src/api/system/report/monthFeeReport/index.ts

@@ -0,0 +1,10 @@
+import request from '@/utils/request';
+import { MonthFeeReportQueryForm, Response } from '@/api/system/report/monthFeeReport/type';
+
+export const getMonthFeeReportList = (data: MonthFeeReportQueryForm = {}): Promise<Response> => {
+  return request({
+    url: '/chargeMonthlyReport/list',
+    method: 'GET',
+    params: data
+  });
+};

src/api/system/report/monthFeeReport/type.ts

@@ -0,0 +1,75 @@
+
+export type MonthFeeReportQueryForm = {
+  /**
+   * 房屋用途类型
+   */
+  buildingIds?: string;
+  /**
+   * 月收费率区间
+   */
+  monthRate?: string;
+  /**
+   * 本月应收区间
+   */
+  monthReceivable?: string;
+  /**
+   * 本月未收区间
+   */
+  monthUnpaid?: string;
+  /**
+   * 当前页码
+   */
+  pageNum?: number;
+  /**
+   * 每页条数
+   */
+  pageSize?: number;
+  /**
+   * 综合欠收区间
+   */
+  totalArrears?: string;
+  /**
+   * 综合预收区间
+   */
+  totalPrepaid?: string;
+  /**
+   * 小区ID
+   */
+  villageId?: string;
+  /**
+   * 年收费率区间
+   */
+  yearRate?: string;
+  /**
+   * 本年应收区间
+   */
+  yearReceivable?: string;
+  /**
+   * 本年未收区间
+   */
+  yearUnpaid?: string;
+};
+export type Response = {
+  code: number;
+  msg: string;
+  rows: Row[];
+  total: number;
+};
+
+export type Row = {
+  buildingId: BuildingId;
+  buildingName: string;
+  monthRate: string;
+  monthReceivable: string;
+  monthReceived: string;
+  monthUnpaid: string;
+  totalArrears: string;
+  totalPrepaid: string;
+  yearRate: string;
+  yearReceivable: string;
+  yearReceived: string;
+  yearUnpaid: string;
+  [property: string]: any;
+};
+
+export type BuildingId = number | string;

src/components/Pagination/index.vue

@@ -27,7 +27,7 @@ const props = defineProps({
   pageSizes: { type: Array<number>, default: () => [10, 20, 30, 50, 100] },
   // 移动端页码按钮的数量端默认值5
   pagerCount: propTypes.number.def(document.body.clientWidth < 992 ? 5 : 7),
-  layout: propTypes.string.def('sizes, prev, pager, next, jumper'),
+  layout: propTypes.string.def('total, sizes, prev, pager, next, jumper'),
   background: propTypes.bool.def(true),
   autoScroll: propTypes.bool.def(true),
   hidden: propTypes.bool.def(false),

src/utils/xlsx.ts

@@ -75,34 +75,36 @@ export function exportToExcel(data: any[], columns: ColumnConfig[], filename: st
     for (let R = range.s.r; R <= range.e.r; ++R) {
       for (let C = range.s.c; C <= range.e.c; ++C) {
         const cellAddress = XLSX.utils.encode_cell({ r: R, c: C });
-        if (worksheet[cellAddress]) {
+        // ✅ 确保单元格存在（即使没有内容也要创建，以便设置边框）
-          const isHeader = R < headerRows;
+        if (!worksheet[cellAddress]) {
-          worksheet[cellAddress].s = {
+          worksheet[cellAddress] = { t: 's', v: '' };
-            fill: isHeader
-              ? {
-                  fgColor: { rgb: 'bec4cb' },
-                  patternType: 'solid'
-                }
-              : undefined,
-            font: isHeader
-              ? {
-                  color: { rgb: 'FFFFFF' },
-                  bold: true,
-                  sz: 11
-                }
-              : undefined,
-            border: {
-              top: { style: 'thin', color: { rgb: '000000' } },
-              bottom: { style: 'thin', color: { rgb: '000000' } },
-              left: { style: 'thin', color: { rgb: '000000' } },
-              right: { style: 'thin', color: { rgb: '000000' } }
-            },
-            alignment: {
-              horizontal: 'center',
-              vertical: 'center'
-            }
-          };
         }
+        const isHeader = R < headerRows;
+        worksheet[cellAddress].s = {
+          fill: isHeader
+            ? {
+                fgColor: { rgb: 'bec4cb' },
+                patternType: 'solid'
+              }
+            : undefined,
+          font: isHeader
+            ? {
+                color: { rgb: 'FFFFFF' },
+                bold: true,
+                sz: 11
+              }
+            : undefined,
+          border: {
+            top: { style: 'thin', color: { rgb: '000000' } },
+            bottom: { style: 'thin', color: { rgb: '000000' } },
+            left: { style: 'thin', color: { rgb: '000000' } },
+            right: { style: 'thin', color: { rgb: '000000' } }
+          },
+          alignment: {
+            horizontal: 'center',
+            vertical: 'center'
+          }
+        };
       }
     }
 
@@ -143,6 +145,9 @@ export function exportToExcel(data: any[], columns: ColumnConfig[], filename: st
 
 /**
  * 根据 spanMethod 回调计算需要合并的单元格范围
+ * @param data
+ * @param columns
+ * @param spanMethod
  * @param headerRows 表头行数（数据行需要偏移）
  */
 function calculateMergesBySpanMethod(data: any[], columns: ColumnConfig[], spanMethod: SpanMethodCallback, headerRows: number = 1): XLSX.Range[] {

src/views/system/Activity/addActivity.vue

@@ -98,7 +98,7 @@
                 <el-col :span="12">
                   <el-form-item label="活动名额" prop="quota">
                     <div class="flex items-center">
-                      <el-input-number v-model.trim.number="form.quota" :min="0" :max="99999999" placeholder="0代表无限" />
+                      <el-input-number v-model.trim.number="form.quota" :min="0" :max="99999" placeholder="0代表无限" />
                       <span class="ml-2 text-gray-500 text-sm" style="font-size: 12px">（填 <strong>0</strong> 代表 <u>不限制名额</u> ）</span>
                     </div>
                   </el-form-item>

src/views/system/Decoration/addDecoration.vue

@@ -104,7 +104,7 @@ const rules = {
   decorationDeposit: [
     { required: true, message: '请输入装修押金', trigger: 'blur' },
     {
-      validator: (rule, val, callback) => {
+      validator: (_: any, val: string, callback: (arg0?: Error) => any) => {
         if (val === '' || val === null) {
           return callback(new Error('请输入装修押金'));
         }

src/views/system/houseUse/index.vue

@@ -185,17 +185,6 @@ const handleDelete = async (row?: HouseUseTypeVO) => {
   await getList();
 };
 
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'houseUseType/houseUseType/export',
-    {
-      ...queryParams.value
-    },
-    `houseUseType_${new Date().getTime()}.xlsx`
-  );
-};
-
 onMounted(() => {
   getList();
 });

src/views/system/inspection/Item/addInspectionItem.vue

@@ -25,7 +25,6 @@
 import { ref } from 'vue';
 import PageHeader from '@/components/Pageheader/index.vue';
 import { addItem, getItem, updateItem } from '@/api/system/InspectionItem';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const router = useRouter();
 const route = useRoute();
@@ -59,12 +58,12 @@ const submitForm = () => {
   formRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       if (userid.value) {
-        updateItem(form.value).then((res) => {
+        updateItem(form.value).then(() => {
           ElMessage.success('编辑成功');
           cancelForm();
         });
       } else {
-        addItem(form.value).then((res) => {
+        addItem(form.value).then(() => {
           ElMessage.success('添加成功');
           cancelForm();
         });

src/views/system/report/arrears.vue

@@ -363,7 +363,7 @@ onMounted(() => {
 
 /* 深度穿透修改表格行背景 */
 :deep(.bg-dark td) {
-  background-color: #e8f4ff !important;
+  background-color: #f5f7fa !important;
 }
 /* hover 悬浮保留深色 */
 :deep(.bg-dark:hover td) {

src/views/system/report/arrearsTrend.vue

@@ -132,7 +132,7 @@ function getChartTypeList() {
   });
 }
 
-/** 查询电抄记录列表 */
+/** 查询电抄记录列表 ╬╬╬2╬«2╬╬╬╬22╬╬╬╬╬*/
 const getList = async () => {
   loading.value = true;
   const search = { ...queryParams.value };

src/views/system/report/dailyFeeReport.vue

@@ -33,9 +33,9 @@
 
     <el-card shadow="never" class="flex-1">
       <template #header>
-        <el-row :gutter="10" style="margin-bottom: 30px">
+        <el-row :gutter="10">
           <el-col :span="5">
-            <span> 预收费用余额汇总 </span>
+            <span> 收费日报 </span>
           </el-col>
           <el-col :span="18"></el-col>
           <el-col :span="1">
@@ -44,18 +44,18 @@
         </el-row>
       </template>
 
-      <el-table v-loading="loading" border :data="ArrearsDetailList">
+      <el-table :row-class-name="handleRowClass" v-loading="loading" border :data="ArrearsDetailList">
-        <el-table-column label="日期" align="center" prop="payTime" />
+        <el-table-column label="日期" width="100" align="center" fixed="left" prop="payTime" />
-        <el-table-column label="房屋信息" align="center">
+        <el-table-column label="房屋信息" align="center" fixed="left">
-          <template #default="scope">
+          <template #default>
-            <el-table-column label="户主" align="center" prop="residentName"></el-table-column>
+            <el-table-column label="户主" align="center" width="100" prop="residentName"></el-table-column>
-            <el-table-column label="房号" align="center" prop="houseName"></el-table-column>
+            <el-table-column label="房号" align="center" width="100" prop="houseName"></el-table-column>
           </template>
         </el-table-column>
         <el-table-column label="支付方式" align="center">
-          <template #default="scope">
+          <template #default>
             <el-table-column label="现金类" align="center" prop="cashAmount">
-              <template #default="scope">
+              <template #default>
                 <el-table-column label="现金" align="center" prop="cashAmount"></el-table-column>
                 <el-table-column label="银联" align="center" prop="unionPayAmount"></el-table-column>
                 <el-table-column label="转账" align="center" prop="transferAmount"></el-table-column>
@@ -63,7 +63,7 @@
               </template>
             </el-table-column>
             <el-table-column label="顶账类" align="center" prop="deposit">
-              <template #default="scope">
+              <template #default>
                 <el-table-column label="押金抵顶" align="center" prop="depositAmount"></el-table-column>
                 <el-table-column label="减免优惠" align="center" prop="discountAmount"></el-table-column>
               </template>
@@ -82,23 +82,23 @@
                     {{ scope.row.chargeTypeAmounts[item].amount }}
                   </template>
                 </el-table-column>
-                <el-table-column label="开始时间" align="center" v-if="item !== '卡表' && item !== '其他'">
+                <el-table-column label="开始时间" width="100" align="center" v-if="item !== '卡表' && item !== '其他'">
                   <template #default="scope">
-                    {{ scope.row.chargeTypeAmounts[item].amount }}
+                    {{ scope.row.chargeTypeAmounts[item].startDate }}
                   </template>
                 </el-table-column>
-                <el-table-column label="结束时间" align="center" v-if="item !== '卡表' && item !== '其他'">
+                <el-table-column label="结束时间" width="100" align="center" v-if="item !== '卡表' && item !== '其他'">
                   <template #default="scope">
-                    {{ scope.row.chargeTypeAmounts[item].amount }}
+                    {{ scope.row.chargeTypeAmounts[item].endDate }}
                   </template>
                 </el-table-column>
-                <span v-if="item == '卡表' || item == '其他'">{{ scope.row.chargeTypeAmounts[item] }}</span>
+                <span v-if="item == '卡表' || item == '其他'">{{ scope.row.chargeTypeAmounts[item].amount }}</span>
               </template>
             </el-table-column>
           </template>
         </el-table-column>
         <el-table-column label="经办人" align="center" prop="handler" />
-        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column show-overflow-tooltip width="250" label="备注" align="center" prop="remark" />
       </el-table>
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
@@ -111,13 +111,11 @@ import pageHeader from '@/components/Pageheader/index.vue';
 import { getCommunitylistAPI } from '@/api/system/community';
 import { ColumnConfig, exportToExcel } from '@/utils/xlsx';
 import { listHouseUseType } from '@/api/system/houseUse';
-import { Row } from '@/api/system/report/prepaidBalance/type';
-import { getPrepaidBalanceDetailList } from '@/api/system/report/prepaidBalanceDetail';
 import { getDailyFeeReportList } from '@/api/system/report/dailyFeeReport';
-import { DailyFeeReportVo } from '@/api/system/report/dailyFeeReport/type';
+import { Datum } from '@/api/system/report/dailyFeeReport/type';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const ArrearsDetailList = ref<DailyFeeReportVo[]>([]);
+const ArrearsDetailList = ref<Datum[]>([]);
 const loading = ref(true);
 const showSearch = ref(true);
 const total = ref(0);
@@ -165,14 +163,21 @@ const getList = async () => {
   });
   getDailyFeeReportList(search)
     .then((res) => {
-      ArrearsDetailList.value = [...res.data];
+      ArrearsDetailList.value = [...res.rows];
-      rowChargeTypesList.value = Object.keys(res.data[0].chargeTypeAmounts);
+      rowChargeTypesList.value = Object.keys(res.rows[0].chargeTypeAmounts);
-      console.log(rowChargeTypesList.value);
+      total.value = res.total;
     })
     .finally(() => {
       loading.value = false;
     });
 };
+function handleRowClass({ row }) {
+  if (row.residentName === '当日合计') {
+    // 示例1：收费项目等于物业费的行加深色
+    return 'bg-dark';
+  }
+  return '';
+}
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
@@ -205,30 +210,63 @@ const handleExport = () => {
   setTimeout(() => {
     try {
       const columns: ColumnConfig[] = [
-        { label: '小区名称', prop: 'villageName' },
+        { label: '日期', prop: 'payTime' },
-        { label: '房屋类型', prop: 'houseTypeName' },
+        {
-        { label: '户号', prop: 'houseNo' },
+          label: '房屋信息',
-        { label: '客户', prop: 'customerName' },
+          prop: 'houseName',
-        { label: '预收账期', prop: 'prepaidPeriod' },
+          children: [
-        { label: '预收月份', prop: 'prepaidMonths' },
+            { label: '户主', prop: 'residentName' },
+            { label: '户号', prop: 'houseName' }
+          ]
+        },
+        {
+          label: '支付方式',
+          prop: 'paymentMethod',
+          children: [
+            {
+              label: '现金类',
+              children: [
+                { label: '现金', prop: 'cashAmount' },
+                { label: '银联', prop: 'unionPayAmount' },
+                { label: '转账', prop: 'transferAmount' },
+                { label: '微信商户', prop: 'wechatAmount' }
+              ]
+            },
+            {
+              label: '顶账类',
+              children: [
+                { label: '押金抵顶', prop: 'depositAmount' },
+                { label: '减免优惠', prop: 'discountAmount' }
+              ]
+            }
+          ]
+        },
+        { label: '水费', prop: 'waterFee' },
+        { label: '电费', prop: 'electricFee' },
+        { label: '押金', prop: 'deposit' },
         {
           label: '收费项目',
-          prop: 'chargeItemAmounts',
+          prop: 'chargeTypeAmounts',
           children: [
             ...rowChargeTypesList.value.map((item) => {
               return {
-                label: item.chargeItemName,
+                label: item,
-                prop: `chargeItemAmounts.${item.chargeItemName}`
+                children: ['其他', '卡表'].includes(item)
+                  ? []
+                  : [
+                      { label: '金额', prop: `chargeTypeAmounts.${item}.amount` },
+                      { label: '开始时间', prop: `chargeTypeAmounts.${item}.startTime` },
+                      { label: '截止时间', prop: `chargeTypeAmounts.${item}.endTime` }
+                    ]
               };
             })
           ]
         },
-        {
+        { label: '经办人', prop: 'inspectorName' },
-          label: '合计',
+        { label: '备注', prop: 'remark' }
-          prop: 'totalAmount'
-        }
       ];
-      exportToExcel(ArrearsDetailList.value, columns, `预收费用余额详细_${new Date().getTime()}`);
+      console.log(columns);
+      exportToExcel(ArrearsDetailList.value, columns, `日报_${new Date().getTime()}`);
     } catch (error) {
       proxy?.$modal.msgError('导出失败，请重试');
       console.error('导出错误:', error);
@@ -248,4 +286,8 @@ onMounted(() => {
 .el-table {
   height: calc(100% - 80px);
 }
+/* 深度穿透修改表格行背景 */
+:deep(.bg-dark td) {
+  background-color: #f5f7fa !important;
+}
 </style>

src/views/system/report/detailed.vue

@@ -67,7 +67,7 @@
         <el-table-column label="应收账期" align="center" prop="billPeriod" />
         <el-table-column label="欠费项目" align="center">
           <template #default>
-            <template v-for="(item, index) in dynamicColumns" :key="index">
+            <template v-for="item in dynamicColumns" :key="item">
               <el-table-column :label="item" align="center">
                 <template #default="scope">
                   {{ scope.row.chargeItemAmounts?.[item] || 0 }}
@@ -86,14 +86,12 @@
     </el-card>
   </div>
 </template>
-账龄
 <script setup name="Arrears" lang="ts">
 import pagination from '@/components/Pagination/index.vue';
 import pageHeader from '@/components/Pageheader/index.vue';
 import { getArrearsDetails } from '@/api/system/report/arrears/arrears';
 import { getCommunitylistAPI } from '@/api/system/community';
 import { OwnerArrearsDetailVo } from '@/api/system/report/arrears/type';
-import { validator } from '@/utils/Reg';
 import { ColumnConfig, exportToExcel } from '@/utils/xlsx';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -123,7 +121,7 @@ const data = reactive({
 
 const { queryParams } = toRefs(data);
 
-// 查询小区
+// 查询小区╬╬zn
 const villageList = ref([]);
 function getAllVillage() {
   getCommunitylistAPI().then((res) => {
@@ -144,7 +142,7 @@ function handleVillageChange(val: string) {
 // 月份
 const MonthList = ref([]);
 function getMonthList() {
-  const arr = Array.from({ length: 12 }).fill((i) => {
+  const arr = Array.from({ length: 12 }).fill((i: number) => {
     return {
       id: `${i + 1}`,
       name: `${i + 1}月`

src/views/system/report/monthFeeReport.vue

@@ -0,0 +1,212 @@
+<template>
+  <div class="p-2 h-full flex flex-col">
+    <pageHeader></pageHeader>
+    <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" label-width="80px" :model="queryParams" @submit.prevent="handleQuery" :inline="true">
+            <div class="flex justify-between">
+              <div>
+                <el-form-item label="楼栋(多选)" prop="buildingIds">
+                  <el-select multiple v-model="queryParams.buildingIds" placeholder="请选择">
+                    <el-option v-for="item in allHouseUseList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="本月应收" prop="monthReceivable">
+                  <el-input v-model.trim="queryParams.monthReceivable" placeholder="区间搜索 1000-10000"></el-input>
+                </el-form-item>
+                <el-form-item label="本月未收" prop="monthUnpaid">
+                  <el-input v-model.trim="queryParams.monthUnpaid" placeholder="区间搜索 1000-10000"></el-input>
+                </el-form-item>
+                <el-form-item label="月收费率" prop="monthRate">
+                  <el-input v-model.trim="queryParams.monthRate" placeholder="关键字搜索"></el-input>
+                </el-form-item>
+                <div>
+                  <el-form-item label="本年应收" prop="yearReceivable">
+                    <el-input v-model.trim="queryParams.yearReceivable" placeholder="区间搜索 1000-10000"></el-input>
+                  </el-form-item>
+                  <el-form-item label="本年未收" prop="yearUnpaid">
+                    <el-input v-model.trim="queryParams.yearUnpaid" placeholder="区间搜索 1000-10000"></el-input>
+                  </el-form-item>
+                  <el-form-item label="年收费率" prop="yearRate">
+                    <el-input v-model.trim="queryParams.yearRate" placeholder="关键字搜索"></el-input>
+                  </el-form-item>
+                  <el-form-item label="综合欠收" prop="totalArrears">
+                    <el-input v-model.trim="queryParams.totalArrears" placeholder="区间搜索 1000-10000"></el-input>
+                  </el-form-item>
+                  <el-form-item label="综合预收" prop="totalPrepaid">
+                    <el-input v-model.trim="queryParams.totalPrepaid"></el-input>
+                  </el-form-item>
+                </div>
+              </div>
+              <div>
+                <el-button type="primary" @click="handleQuery">查询</el-button>
+                <el-button @click="resetQuery">重置</el-button>
+              </div>
+            </div>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never" class="flex-1">
+      <template #header>
+        <el-row :gutter="10" style="margin-bottom: 30px">
+          <el-col :span="5">
+            <span> 收费日报 </span>
+          </el-col>
+          <el-col :span="18"></el-col>
+          <el-col :span="1">
+            <el-button type="primary" @click="handleExport">导出</el-button>
+          </el-col>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="ArrearsDetailList">
+        <el-table-column label="楼栋" align="center" prop="buildingName" />
+        <el-table-column label="本月应收" align="center" prop="monthReceivable" />
+        <el-table-column label="本月已收" align="center" prop="monthReceived" />
+        <el-table-column label="本月未收" align="center" prop="monthUnpaid" />
+        <el-table-column label="月收费率" align="center" prop="monthRate" />
+        <el-table-column label="本年应收" align="center" prop="yearReceivable" />
+        <el-table-column label="本年已收" align="center" prop="yearReceived" />
+        <el-table-column label="本年未收" align="center" prop="yearUnpaid" />
+        <el-table-column label="年收费率" align="center" prop="yearRate" />
+        <el-table-column label="综合欠收" align="center" prop="totalPrepaid" />
+        <el-table-column label="综合预收" align="center" prop="totalArrears" />
+      </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 lang="ts">
+import pagination from '@/components/Pagination/index.vue';
+import pageHeader from '@/components/Pageheader/index.vue';
+import { ColumnConfig, exportToExcel } from '@/utils/xlsx';
+import { listHouseUseType } from '@/api/system/houseUse';
+import { DailyFeeReportVo } from '@/api/system/report/dailyFeeReport/type';
+import { getMonthFeeReportList } from '@/api/system/report/monthFeeReport';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const ArrearsDetailList = ref<DailyFeeReportVo[]>([]);
+const loading = ref(true);
+const showSearch = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const data = reactive({
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    villageId: '',
+    buildingIds: '',
+    monthReceivable: '',
+    monthUnpaid: '',
+    monthRate: '',
+    yearReceivable: '',
+    yearUnpaid: '',
+    yearRate: '',
+    totalArrears: '',
+    totalPrepaid: ''
+  }
+});
+
+const { queryParams } = toRefs(data);
+
+// 查询房屋类型列表
+const allHouseUseList = ref([]);
+function getAllHouseUse() {
+  listHouseUseType().then((res) => {
+    allHouseUseList.value = [...res.rows];
+  });
+}
+/** 查询电抄记录列表 */
+const getList = async () => {
+  loading.value = true;
+  const search = { ...queryParams.value };
+  // 移除空字符串字段
+  Object.keys(search).forEach((key) => {
+    if (search[key] === '-1') {
+      search[key] = undefined;
+    }
+  });
+  getMonthFeeReportList(search)
+    .then((res) => {
+      ArrearsDetailList.value = [...res.rows];
+    })
+    .finally(() => {
+      loading.value = false;
+    });
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  queryParams.value = {
+    buildingIds: undefined,
+    monthRate: undefined,
+    monthReceivable: undefined,
+    monthUnpaid: undefined,
+    totalArrears: undefined,
+    totalPrepaid: undefined,
+    yearRate: undefined,
+    yearReceivable: undefined,
+    yearUnpaid: undefined,
+    pageNum: 1,
+    pageSize: 10,
+    villageId: '-1'
+  };
+  handleQuery();
+};
+/** 导出Excel */
+const handleExport = () => {
+  if (ArrearsDetailList.value.length === 0) {
+    proxy?.$modal.msgWarning('没有可导出的数据');
+    return;
+  }
+
+  // 显示加载提示
+  loading.value = true;
+  // 使用 setTimeout 让出主线程，避免阻塞UI
+  setTimeout(() => {
+    try {
+      const columns: ColumnConfig[] = [
+        { label: '楼栋', prop: 'buildingName' },
+        { label: '本月应收', prop: 'monthReceivable' },
+        { label: '本月已收', prop: 'monthReceived' },
+        { label: '本月未收', prop: 'monthUnpaid' },
+        { label: '月收费率', prop: 'monthRate' },
+        { label: '本年应收', prop: 'yearReceivable' },
+        { label: '本年已收', prop: 'yearReceived' },
+        { label: '本年未收', prop: 'yearUnpaid' },
+        { label: '年收费率', prop: 'yearRate' },
+        { label: '综合欠收', prop: 'totalPrepaid' },
+        { label: '综合预收', prop: 'totalArrears' }
+      ];
+      exportToExcel(ArrearsDetailList.value, columns, `收费月报_${new Date().getTime()}`);
+    } catch (error) {
+      proxy?.$modal.msgError('导出失败，请重试');
+      console.error('导出错误:', error);
+    } finally {
+      loading.value = false;
+    }
+  }, 100);
+};
+onMounted(() => {
+  getList();
+  getAllHouseUse();
+});
+</script>
+
+<style lang="scss" scoped>
+.el-table {
+  height: calc(100% - 80px);
+}
+</style>

src/views/system/report/paidInExpenses.vue

@@ -44,7 +44,7 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="5">
-            <span>应收物业费详情 </span>
+            <span>实收物业费详情 </span>
           </el-col>
           <el-col :span="18"></el-col>
           <el-col :span="1">

src/views/system/report/prepaidBalanceDetail.vue

@@ -35,7 +35,7 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="5">
-            <span> 预收费用余额汇总 </span>
+            <span> 预收费用余额详细 </span>
           </el-col>
           <el-col :span="18"></el-col>
           <el-col :span="1">

src/views/system/resident/addResident.vue

@@ -291,7 +291,7 @@ const handleBeforeUpload = (uploadFile: UploadRawFile) => {
   }
   return true;
 };
-// !==╬╬&╬╬╬ ╬ 提交 =============================================================================
+// !==╬╬&╬╬╬ ╬╬       2╬╬&提交 =============================================================================
 
 // 提交
 const submitForm = () => {