Jelajahi Sumber

轮胎商城付款 2023-12-07

caojunjie 1 tahun lalu
induk
melakukan
5f1c6d2eba

+ 13 - 6
src/components/bill/selectOrderDetailList.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <avue-crud :option="option" :table-loading="loading" :data="data" :search.sync="search" ref="crud"
-      @refresh-change="refreshChange" @selection-change="selectionChange" @search-change="searchChange"
+      @refresh-change="refreshChange" @selection-change="selectionChange" @search-change="searchChange" @search-reset="searchReset"
       @saveColumn="saveColumn" :page.sync="page" @on-load="onLoad">
       <template slot="costTypeSearch">
         <breakdown-select v-model="search.costType" :configuration="breakConfiguration"></breakdown-select>
@@ -120,11 +120,18 @@ export default {
     refreshChange() {
       this.onLoad(this.page);
     },
+    searchReset(){
+       this.onLoad(this.page,this.params);
+    },
     searchChange(params, done) {
       if (params.createStart) {
         params.createStartDate = params.createStart[0]
         params.createEndDate = params.createStart[1]
       }
+        params = {
+            ...this.params,
+            ...params,
+        }
       this.onLoad(this.page, params);
       done()
     },
@@ -143,11 +150,11 @@ export default {
         if (params.customerId != this.params.customerId) {
             this.params = params
         }
-      params = {
-        // ...params,
-          ...page,
-          ...this.params
-      }
+      // params = {
+      //   // ...params,
+      //     ...page,
+      //     ...this.params
+      // }
 
     // ...this.params 使用之前的老数据 回请求之前的ID造成数据不对
       params.billType = this.billType

+ 15 - 6
src/components/bill/selectOrderDetailListCG.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <avue-crud :option="option" :table-loading="loading" :data="data" :search.sync="search" ref="crud"
-      @refresh-change="refreshChange" @selection-change="selectionChange" @search-change="searchChange"
+      @refresh-change="refreshChange" @selection-change="selectionChange" @search-change="searchChange" @search-reset="searchReset"
       @saveColumn="saveColumn" :page.sync="page" @on-load="onLoad">
       <template slot="costTypeSearch">
         <breakdown-select v-model="search.costType" :configuration="breakConfiguration"></breakdown-select>
@@ -120,11 +120,19 @@ export default {
     refreshChange() {
       this.onLoad(this.page);
     },
+    // 清空
+    searchReset(){
+        this.onLoad(this.page,this.params);
+    },
     searchChange(params, done) {
       if (params.createStart) {
         params.createStartDate = params.createStart[0]
         params.createEndDate = params.createStart[1]
       }
+        params = {
+          ...this.params,
+          ...params,
+        }
       this.onLoad(this.page, params);
       done()
     },
@@ -133,6 +141,7 @@ export default {
       this.goodsListSave = row
     },
     onLoad(page, params) {
+        console.log(page,params,140)
       if(params && params.rentStartDate ){
         params.createStartDate = params.rentStartDate[0] + " " + "00:00:00"?params.rentStartDate[0] + " " + "00:00:00":'';
         params.createEndDate = params.rentStartDate[1] + " " + "23:59:59"?params.rentStartDate[1] + " " + "23:59:59":'';
@@ -143,11 +152,11 @@ export default {
         if (params.customerId != this.params.customerId) {
             this.params = params
         }
-      params = {
-        // ...params,
-          ...page,
-          ...this.params
-      }
+      // params = {
+      //   // ...params,
+      //     ...page,
+      //     ...this.params
+      // }
 
     // ...this.params 使用之前的老数据 回请求之前的ID造成数据不对
       params.billType = this.billType

+ 3 - 3
src/views/tirePartsMall/financialManagement/paymentSettlement/detailsPage.vue

@@ -353,9 +353,9 @@ export default {
       // 调用一次弹窗的方法,防止不刷新数据
         let page = {
             pageSize: 20,
-                pagerCount: 1,
-                total: 0,
-                pageSizes: [20, 200, 300, 500, 700, 1000]
+            pagerCount: 1,
+            total: 0,
+            pageSizes: [20, 200, 300, 500, 700, 1000]
         }
         this.$refs.billDetailRef.onLoad(page,this.params)