更改所有高级筛选使用paging(callback)

fe/PC/public/version.json

@@ -1,3 +1,3 @@
 {
-    "version": "1.0.16"
+    "version": "1.0.17"
 }

fe/PC/src/mixins/TableHeaderMixins.js

@@ -146,6 +146,7 @@ export const TableHeaderMixins = {
           value: val,
         })
       }
+      // todo:使用paging(callback)如204行
       getPageList(this.PageListParams, this.URL).then(res => {
         this.tableData = res.items
         this.totalCount = res.totalCount

fe/PC/src/mixins/TableMixins.js

@@ -47,8 +47,7 @@ export const tableMixins = {
         getPageList(this.PageListParams, this.URL).then(res => {
           this.tableData = res.items
           this.totalCount = res.totalCount
-          this.pagingCallback()
+          this.pagingCallback(callback)
-          if(callback)callback()
         }).catch(err => {
           this.Loading.tableLoading = false
         })
@@ -248,8 +247,9 @@ export const tableMixins = {
       }
     },
     // 主列表更新后全局通用操作
-    pagingCallback(){
+    pagingCallback(callback){
       this.Loading.tableLoading = false
+      if(callback)callback()
       // this.getSupplierByCodesHandle_table()
     },
     // 点击抽屉，获取明细后全局通用操作

fe/PC/src/views/finishedProductManage/deliver/DeliverNote-Query.vue

@@ -80,14 +80,14 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
       getPageListWip(this.PageListParams, 'wms/store/deliver-note/list-for-normal')
         .then(res => {
           this.tableData = res.items
           this.totalCount = res.totalCount
-          this.pagingCallback()
+          this.pagingCallback(callback)
         })
         .catch(err => {
           this.Loading.tableLoading = false

fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue

@@ -79,14 +79,14 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
       getPageListWip(this.PageListParams, 'wms/store/deliver-note/list-for-fis')
         .then(res => {
           this.tableData = res.items
           this.totalCount = res.totalCount
-          this.pagingCallback()
+          this.pagingCallback(callback)
         })
         .catch(err => {
           this.Loading.tableLoading = false

fe/PC/src/views/finishedProductManage/dismantle/customerDismantleNote.vue

@@ -94,7 +94,7 @@ export default {
     this.paging();
   },
   methods: {//渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
       getPageList(this.PageListParams, this.URL,true)
@@ -109,7 +109,7 @@ export default {
             item.preStartTime = item.noteAndBackFlushDetails[0].preStartTime
             item.workHour = item.noteAndBackFlushDetails[0].workHour
           })
-          this.pagingCallback()
+          this.pagingCallback(callback)
         })
         .catch(err => {
           this.Loading.tableLoading = false

fe/PC/src/views/finishedProductManage/dismantle/customerDismantleRequest.vue

@@ -108,7 +108,7 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
       getPageList(this.PageListParams, this.URL,true)
@@ -122,7 +122,7 @@ export default {
             item.preStartTime = item.details[0].preStartTime
             item.workHour = item.details[0].workHour
           })
-          this.pagingCallback()
+          this.pagingCallback(callback)
         })
         .catch(err => {
           this.Loading.tableLoading = false

fe/PC/src/views/finishedProductManage/partiallyPreparedProducts/partiallyPreparedProductsNote.vue

@@ -83,14 +83,14 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
       getPageListWip(this.PageListParams, 'wms/store/putaway-note/get-list-by-semi')
         .then(res => {
           this.tableData = res.items
           this.totalCount = res.totalCount
-          this.pagingCallback()
+          this.pagingCallback(callback)
         }).catch(err => {
           this.Loading.tableLoading = false
         })

fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptRequest.vue

@@ -113,7 +113,7 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
       // 叫料请求类型: 人工缴库:ProductReceipt_Manual;  线边缴库:ProductReceipt_WIP;
@@ -123,7 +123,7 @@ export default {
       materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => {
         this.tableData = res.items
         this.totalCount = res.totalCount
-        this.pagingCallback()
+        this.pagingCallback(callback)
       }).catch(err => {
         this.Loading.tableLoading = false
       })

fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptScrapNote.vue

@@ -78,7 +78,7 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
       // 报废请求类型: 人工报废:Scrap_Manual;  线边报废:Scrap_WIP; 完工报废:Scrap_Product
@@ -88,7 +88,7 @@ export default {
       materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => {
         this.tableData = res.items
         this.totalCount = res.totalCount
-        this.pagingCallback()
+        this.pagingCallback(callback)
       }).catch(err => {
         this.Loading.tableLoading = false
       })

fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptScrapRequest.vue

@@ -114,7 +114,7 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
       // 报废请求类型: 人工报废:Scrap_Manual;  线边报废:Scrap_WIP; 完工报废:Scrap_Product
@@ -124,7 +124,7 @@ export default {
       materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => {
         this.tableData = res.items
         this.totalCount = res.totalCount
-        this.pagingCallback()
+        this.pagingCallback(callback)
       }).catch(err => {
         this.Loading.tableLoading = false
       })

fe/PC/src/views/inventoryManage/InventoryQuery/safetyStockWarning.vue

@@ -79,13 +79,13 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
       getListPageSafety(this.PageListParams, this.URL + '/list-page').then(res => {
         this.tableData = res.items
         this.totalCount = res.totalCount
-          this.pagingCallback()
+          this.pagingCallback(callback)
       }).catch(err => {
         this.Loading.tableLoading = false
       })

fe/PC/src/views/inventoryManage/InventoryQuery/splitPackingList.vue

@@ -100,14 +100,14 @@
     },
     methods:{
       //渲染数据
-      paging() {
+      paging(callback) {
         this.Loading.tableLoading = true;
         this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
         getPageListWip(this.PageListParams, 'wms/store/transfer-note/get-split-packing-list?includeDetails=true')
           .then(res => {
             this.tableData = res.items
             this.totalCount = res.totalCount
-            this.pagingCallback()
+            this.pagingCallback(callback)
           })
           .catch(err => {
             this.Loading.tableLoading = false

fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationConfirm.vue

@@ -144,13 +144,13 @@ export default {
       // }
     },
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
       getPageListWip(this.PageListParams, 'wms/store/transfer-note/get-custom-loc-list').then(res => {
         this.tableData = res.items
         this.totalCount = res.totalCount
-        this.pagingCallback()
+        this.pagingCallback(callback)
       }).catch(err => {
         this.Loading.tableLoading = false
       })

fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationNote.vue

@@ -107,13 +107,13 @@ export default {
       }
     },
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
       getPageListWip(this.PageListParams, 'wms/store/transfer-note/get-custom-loc-list').then(res => {
         this.tableData = res.items
         this.totalCount = res.totalCount
-        this.pagingCallback()
+        this.pagingCallback(callback)
       }).catch(err => {
         this.Loading.tableLoading = false
       })

fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationRequest.vue

@@ -108,13 +108,13 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
       getPageListWip(this.PageListParams, 'wms/store/transfer-request/get-custom-loc-list').then(res => {
         this.tableData = res.items
         this.totalCount = res.totalCount
-        this.pagingCallback()
+        this.pagingCallback(callback)
       }).catch(err => {
         this.Loading.tableLoading = false
       })

fe/PC/src/views/inventoryManage/interStorageAllocation/interStorageAllocationNote.vue

@@ -107,13 +107,13 @@ export default {
       }
     },
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
       getPageListWip(this.PageListParams, 'wms/store/transfer-note/get-erp-loc-list').then(res => {
         this.tableData = res.items
         this.totalCount = res.totalCount
-        this.pagingCallback()
+        this.pagingCallback(callback)
       }).catch(err => {
         this.Loading.tableLoading = false
       })

fe/PC/src/views/inventoryManage/intraStorageTransfer/intraStorageTransferNote.vue

@@ -102,13 +102,13 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
       getPageListWip(this.PageListParams, 'wms/store/transfer-note/get-inside-list').then(res => {
         this.tableData = res.items
         this.totalCount = res.totalCount
-        this.pagingCallback()
+        this.pagingCallback(callback)
       }).catch(err => {
         this.Loading.tableLoading = false
       })

fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationConfirm.vue

@@ -144,13 +144,13 @@ export default {
       // }
     },
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
       getPageListWip(this.PageListParams, 'wms/store/transfer-note/get-wip-list').then(res => {
           this.tableData = res.items
           this.totalCount = res.totalCount
-          this.pagingCallback()
+          this.pagingCallback(callback)
         }).catch(err => {
           this.Loading.tableLoading = false
         })

fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationNote.vue

@@ -107,13 +107,13 @@ export default {
       }
     },
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
       getPageListWip(this.PageListParams, 'wms/store/transfer-note/get-wip-list').then(res => {
         this.tableData = res.items
         this.totalCount = res.totalCount
-        this.pagingCallback()
+        this.pagingCallback(callback)
       }).catch(err => {
         this.Loading.tableLoading = false
       })

fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationRequest.vue

@@ -105,13 +105,13 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
       getPageListWip(this.PageListParams, 'wms/store/transfer-request/get-wip-list').then(res => {
         this.tableData = res.items
         this.totalCount = res.totalCount
-        this.pagingCallback()
+        this.pagingCallback(callback)
       }).catch(err => {
         this.Loading.tableLoading = false
       })

fe/PC/src/views/inventoryManage/lineSideWarehousePayment/lineSideWarehousePaymentNote.vue

@@ -76,7 +76,7 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
       // 叫料请求类型: 人工缴库:ProductReceipt_Manual;  线边缴库:ProductReceipt_WIP;
@@ -86,7 +86,7 @@ export default {
       materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => {
         this.tableData = res.items
         this.totalCount = res.totalCount
-          this.pagingCallback()
+          this.pagingCallback(callback)
       }).catch(err => {
         this.Loading.tableLoading = false
       })

fe/PC/src/views/inventoryManage/lineSideWarehousePayment/lineSideWarehousePaymentRequest.vue

@@ -92,7 +92,7 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
       // 叫料请求类型: 人工缴库:ProductReceipt_Manual;  线边缴库:ProductReceipt_WIP;
@@ -102,7 +102,7 @@ export default {
       materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => {
         this.tableData = res.items
         this.totalCount = res.totalCount
-        this.pagingCallback()
+        this.pagingCallback(callback)
       }).catch(err => {
         this.Loading.tableLoading = false
       })

fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingNote.vue

@@ -95,7 +95,7 @@ export default {
       }
     },
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
       // 报废请求类型: 人工报废:Scrap_Manual;  线边报废:Scrap_WIP; 完工报废:Scrap_Product
@@ -105,7 +105,7 @@ export default {
       materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => {
         this.tableData = res.items
         this.totalCount = res.totalCount
-        this.pagingCallback()
+        this.pagingCallback(callback)
       }).catch(err => {
         this.Loading.tableLoading = false
       })

fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingRequest.vue

@@ -93,7 +93,7 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
       // 报废请求类型: 人工报废:Scrap_Manual;  线边报废:Scrap_WIP; 完工报废:Scrap_Product
@@ -103,7 +103,7 @@ export default {
       materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => {
         this.tableData = res.items
         this.totalCount = res.totalCount
-        this.pagingCallback()
+        this.pagingCallback(callback)
       }).catch(err => {
         this.Loading.tableLoading = false
       })

fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallApply.vue

@@ -125,7 +125,7 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
       // 叫料请求类型: 人工拉动:Issue_Manual;  线边拉动:Issue_WIP; 直接发料:Direct_Issue
@@ -136,7 +136,7 @@ export default {
         .then(res => {
           this.tableData = res.items
           this.totalCount = res.totalCount
-          this.pagingCallback()
+          this.pagingCallback(callback)
         }).catch(err => {
           this.Loading.tableLoading = false
         })

fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue

@@ -241,7 +241,7 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
       // 叫料请求类型: 人工拉动:Issue_Manual;  线边拉动:Issue_WIP; 直接发料:Direct_Issue
@@ -252,7 +252,7 @@ export default {
         .then(res => {
           this.tableData = res.items
           this.totalCount = res.totalCount
-          this.pagingCallback()
+          this.pagingCallback(callback)
         })
         .catch(err => {
           this.Loading.tableLoading = false

fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallNote.vue

@@ -105,7 +105,7 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
       // 叫料请求类型: 人工拉动:Issue_Manual;  线边拉动:Issue_WIP; 直接发料:Direct_Issue
@@ -116,7 +116,7 @@ export default {
         .then(res => {
           this.tableData = res.items
           this.totalCount = res.totalCount
-          this.pagingCallback()
+          this.pagingCallback(callback)
         })
         .catch(err => {
           this.Loading.tableLoading = false

fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue

@@ -90,14 +90,14 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
       getPageListWip(this.PageListParams, 'wms/store/purchase-return-note/list-before-puton')
         .then(res => {
           this.tableData = res.items
           this.totalCount = res.totalCount
-          this.pagingCallback()
+          this.pagingCallback(callback)
         })
         .catch(err => {
           this.Loading.tableLoading = false

fe/PC/src/views/rawMaterialManage/directIssue/directIssueNote.vue

@@ -87,7 +87,7 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
       // 叫料请求类型: 人工拉动:Issue_Manual;  线边拉动:Issue_WIP; 直接发料:Issue_Direct
@@ -97,7 +97,7 @@ export default {
       materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => {
           this.tableData = res.items
           this.totalCount = res.totalCount
-          this.pagingCallback()
+          this.pagingCallback(callback)
         }).catch(err => {
           this.Loading.tableLoading = false
         })

fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue

@@ -243,7 +243,7 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
       // 叫料请求类型: 人工拉动:Issue_Manual;  线边拉动:Issue_WIP; 直接发料:Direct_Issue
@@ -254,7 +254,7 @@ export default {
         .then(res => {
           this.tableData = res.items
           this.totalCount = res.totalCount
-          this.pagingCallback()
+          this.pagingCallback(callback)
         }).catch(err => {
           this.Loading.tableLoading = false
         })

fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueNote.vue

@@ -88,7 +88,7 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
       // 叫料请求类型: 人工拉动:Issue_Manual;  线边拉动:Issue_WIP; 直接发料:Direct_Issue
@@ -98,7 +98,7 @@ export default {
       materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => {
           this.tableData = res.items
           this.totalCount = res.totalCount
-          this.pagingCallback()
+          this.pagingCallback(callback)
         }).catch(err => {
           this.Loading.tableLoading = false
         })

fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueRequest.vue

@@ -125,7 +125,7 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
       // 叫料请求类型: 人工拉动:Issue_Manual;  线边拉动:Issue_WIP; 直接发料:Direct_Issue
@@ -135,7 +135,7 @@ export default {
       materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => {
           this.tableData = res.items
           this.totalCount = res.totalCount
-          this.pagingCallback()
+          this.pagingCallback(callback)
         }).catch(err => {
           this.Loading.tableLoading = false
         })

fe/PC/src/views/rawMaterialManage/materialDirectSend/materialDirectSendNote.vue

@@ -90,13 +90,13 @@
       this.paging();
     },
     methods: {
-        paging(){
+        paging(callback){
             this.Loading.tableLoading = true;
             this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
             getPageListWip(this.PageListParams, 'wms/store/deliver-note/list-for-raw').then(res => {
                 this.tableData = res.items
                 this.totalCount = res.totalCount
-                this.pagingCallback()
+                this.pagingCallback(callback)
             }).catch(err => {
                 this.Loading.tableLoading = false
             })

fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue

@@ -89,13 +89,13 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
       getPageListWip(this.PageListParams, 'wms/store/putaway-note/get-list-by-purchase').then(res => {
           this.tableData = res.items
           this.totalCount = res.totalCount
-          this.pagingCallback()
+          this.pagingCallback(callback)
         }).catch(err => {
           this.Loading.tableLoading = false
         })

fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue

@@ -90,14 +90,14 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
       getPageListWip(this.PageListParams, 'wms/store/purchase-return-note/list-after-puton')
         .then(res => {
           this.tableData = res.items
           this.totalCount = res.totalCount
-          this.pagingCallback()
+          this.pagingCallback(callback)
         })
         .catch(err => {
           this.Loading.tableLoading = false

fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue

@@ -90,14 +90,14 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
       getPageListWip(this.PageListParams, 'wms/inventory/inventory-balance/by-hold-location-code-and-no-ok')
         .then(res => {
           this.tableData = res.items
           this.totalCount = res.totalCount
-          this.pagingCallback()
+          this.pagingCallback(callback)
         }).catch(err => {
           this.Loading.tableLoading = false
         })

fe/PC/src/views/rawMaterialManage/scrap/ScrapNote.vue

@@ -79,7 +79,7 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
       // 报废请求类型: 人工报废:Scrap_Manual;  线边报废:Scrap_WIP;  完工报废:Scrap_Product
@@ -89,7 +89,7 @@ export default {
       materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => {
         this.tableData = res.items
         this.totalCount = res.totalCount
-        this.pagingCallback()
+        this.pagingCallback(callback)
       }).catch(err => {
         this.Loading.tableLoading = false
       })

fe/PC/src/views/systemManage/Department.vue

@@ -134,13 +134,13 @@ export default {
   },
   methods: {
     //渲染数据
-    paging() {
+    paging(callback) {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
       departmentList(this.PageListParams, this.URL).then(res => {
           this.tableData = res.items
           this.totalCount = res.totalCount
-          this.pagingCallback()
+          this.pagingCallback(callback)
         }).catch(err => {
           this.Loading.tableLoading = false
         })