8/19 report

src/views/system/report/arrears.vue

@@ -117,7 +117,7 @@ const data = reactive({
 
 const { queryParams } = toRefs(data);
 
-// 查询 房屋类型╬╬╬╬╬2╬>
+// 查询 房屋类型
 const houseUseList = ref([]);
 function handleQueryHouseUse() {
   listHouseUseType().then((res) => {

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

@@ -57,14 +57,17 @@
             <el-table-column label="现金类" align="center" prop="cashAmount">
               <template #default>
                 <el-table-column label="现金" align="center" prop="cashAmount"></el-table-column>
+                <el-table-column label="支付宝" align="center" prop="alipayAmount"></el-table-column>
+                <el-table-column label="宜当付" align="center" prop="yiDangFuAmount"></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>
-                <el-table-column label="微信商户" align="center" prop="wechatAmount"></el-table-column>
+                <el-table-column label="微信" align="center" prop="wechatAmount"></el-table-column>
               </template>
             </el-table-column>
             <el-table-column label="顶账类" align="center" prop="deposit">
               <template #default>
                 <el-table-column label="押金抵顶" align="center" prop="depositAmount"></el-table-column>
+                <el-table-column label="房产抵顶" align="center" prop="propertyOffsetAmount"></el-table-column>
                 <el-table-column label="减免优惠" align="center" prop="discountAmount"></el-table-column>
               </template>
             </el-table-column>
@@ -227,6 +230,8 @@ const handleExport = () => {
               label: '现金类',
               children: [
                 { label: '现金', prop: 'cashAmount' },
+                { label: '支付宝', prop: 'alipayAmount' },
+                { label: '宜当付', prop: 'yiDangFuAmount' },
                 { label: '银联', prop: 'unionPayAmount' },
                 { label: '转账', prop: 'transferAmount' },
                 { label: '微信商户', prop: 'wechatAmount' }
@@ -236,6 +241,7 @@ const handleExport = () => {
               label: '顶账类',
               children: [
                 { label: '押金抵顶', prop: 'depositAmount' },
+                { label: '房产抵顶', prop: 'propertyOffsetAmount' },
                 { label: '减免优惠', prop: 'discountAmount' }
               ]
             }

src/views/system/report/detailed.vue

@@ -157,7 +157,7 @@ function getMonthList() {
     ...arr
   ];
 }
-// 动态列名列表▐╬ .3╬
+// 动态列名列表
 const dynamicColumns = ref<string[]>([]);
 
 // 在获取数据后更新动态列

src/views/system/report/monthFeeReport.vue

@@ -384,7 +384,7 @@ const data = reactive({
     ]
   }
 });
-// 动态生成表单验证规则╘╬
+// 动态生成表单验证规则╘╬╬╬
 const { queryParams, rules } = toRefs(data);
 
 // 查询房屋类型列表
@@ -406,14 +406,14 @@ const getList = async () => {
   });
   getMonthFeeReportList(search)
     .then((res) => {
-      ArrearsDetailList.value = [...res.rows];
+      ArrearsDetailList.value = res.rows ?? [];
     })
     .finally(() => {
       loading.value = false;
     });
 };
 
-/** 搜索按钮操作 */
+/** 搜索按钮操作8 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
   getList();