8/25 dev bug

src/views/system/report/dailyFeeReport.vue

@@ -4,21 +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">
-            <div class="flex justify-between">
-              <div>
-                <el-form-item label="项目" prop="chargeItemId">
-                  <el-select v-model="queryParams.villageId" placeholder="请选择">
-                    <el-option v-for="item in villageList" :key="item.villageId" :label="item.villageName" :value="item.villageId" />
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="房屋类型" prop="houseUseTypeId">
-                  <el-select v-model="queryParams.houseUseTypeId" placeholder="请选择">
-                    <el-option v-for="item in houseUseList" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="客户" prop="customerName">
-                  <el-input v-model.trim="queryParams.customerName"></el-input>
+          <el-form label-width="auto" ref="queryFormRef" :model="queryParams" @submit.prevent="handleQuery" :inline="true">
+            <div class="flex justify-between flex-wrap">
+              <div v-for="(item, index) in queryParamsList" :key="index">
+                <el-form-item :label="item[ite].label" :prop="item[ite].parameter" v-for="(ite, ind) in Object.keys(item)" :key="ind">
+                  <el-input v-model.trim="queryParams[item[ite].parameter]" :placeholder="item[ite].placeholder"></el-input>
                 </el-form-item>
               </div>
               <div>
@@ -114,7 +104,7 @@ 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 { getDailyFeeReportList } from '@/api/system/report/dailyFeeReport';
+import { getDailyFeeReportDynamicList, getDailyFeeReportList } from '@/api/system/report/dailyFeeReport';
 import { Datum } from '@/api/system/report/dailyFeeReport/type';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -124,18 +114,6 @@ const showSearch = ref(true);
 const total = ref(0);
 
 const queryFormRef = ref<ElFormInstance>();
-const data = reactive({
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    villageId: '',
-    houseUseTypeId: '',
-    customerName: ''
-  }
-});
-
-const { queryParams } = toRefs(data);
-
 // 查询小区
 const villageList = ref([]);
 function getAllVillage() {
@@ -152,6 +130,42 @@ function getHouseUseList() {
   });
 }
 
+const queryParams = ref({
+  pageNum: 1,
+  pageSize: 10
+});
+
+// 参数列表
+const queryParamsList = ref([]);
+
+function getQueryParams() {
+  getDailyFeeReportDynamicList().then((res) => {
+    const obj = {};
+    const list = res.data.map((item) => {
+      const obj2 = {};
+      const list = item.field.split(',') ?? [];
+      console.log(list);
+      list.forEach((item2) => {
+        obj[item2] = '';
+        obj2[item2] = {
+          label: item.label,
+          parameter: item2,
+          placeholder: item.placeholder,
+          type: item.type,
+          subField: item.subField
+        };
+      });
+      return obj2;
+    });
+    queryParams.value = {
+      ...queryParams.value,
+      ...obj
+    };
+    queryParamsList.value = list;
+    console.log(list);
+  });
+}
+
 const rowChargeTypesList = ref([]);
 
 /** 查询电抄记录列表 */
@@ -166,7 +180,7 @@ const getList = async () => {
   });
   getDailyFeeReportList(search)
     .then((res) => {
-      ArrearsDetailList.value = [...res.rows];
+      ArrearsDetailList.value = [...(res.rows ?? [])];
       rowChargeTypesList.value = Object.keys(res.rows[0].chargeTypeAmounts);
       total.value = res.total;
     })
@@ -193,10 +207,7 @@ const resetQuery = () => {
   queryFormRef.value?.resetFields();
   queryParams.value = {
     pageNum: 1,
-    pageSize: 10,
-    villageId: '-1',
-    houseUseTypeId: '',
-    customerName: ''
+    pageSize: 10
   };
   handleQuery();
 };
@@ -285,6 +296,7 @@ onMounted(() => {
   getList();
   getHouseUseList();
   getAllVillage();
+  getQueryParams();
 });
 </script>