fix: 分页问题的修改

src/api/card/index.js

@@ -1,64 +1,73 @@
-import request from '@/utils/request'
+import request from '@/utils/request';
 
 // 列表
-export const getCardList = query => {
+export const getCardList = (query) => {
   return request({
     url: '/wpr/card/list',
     method: 'get',
     params: query
   });
-}
+};
 
 // 新增
-export const addCard = data => {
+export const addCard = (data) => {
   return request({
     url: '/wpr/card/add',
     method: 'post',
     data
-  }) 
-}
+  });
+};
 
 // 修改
-export const editCard = data => {
+export const editCard = (data) => {
   return request({
     url: '/wpr/card/edit',
     method: 'put',
     data
-  }) 
-}
+  });
+};
 
 // 删除
-export const deleteCard = farmerIds => {
+export const deleteCard = (farmerIds) => {
   return request({
     url: '/wpr/card/delete/',
     method: 'delete',
     params: farmerIds
-  }) 
-}
+  });
+};
 
 // 详情
-export const getCardDetail = query => {
+export const getCardDetail = (query) => {
   return request({
     url: '/wpr/card/info',
     method: 'get',
     params: query
-  }) 
-}
+  });
+};
 
 // 充值
-export const rechargeCard = data => {
+export const rechargeCard = (data) => {
   return request({
     url: '/wpr/card/recharge',
     method: 'post',
     data
-  }) 
-}
+  });
+};
 
 // 充值记录
-export const getRechargercdList = query => {
+export const getRechargercdList = (query) => {
   return request({
     url: '/wpr/rechargercd/list',
     method: 'get',
     params: query
-  }) 
-}
+  });
+};
+
+// 灌溉记录
+export const getCardusercdList = (query) => {
+  return request({
+    url: '/wpr/cardusercd/list',
+    method: 'get',
+    params: query
+  });
+};

src/views/dataReport/components/report.vue

@@ -1,135 +0,0 @@
-<template>
-  <div>
-    <el-card style="height: 100%; overflow-y: auto">
-      <el-col :span="24" class="elrow-main__col-top">
-        <div>
-          <slot name="headerLeft" />
-        </div>
-        <div class="top-left">
-          <slot name="headerRight" />
-          </div>
-      </el-col>
-      <el-col :span="24" class="elrow-main__col-bottom">
-        <b-table
-          ref="tableRef"
-          :args="{ 'highlight-current-row': true }"
-          :data="loadData"
-          :columns="columns"
-          isShowIndex
-        >
-          <template #operate="scope">
-            <el-link
-              size="small"
-              :underline="false"
-              type="primary"
-              style="margin-right: 10px"
-              @click="download(scope.row)"
-              >下载</el-link
-            >
-            <el-link
-            size="small"
-            :underline="false"
-            type="danger"
-            style="margin-right: 10px"
-            @click="download(scope.row)"
-            >删除</el-link
-          >
-          </template>
-        </b-table>
-      </el-col>
-    </el-card>
-  </div>
-</template>
-
-<script>
-import { getAreaList } from '@/api/statistics/index.js'
-import BTable from '@/components/Table/index.vue';
-
-export default {
-  name:"report",
-  props: {
-    columns:{
-      type: Array,
-      default: []
-    },
-    currentClickId: {
-      type: Number | String
-    },
-    currentYear: {
-      type: Number | String
-    }
-  },
-  components: { BTable },
-  data() {
-    return {
-      loading: false,
-      associationManageShow: false,
-    };
-  },
-  methods: {
-    addAssociation() {
-      this.associationManageShow = true
-    },
-    loadData() {
-      return this.getTableData();
-    },
-    getTableData() {
-      return Promise.resolve({
-        data: [{
-          person:"王大虎",
-          area: '2016-05-02',
-          name: '王小虎',
-          phone: 1588888888,
-          address: '上海市普陀区金沙江路 1518 弄'
-        }, {
-          person:"王大虎",
-          area: '2016-05-04',
-          name: '王小虎',
-          phone: 1588888888,
-          address: '上海市普陀区金沙江路 1517 弄'
-        }, {
-          person:"王大虎",
-          area: '2016-05-01',
-          name: '王小虎',
-          phone: 1588888888,
-          address: '上海市普陀区金沙江路 1519 弄'
-        }, {
-          person:"王大虎",
-          area: '2016-05-03',
-          name: '王小虎',
-          phone: 1588888888,
-          address: '上海市普陀区金沙江路 1516 弄'
-        }]
-      })
-    },
-    handleSearch() {
-      this.$refs.tableRef.refresh(true);
-    },
-    goDetail(row) {
-      this.$refs.sourceCodeDetail.open(row.tarcecodeapplyBatchno)
-    },
-    download(row) {
-    }
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.elrow-main__col-top {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-bottom: 15px;
-  .top-left {
-    height: 100%;
-    display: flex;
-    align-items: center;
-    i {
-      background-color: #40d5ec;
-      height: 45%;
-      width: 5px;
-      margin-right: 5px;
-    }
-  }
-}
-</style>

src/views/dataReport/intakeWaterAnalysis.vue

@@ -61,11 +61,11 @@ import { getAreaList } from '@/api/statistics/index.js'
 import { getTree } from '@/api/tree.js'
 import BTable from '@/components/Table/index.vue';
 import DataReportLeft from '@/components/DataReportLeft/index.vue'
-import Report from './components/report.vue'
+import { assign, omit } from 'lodash-es';
 
 export default {
   name:"waterManage",
-  components: { BTable,DataReportLeft,Report},
+  components: { BTable,DataReportLeft},
   data() {
     return {
       activeName:'first',
@@ -126,7 +126,7 @@ export default {
     handleSearch() {
       this.$refs.tableRef.refresh(true);
     },
-    async loadData() {
+    async loadData(parameter) {
       this.setYear()
       if (!this.currentClickId) {
         const treeList = this.$store.state.tree.treeList
@@ -141,7 +141,12 @@ export default {
         this.currentClick = res?.data[0]
         this.currentClickId = this.currentClick?.cusareaId
       }
-      return this.getTableData(this.currentClickId);
+      const params = {
+        areaId: this.currentClickId,
+        year: this.currentYear
+      }
+      const payload = omit(assign({}, parameter, params), []);
+      return getAreaList(payload);
     },
     downloadHandler() {
       this.download(
@@ -152,15 +157,6 @@ export default {
         `FmsCrop_${new Date().getTime()}.xlsx`
       );
     },
-    getTableData(areaId) {
-      this.queryParams = {
-        areaId,
-        year: this.currentYear
-      }
-      return getAreaList({
-        ...this.queryParams
-      })
-    },
     setYear() {
       let date = new Date
       let currentYear = date.getFullYear()

src/views/dataReport/saveWaterAnalysis.vue

@@ -40,11 +40,11 @@ import { getFarmerList } from '@/api/statistics/index.js'
 import { getTree } from '@/api/tree.js'
 import BTable from '@/components/Table/index.vue';
 import DataReportLeft from '@/components/DataReportLeft/index.vue'
-import Report from './components/report.vue'
+import { assign, omit } from 'lodash-es';
 
 export default {
   name: "waterManage",
-  components: { BTable, DataReportLeft, Report },
+  components: { BTable, DataReportLeft },
   data() {
     return {
       activeName: 'first',
@@ -110,7 +110,7 @@ export default {
     handleSearch() {
       this.$refs.tableRef.refresh(true);
     },
-    async loadData() {
+    async loadData(parameter) {
       this.setYear()
       if (!this.currentClickId) {
         const treeList = this.$store.state.tree.treeList
@@ -125,14 +125,13 @@ export default {
         this.currentClick = res?.data[0]
         this.currentClickId = this.currentClick?.cusareaId
       }
-      return this.getTableData(this.currentClickId);
-    },
-    getTableData(areaId) {
-      return getFarmerList({
-        areaId,
+      const params = {
+        areaId: this.currentClickId,
         year: this.currentYear,
         keyword: this.keyword
-      })
+      }
+      const payload = omit(assign({}, parameter, params), []);
+      return getFarmerList(payload);
     },
     setYear() {
       let date = new Date

src/views/dataReport/waterConsumption.vue

@@ -44,11 +44,11 @@ import { getWaterList } from '@/api/statistics/index.js'
 import { getTree } from '@/api/tree.js'
 import BTable from '@/components/Table/index.vue';
 import DataReportLeft from '@/components/DataReportLeft/index.vue'
-import Report from './components/report.vue'
+import { assign, omit } from 'lodash-es';
 
 export default {
   name: "waterConsumption",
-  components: { BTable, DataReportLeft, Report },
+  components: { BTable, DataReportLeft },
   data() {
     return {
       currentYear: '',
@@ -105,7 +105,7 @@ export default {
         `FmsCrop_${new Date().getTime()}.xlsx`
       );
     },
-    async loadData() {
+    async loadData(parameter) {
       if (!this.currentClickId) {
         const treeList = this.$store.state.tree.treeList
         let res = []
@@ -119,17 +119,16 @@ export default {
         this.currentClick = res?.data[0]
         this.currentClickId = this.currentClick?.cusareaId
       }
-      return this.getTableData(this.currentClickId);
-    },
-    getTableData(areaId) {
+      
       const [startTime, endTime] = this.dateValue ??= []
-      this.queryParams = {
-        areaId,
+       const params = {
+        areaId: this.currentClickId,
         startTime,
         endTime,
         keyword: this.keyword
       }
-      return getWaterList({...this.queryParams })
+      const payload = omit(assign({}, parameter, params), []);
+      return getWaterList(payload);
     },
     setCurrentData(areaId) {
       this.currentClickId = areaId

src/views/infrastructure/components/setAnnualWaterRight.vue

@@ -145,7 +145,7 @@ export default {
       default: false
     },
     editRow: {
-      type: Object,
+      type: Object
     }
   },
   components: {

src/views/infrastructure/deviceSetup.vue

@@ -43,7 +43,6 @@
             :data="loadData"
             :columns="columns"
             isShowIndex
-            :showPagination="loadData.length"
           >
             <template #status="scope">
               <span style="display:flex;align-items:center;justify-content:center">
@@ -98,6 +97,7 @@ import { getTree } from '@/api/tree.js'
 import BTable from '@/components/Table/index.vue';
 import DataReportLeft from '@/components/DataReportLeft/index.vue'
 import setPreferencs from './components/setPreferenc.vue'
+import { assign, omit } from 'lodash-es';
 
 export default {
   name: 'deviceSetup',
@@ -168,7 +168,7 @@ export default {
       })
       this.userList = res.data
     },
-    async loadData() {
+    async loadData(parameter) {
       if (!this.currentClickId) {
         const treeList = this.$store.state.tree.treeList
         let res = []

src/views/infrastructure/waterElectricityPriceSetting.vue

@@ -141,6 +141,7 @@ import { Waterchargingtype, Electricitychargingtype } from './status'
 import setAnnualWaterRight from './components/setAnnualWaterRight.vue'
 import { getPriceList, deletePrice } from '@/api/price/index.js'
 import { getTree } from '@/api/tree.js'
+import { assign, omit } from 'lodash-es';
 
 export default {
   name: 'waterElectricityPriceSetting',
@@ -294,8 +295,14 @@ export default {
           this.priceconfigElectricitychargingtype = ''
       }
     },
-    loadData() {
-      return this.getTableData();
+    loadData(parameter) {
+      const params = {
+        areaId: this.areaId,
+        priceconfigWaterchargingtype: this.priceconfigWaterchargingtype,
+        priceconfigElectricitychargingtype: this.priceconfigElectricitychargingtype
+      }
+      const payload = omit(assign({}, parameter, params), []);
+      return getPriceList(payload)
     },
     getTableData() {
       const params = {

src/views/peasantHouseholdManage/index.vue

@@ -49,38 +49,12 @@
             :columns="columns"
             isShowIndex
           >
-            <template #styleImg="scope">
-              <el-image
-                :src="scope.row.imgPreview"
-                :preview-src-list="[scope.row.imgPreview]"
-                slot="error"
-                class="image-slot"
-                style="width: 100px; height: 50px"
-              >
-                <div slot="error" class="image-slot"></div>
-              </el-image>
-            </template>
-            <template #codeNo="scope">
-              <el-link
-                type="primary"
-                :underline="false"
-                @click="goDetail(scope.row)"
-                >{{ scope.row.traceCodeApplyConcat }}</el-link
-              >
-            </template>
             <template #status="scope">
               <span style="display:flex;align-items:center;justify-content:center">
                 <span class="status"></span>
                 {{ scope.row.name }}
               </span>
             </template>
-            <template #useNumber="scope">
-              {{ scope.row.useNumber + '/' + scope.row.totalNumber }}
-            </template>
-            <template #finishGoodName="scope">
-              {{ scope.row.finishGoodName&&scope.row.finishgoodNo?scope.row.finishGoodName + '-' + scope.row.finishgoodNo:'' }}
-            </template>
-
             <template #operate="scope">
               <el-link
                 size="small"
@@ -141,6 +115,7 @@ import DataReportLeft from '@/components/DataReportLeft/index.vue'
 import AddedFarmers from './components/addedFarmers.vue'
 import FarmerManagement from './components/farmerManagement.vue';
 import IrrigationRecord from './components/IrrigationRecord.vue';
+import { assign, omit } from 'lodash-es';
 
 export default {
   name: 'peasantHouseholdManage',
@@ -221,7 +196,7 @@ export default {
       })
       this.detailsData = res?.data
     },
-    async loadData() {
+    async loadData(parameter) {
       if(!this.currentClickId ) {
         const treeList = this.$store.state.tree.treeList
         let res = []
@@ -235,13 +210,12 @@ export default {
         this.currentClick = res?.data[0]
         this.currentClickId = this.currentClick?.cusareaId
       }
-      return this.getFarmerList(this.farmerName, this.currentClickId)
-    },
-    getFarmerList(farmerName,areaId) {
-      return getFarmerList({
-        farmerName,
-        areaId
-      })
+      const params = {
+        farmerName: this.farmerName,
+        areaId: this.currentClickId
+      }
+      const payload = omit(assign({}, parameter, params), []);
+      return getFarmerList(payload)
     },
     setCurrentData(areaId) {
       this.currentClickId = areaId

src/views/waterCardManage/dataDetail.vue

@@ -31,7 +31,7 @@
       </el-row>
       <div style="text-align:right;position:relative;z-index:1000">
         <el-date-picker
-          v-model="time"
+          v-model="dateValue"
           clearable
           value-format="yyyy-MM-dd HH:MM:SS"
           type="daterange"
@@ -46,41 +46,10 @@
           <b-table
             ref="tableRef"
             :args="{ 'highlight-current-row': true }"
-            :data="rechargercdList"
-            :columns="columns"
+            :data="cardusercdList"
+            :columns="columns1"
             isShowIndex
-            :showPagination="!rechargercdList.length"
           >
-            <template #styleImg="scope">
-              <el-image
-                :src="scope.row.imgPreview"
-                :preview-src-list="[scope.row.imgPreview]"
-                slot="error"
-                class="image-slot"
-                style="width: 100px; height: 50px"
-              >
-                <div slot="error" class="image-slot"></div>
-              </el-image>
-            </template>
-            <template #codeNo="scope">
-              <el-link
-                type="primary"
-                :underline="false"
-                @click="goDetail(scope.row)"
-                >{{ scope.row.traceCodeApplyConcat }}</el-link
-              >
-            </template>
-            <template #status="scope">
-              <span style="display:flex;align-items:center;justify-content:center">
-                {{ scope.row.name }}
-              </span>
-            </template>
-            <template #useNumber="scope">
-              {{ scope.row.useNumber + '/' + scope.row.totalNumber }}
-            </template>
-            <template #finishGoodName="scope">
-              {{ scope.row.finishGoodName&&scope.row.finishgoodNo?scope.row.finishGoodName + '-' + scope.row.finishgoodNo:'' }}
-            </template>
           </b-table>
         </el-tab-pane>
         <el-tab-pane label="充值记录">
@@ -88,20 +57,9 @@
             ref="tableRechargercd"
             :args="{ 'highlight-current-row': true }"
             :data="rechargercdList"
-            :columns="columns"
+            :columns="columns2"
             isShowIndex
           >
-            <template #styleImg="scope">
-              <el-image
-                :src="scope.row.imgPreview"
-                :preview-src-list="[scope.row.imgPreview]"
-                slot="error"
-                class="image-slot"
-                style="width: 100px; height: 50px"
-              >
-                <div slot="error" class="image-slot"></div>
-              </el-image>
-            </template>
             <template #ICCard="scope">
               {{ scope }}
               <b-table
@@ -113,14 +71,6 @@
               >
               </b-table>
             </template>
-            <template #codeNo="scope">
-              <el-link
-                type="primary"
-                :underline="false"
-                @click="goDetail(scope.row)"
-                >{{ scope.row.traceCodeApplyConcat }}</el-link
-              >
-            </template>
             <template #rechargercdRechargeamount="scope">
               <el-link
                 type="primary"
@@ -131,17 +81,6 @@
             <template #cardAmount="scope">
               {{ Number(scope.row.cardAmount).toFixed(2) }}
             </template>
-            <template #status="scope">
-              <span style="display:flex;align-items:center;justify-content:center">
-                {{ scope.row.name }}
-              </span>
-            </template>
-            <template #useNumber="scope">
-              {{ scope.row.useNumber + '/' + scope.row.totalNumber }}
-            </template>
-            <template #finishGoodName="scope">
-              {{ scope.row.finishGoodName&&scope.row.finishgoodNo?scope.row.finishGoodName + '-' + scope.row.finishgoodNo:'' }}
-            </template>
           </b-table>
         </el-tab-pane>
       </el-tabs>
@@ -150,7 +89,7 @@
 </template>
 
 <script>
-import { getCardDetail,getRechargercdList } from '@/api/card/index.js'
+import { getCardDetail,getRechargercdList, getCardusercdList } from '@/api/card/index.js'
 import BTable from '@/components/Table/index.vue';
 export default {
   name: 'dataDetail',
@@ -165,8 +104,70 @@ export default {
   data() {
     return {
       baseForm: {},
-      time:'',
-      columns: [
+      dateValue: '',
+      columns1: [
+        {
+          label: '水源编号',
+          prop: 'waterNum',
+          customRender: '',
+          align: 'center',
+        },
+        {
+          label: '水源名称',
+          prop: 'waterName',
+          customRender: '',
+          align: 'center'
+        },
+        {
+          label: '本次耗水量（m³）',
+          prop: 'cardusercdWaternum',
+          customRender: '',
+          align: 'center'
+        },
+        {
+          label: '本次用水量（°）',
+          prop: 'cardusercdWaternum',
+          customRender: '',
+          align: 'center'
+        },
+        {
+          label: '开始时间',
+          prop: 'cardusercdStarttime',
+          customRender: '',
+          align: 'center'
+        },
+        {
+          label: '结束时间',
+          prop: 'cardusercdEndtime',
+          customRender: '',
+          align: 'center'
+        },
+        {
+          label: '使用时长',
+          prop: 'cardusercdDuration',
+          customRender: '',
+          align: 'center'
+        },
+        {
+          label: '计费方式',
+          prop: 'cardusercdBillingtype',
+          customRender: '',
+          align: 'center'
+        },
+        {
+          label: '计费标准',
+          prop: 'cardusercdPriceinfo',
+          customRender: '',
+          align: 'center'
+        },
+        {
+          label: '扣除金额',
+          prop: 'cardusercdUsemoney',
+          customRender: '',
+          align: 'center'
+        }
+      ],
+      columns2: [
         {
           label: 'IC卡号',
           prop: 'cardNo',
@@ -203,10 +204,25 @@ export default {
       this.baseForm = res.data
       return this.getRechargercdData(res.data);
     },
+    async cardusercdList() { 
+      const res = await getCardDetail({
+        cardId: this.detailCardId
+      })
+      this.baseForm = res.data
+      return this.getCardusercdListHandler(res.data)
+    },
+    getCardusercdListHandler(payload) { 
+      const { cardId } = payload
+      const [startTime, endTime] = this.dateValue ??= []
+      return getCardusercdList({
+        cardId,
+        startTime,
+        endTime
+      })
+    },
     getRechargercdData(payload) {
       const {farmerId,cardNo,cardId} = payload
-      const startTime = this.time[0] || ''
-      const endTime = this.time[1] || ''
+      const [startTime, endTime] = this.dateValue ??= []
       return getRechargercdList({
         farmerId,
         cardNo,
@@ -218,29 +234,6 @@ export default {
     backPage() {
       this.$emit("backPage")
     },
-    goProductsPage() {
-      this.handleClose();
-      this.$router.push({
-        path: '/Products',
-        query: {}
-      });
-    },
-    goSourceInfoPage() {
-      this.handleClose();
-      this.$router.push({
-        path: '/sourceInfo',
-        query: {
-          type: 'add'
-        }
-      });
-    },
-    goProcessPage() {
-      this.handleClose();
-      this.$router.push({
-        path: '/basicsettings/process',
-        query: {}
-      });
-    },
     resetForm(formName) {
       this.$refs[formName].resetFields();
       this.resetFormData();

src/views/waterCardManage/index.vue

@@ -165,6 +165,7 @@ import DataReportLeft from '@/components/DataReportLeft/index.vue'
 import AddedICCard from './components/addedICCard.vue'
 import RechargeCard from './components/rechargeCard.vue';
 import DataDetail from './dataDetail.vue';
+import { assign, omit } from 'lodash-es';
 
 export default {
   name: 'waterCardManage',
@@ -306,7 +307,7 @@ export default {
     async addICard() {
       this.associationManageShow = true
     },
-    async loadData() {
+    async loadData(parameter) {
       if(!this.currentClickId ) {
         const treeList = this.$store.state.tree.treeList
         let res = []
@@ -321,14 +322,14 @@ export default {
         this.currentClickId = this.currentClick?.cusareaId
       }
       this.searchHandler(this.farmerName,this.currentClickId)
-      return this.getTableData(this.currentClickId);
+      return this.getTableData(parameter,this.currentClickId);
     },
     changeDataDetailShow(row) {
       this.detailType = true
       const {cardId} = row
       this.detailCardId = cardId
     },
-    getTableData(areaId) {
+    getTableData(parameter,areaId) {
       switch(this.labelType){
         case 0:
           this.farmerPhone = this.inputContent
@@ -342,13 +343,15 @@ export default {
         default:
           this.farmerPhone = this.inputContent
       }
-      return getCardList({
-        farmerName:this.farmerName,
-        cardNo:this.cardNo,
+      const params = {
+        farmerName: this.farmerName,
+        cardNo: this.cardNo,
         farmerPhone: this.farmerPhone,
         areaId,
         cardStatus: this.cardStatus
-      })
+      }
+      const payload = omit(assign({}, parameter, params), []);
+      return getCardList(payload)
     },
     handleSearch() {
       this.$refs.tableRef.refresh(true);

src/views/waterManage/index.vue

@@ -85,6 +85,7 @@ import AssociationManage from './component/associationManage.vue'
 import SelectTree from '@/components/SelectTree';
 import { getTree } from '@/api/tree.js'
 import { Message } from 'element-ui'
+import { assign, omit } from 'lodash-es';
 
 export default {
   name:"waterManage",
@@ -165,7 +166,7 @@ export default {
           })
       })
     },
-    async loadData() {
+    async loadData(parameter) {
       if (!this.areaId) {
         const treeList = this.$store.state.tree.treeList
         let res = []
@@ -179,13 +180,12 @@ export default {
         this.cusareaName ||= this.treeData[0].cusareaName
         this.areaId = this.treeData[0].cusareaId
       }
-      return this.getWaterrightListHandler()
-    },
-    getWaterrightListHandler() {
-      return getAssocList({
+      const params = {
         assocName: this.assocName,
         areaId: this.areaId
-      })
+      }
+      const payload = omit(assign({}, parameter, params), []);
+      return getAssocList(payload)
     },
     handlerClick(value) {
       this.areaId = value?.cusareaId

src/views/waterMarket/index.vue

@@ -98,6 +98,7 @@ import { getFarmerList } from '@/api/farmer/list.js'
 import { getTrxrcdList } from '@/api/trxrcd/index.js'
 import BTable from '@/components/Table/index.vue';
 import WaterDeal from './component/waterDeal.vue'
+import { assign, omit } from 'lodash-es';
 
 export default {
   name:'waterMarket',
@@ -159,10 +160,10 @@ export default {
     addAssociation() {
       this.associationManageShow = true
     },
-    loadData() {
-      return this.getTableData();
+    loadData(parameter) {
+      return this.getTableData(parameter);
     },
-    getTableData() {
+    getTableData(parameter) {
       if (this.roleType == '0') {
         this.buyerName = this.trxrcdName
         this.sellerName = ''
@@ -178,8 +179,8 @@ export default {
         startTime,
         endTime,
       }
-      console.log(params, 'dateValuedateValue')
-      return getTrxrcdList(params)
+      const payload = omit(assign({}, parameter, params), []);
+      return getTrxrcdList(payload)
     },
     addSuccessHandler() { 
       this.handleSearch()

src/views/waterSubsidy/index.vue

@@ -93,6 +93,7 @@ import BTable from '@/components/Table/index.vue';
 import { getTree } from '@/api/tree.js'
 import newPolicy from './components/newPolicy.vue'
 import { Message } from 'element-ui'
+import { assign, omit } from 'lodash-es';
 
 export default {
   name:'waterSubsidy',
@@ -160,7 +161,7 @@ export default {
       this.policyType = 'add'
       this.showPolicy = true
     },
-    async loadData() {
+    async loadData(parameter) {
       if (!this.areaId) {
         const treeList = this.$store.state.tree.treeList
         let res = []
@@ -174,13 +175,12 @@ export default {
         this.cusareaName ||= this.treeData[0].cusareaName
         this.areaId = this.treeData[0].cusareaId
       }
-      return this.getWaterrightListHandler()
-    },
-    getWaterrightListHandler() {
-      return getSubsidyPolicy({
+      const params = {
         areaIds: this.areaId,
         subsidypolicyTitle: this.subsidypolicyTitle
-      })
+      }
+      const payload = omit(assign({}, parameter, params), []);
+      return getSubsidyPolicy(payload)
     },
     handlerClick(value) {
       this.areaId = value?.cusareaId