lilei 1 год назад
Родитель
Сommit
7bcd2df2bc
2 измененных файлов с 24 добавлено и 8 удалено
  1. 14 5
      src/components/Table/index.js
  2. 10 3
      src/views/inventoryManagement/inventoryQuery/list.vue

+ 14 - 5
src/components/Table/index.js

@@ -10,6 +10,7 @@ export default {
       localLoading: false,
       localDataSource: [],
       localPagination: Object.assign({}, this.pagination),
+      sortObj: null,
       isSucceed: true ,//  是否请求成功
       leftAlignId:"",
     }
@@ -153,6 +154,7 @@ export default {
       this.localLoading = false
       this.localDataSource = []
       this.needTotalList = []
+      this.sortObj = null
       this.clearSelected()
       this.localPagination = Object.assign({}, {
         current: 1, pageSize: this.pageSize, total: 0
@@ -166,6 +168,7 @@ export default {
      */
     loadData (pagination, filters, sorter) {
       this.localLoading = true
+      console.log(sorter)
       const parameter = Object.assign({
         pageNo: (pagination && pagination.current) ||
           this.showPagination && this.localPagination.current || this.pageNum,
@@ -174,16 +177,22 @@ export default {
         tableId: this.tableId,
         index: this.index
       },
-      (sorter && sorter.field && {
+      (sorter ? sorter.field && {
         sortField: sorter.field
-      }) || {},
-      (sorter && sorter.order && {
+      } : this.sortObj&&{sortField:this.sortObj.field}) || {},
+      (sorter ? sorter.order && {
         sortOrder: sorter.order
-      }) || {}, {
+      } : this.sortObj&&{sortOrder:this.sortObj.order}) || {}, {
         ...filters
       }
       )
-      // console.log('parameter', parameter)
+      // 缓存排序参数
+      if(sorter){
+        this.sortObj = {
+          field: sorter.field||'',
+          order: sorter.order||''
+        }
+      }
       const result = this.data(parameter)
       // 对接自己的通用数据接口需要修改下方代码中的 r.pageNo, r.count, r.data
       // eslint-disable-next-line

+ 10 - 3
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -48,7 +48,7 @@
               </a-col>
             </template>
             <a-col :md="7" :sm="24">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryQueryList-refresh">查询</a-button>
+              <a-button type="primary" @click="$refs.table.refresh()" :disabled="disabled" id="inventoryQueryList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryQueryList-reset">重置</a-button>
               <a-button
                 v-if="$hasPermissions('B_inventoryQuery_export')"
@@ -154,15 +154,22 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
+        console.log(parameter)
         // 排序
-        if (parameter.sortField == 'currentStockQty') {
+        if (parameter.sortOrder&&parameter.sortField == 'currentStockQty') {
           parameter.sortField = 'qty'
           parameter.sortAlias = ''
         }
-        if (parameter.sortField == 'currentStockCost') {
+        if (parameter.sortOrder&&parameter.sortField == 'currentStockCost') {
           parameter.sortField = 'currentStockCost'
           parameter.sortAlias = 'stock'
         }
+        
+        if(!parameter.sortOrder){
+          parameter.sortField = ''
+          parameter.sortAlias = ''
+        }
+        
         const params = Object.assign(parameter, this.queryParam)
         if (params.zeroQtyFlag) {
           params.zeroQtyFlag = '0'