lilei 1 gadu atpakaļ
vecāks
revīzija
eac94f8d75

+ 2 - 2
src/components/Table/index.js

@@ -168,9 +168,9 @@ export default {
      */
     loadData (pagination, filters, sorter) {
       this.localLoading = true
-      console.log(sorter)
+      console.log(pagination,this.localPagination)
       const parameter = Object.assign({
-        pageNo: (pagination && pagination.current) ||
+        pageNo: this.showPagination && pagination && pagination.pageSize != this.localPagination.pageSize ? 1 : (pagination && pagination.current) ||
           this.showPagination && this.localPagination.current || this.pageNum,
         pageSize: (pagination && pagination.pageSize) ||
           this.showPagination && this.localPagination.pageSize || this.pageSize,

+ 2 - 2
src/views/promotionRulesManagement/dealerPromotions/chooseProductsModal.vue

@@ -41,7 +41,7 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-                <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="chooseProducts-refresh">查询</a-button>
+                <a-button type="primary" @click="$refs.table.refresh()" :disabled="disabled" id="chooseProducts-refresh">查询</a-button>
                 <a-button style="margin-left: 5px" @click="resetData" :disabled="disabled" id="chooseProducts-reset">重置</a-button>
               </a-col>
             </a-row>
@@ -185,7 +185,7 @@ export default {
       this.queryParam.productTypeSn3 = ''
       this.queryParam.productType = []
       this.$nextTick(() => {
-        this.$refs.table.refresh()
+        this.$refs.table.refresh(true)
       })
     },
     //  清空选项

+ 2 - 2
src/views/salesReturnManagement/custConfirm/list.vue

@@ -41,8 +41,8 @@
           size="small"
           :rowKey="(record) => record.id"
           :row-selection="{ columnWidth: 40 }"
-          :pagination="{pageSizeOptions: ['10','20','30','40']}"
-          :pageSize="20"
+          :pagination="{pageSizeOptions: ['50','100','200','300','400']}"
+          :pageSize="50"
           @rowSelection="rowSelectionFun"
           :columns="columns"
           :data="loadData"