吉永收款结算10.12

src/components/bill/billDetailList.vue

@@ -2,6 +2,7 @@
   <div>
     <avue-crud :option="option" :table-loading="loading" :data="data" :search.sync="search" ref="crud"
       @refresh-change="refreshChange" @selection-change="selectionChange" @search-change="searchChange"
+               @size-change="sizeChange" @current-change="currentChange"
       @saveColumn="saveColumn" :page.sync="page" @on-load="onLoad" :summary-method="summaryMethod">
       <template slot="costTypeSearch">
         <breakdown-select v-model="search.costType" :configuration="breakConfiguration"></breakdown-select>
@@ -164,6 +165,7 @@ export default {
       this.onLoad(this.page);
     },
     searchChange(params, done) {
+          this.page.currentPage = 1
       if (params.createStart) {
         params.createStartDate = params.createStart[0]
         params.createEndDate = params.createStart[1]
@@ -171,35 +173,52 @@ export default {
       this.onLoad(this.page, params);
       done()
     },
+      currentChange(currentPage){
+          this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize){
+          this.page.pageSize = pageSize;
+      },
+
     selectionChange(row) {
       // this.selectList = row
       this.goodsListSave = row
     },
     onLoad(page, params) {
-
+        params = params?params:this.search
+        console.log(params,189)
           // 堆存日期搜索
       if(params && params.rentStartDate ){
         params.rentStartDateList = params.rentStartDate
         this.$delete(params, 'rentStartDate')
+      }else {
+          this.$delete(params, 'rentStartDateList')
       }
+        console.log(params)
+        console.log(params.createTime,'params.createTime')
       // 生成账单日期搜索
-        if(params && params.createTime ){
+        console.log(params && params.createTime)
+        if(params && params.createTime?params.createTime.length > 0:false){
             params.createStartDate = params.createTime[0] + " " + "00:00:00"?params.createTime[0] + " " + "00:00:00":'';
             params.createEndDate = params.createTime[1] + " " + "23:59:59"?params.createTime[1] + " " + "23:59:59":'';
             this.$delete(params, 'createTime')
+        }else {
+            this.$delete(params, 'createStartDate')
+            this.$delete(params, 'createEndDate')
         }
-
       this.loading = true;
       params = {
-        ...params,
-        ...this.params
+        ...this.params,
+          ...params,
       }
       params.billType = this.billType
       if (this.$store.getters.userInfo.tenant_id === "673511") {
         params.type = "CMY"
       }
       params.flag = this.flag
+        console.log(params,214)
       getBillList(page.currentPage, page.pageSize, params).then(res => {
+          console.log(res.data,224)
         this.data = res.data.data.records
         this.page.total = res.data.data.total
       }).finally(() => {