diff --git a/fe/PC/public/version.json b/fe/PC/public/version.json index a2f845c7c..1508200d4 100644 --- a/fe/PC/public/version.json +++ b/fe/PC/public/version.json @@ -1,3 +1,3 @@ { - "version": "1.0.16" + "version": "1.0.17" } \ No newline at end of file diff --git a/fe/PC/src/mixins/TableHeaderMixins.js b/fe/PC/src/mixins/TableHeaderMixins.js index 50fb4ecb7..d1ffcda34 100644 --- a/fe/PC/src/mixins/TableHeaderMixins.js +++ b/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 diff --git a/fe/PC/src/mixins/TableMixins.js b/fe/PC/src/mixins/TableMixins.js index 0c300a7ba..0fa350d4a 100644 --- a/fe/PC/src/mixins/TableMixins.js +++ b/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() - if(callback)callback() + this.pagingCallback(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() }, // 点击抽屉，获取明细后全局通用操作 diff --git a/fe/PC/src/views/finishedProductManage/deliver/DeliverNote-Query.vue b/fe/PC/src/views/finishedProductManage/deliver/DeliverNote-Query.vue index cb0ac375b..f50958a64 100644 --- a/fe/PC/src/views/finishedProductManage/deliver/DeliverNote-Query.vue +++ b/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 diff --git a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue index 405dd67e3..090f61610 100644 --- a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue +++ b/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 diff --git a/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleNote.vue b/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleNote.vue index 82440b32b..99972a059 100644 --- a/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleNote.vue +++ b/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 diff --git a/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleRequest.vue b/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleRequest.vue index a5b3e4c27..5738d7d32 100644 --- a/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleRequest.vue +++ b/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 diff --git a/fe/PC/src/views/finishedProductManage/partiallyPreparedProducts/partiallyPreparedProductsNote.vue b/fe/PC/src/views/finishedProductManage/partiallyPreparedProducts/partiallyPreparedProductsNote.vue index c7aca84e9..a64b82458 100644 --- a/fe/PC/src/views/finishedProductManage/partiallyPreparedProducts/partiallyPreparedProductsNote.vue +++ b/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 }) diff --git a/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptRequest.vue b/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptRequest.vue index 361ec0756..26e252df0 100644 --- a/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptRequest.vue +++ b/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 }) diff --git a/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptScrapNote.vue b/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptScrapNote.vue index e7f2bf29c..115056e28 100644 --- a/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptScrapNote.vue +++ b/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 }) diff --git a/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptScrapRequest.vue b/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptScrapRequest.vue index bf9cee307..7fee762a0 100644 --- a/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptScrapRequest.vue +++ b/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 }) diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/safetyStockWarning.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/safetyStockWarning.vue index e39aa1a35..8fc2975d6 100644 --- a/fe/PC/src/views/inventoryManage/InventoryQuery/safetyStockWarning.vue +++ b/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 }) diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/splitPackingList.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/splitPackingList.vue index 3d5728862..4ab83e03c 100644 --- a/fe/PC/src/views/inventoryManage/InventoryQuery/splitPackingList.vue +++ b/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 diff --git a/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationConfirm.vue b/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationConfirm.vue index 8edb33e2a..53edb6116 100644 --- a/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationConfirm.vue +++ b/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 }) diff --git a/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationNote.vue b/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationNote.vue index b3a05ca58..c93b3f58a 100644 --- a/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationNote.vue +++ b/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 }) diff --git a/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationRequest.vue b/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationRequest.vue index 0a11237c8..cd72863b2 100644 --- a/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationRequest.vue +++ b/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 }) diff --git a/fe/PC/src/views/inventoryManage/interStorageAllocation/interStorageAllocationNote.vue b/fe/PC/src/views/inventoryManage/interStorageAllocation/interStorageAllocationNote.vue index a0f4418c0..f02fc2a5e 100644 --- a/fe/PC/src/views/inventoryManage/interStorageAllocation/interStorageAllocationNote.vue +++ b/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 }) diff --git a/fe/PC/src/views/inventoryManage/intraStorageTransfer/intraStorageTransferNote.vue b/fe/PC/src/views/inventoryManage/intraStorageTransfer/intraStorageTransferNote.vue index ddd1106ba..29508f347 100644 --- a/fe/PC/src/views/inventoryManage/intraStorageTransfer/intraStorageTransferNote.vue +++ b/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 }) diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationConfirm.vue b/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationConfirm.vue index b9c0617f7..a8c336c10 100644 --- a/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationConfirm.vue +++ b/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 }) diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationNote.vue b/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationNote.vue index b42a42100..6f8d32943 100644 --- a/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationNote.vue +++ b/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 }) diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationRequest.vue b/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationRequest.vue index e844ca467..bbd82b7e9 100644 --- a/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationRequest.vue +++ b/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 }) diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehousePayment/lineSideWarehousePaymentNote.vue b/fe/PC/src/views/inventoryManage/lineSideWarehousePayment/lineSideWarehousePaymentNote.vue index 0d3677813..e10af591c 100644 --- a/fe/PC/src/views/inventoryManage/lineSideWarehousePayment/lineSideWarehousePaymentNote.vue +++ b/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 }) diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehousePayment/lineSideWarehousePaymentRequest.vue b/fe/PC/src/views/inventoryManage/lineSideWarehousePayment/lineSideWarehousePaymentRequest.vue index 897f22ad6..82ad1b2d9 100644 --- a/fe/PC/src/views/inventoryManage/lineSideWarehousePayment/lineSideWarehousePaymentRequest.vue +++ b/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 }) diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingNote.vue b/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingNote.vue index ee8146f9e..ecbd70f1b 100644 --- a/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingNote.vue +++ b/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 }) diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingRequest.vue b/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingRequest.vue index a79e54939..bf639c54a 100644 --- a/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingRequest.vue +++ b/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 }) diff --git a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallApply.vue b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallApply.vue index 08b50a98c..e4019b956 100644 --- a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallApply.vue +++ b/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 }) diff --git a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue index fba44ccdb..15bf5350e 100644 --- a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue +++ b/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 diff --git a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallNote.vue b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallNote.vue index cdcc6aa57..3d387ebc3 100644 --- a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallNote.vue +++ b/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 diff --git a/fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue b/fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue index 03570b091..b40e8a558 100644 --- a/fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue +++ b/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 diff --git a/fe/PC/src/views/rawMaterialManage/directIssue/directIssueNote.vue b/fe/PC/src/views/rawMaterialManage/directIssue/directIssueNote.vue index f309a00ba..10f5a7d67 100644 --- a/fe/PC/src/views/rawMaterialManage/directIssue/directIssueNote.vue +++ b/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 }) diff --git a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue index 1d8e69e2b..a45077434 100644 --- a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue +++ b/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 }) diff --git a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueNote.vue b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueNote.vue index 2beb363a5..829135ed0 100644 --- a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueNote.vue +++ b/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 }) diff --git a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueRequest.vue b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueRequest.vue index 38d90b82d..8fa43feb7 100644 --- a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueRequest.vue +++ b/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 }) diff --git a/fe/PC/src/views/rawMaterialManage/materialDirectSend/materialDirectSendNote.vue b/fe/PC/src/views/rawMaterialManage/materialDirectSend/materialDirectSendNote.vue index b96507578..0a6fb8a56 100644 --- a/fe/PC/src/views/rawMaterialManage/materialDirectSend/materialDirectSendNote.vue +++ b/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 }) diff --git a/fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue b/fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue index d232a8aab..34384ec53 100644 --- a/fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue +++ b/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 }) diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue b/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue index 75146da89..b67568fc6 100644 --- a/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue +++ b/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 diff --git a/fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue b/fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue index cf3e3dbe3..a1dd51744 100644 --- a/fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue +++ b/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 }) diff --git a/fe/PC/src/views/rawMaterialManage/scrap/ScrapNote.vue b/fe/PC/src/views/rawMaterialManage/scrap/ScrapNote.vue index ed48df8cb..027a01405 100644 --- a/fe/PC/src/views/rawMaterialManage/scrap/ScrapNote.vue +++ b/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 }) diff --git a/fe/PC/src/views/systemManage/Department.vue b/fe/PC/src/views/systemManage/Department.vue index dee867ab6..4d7846ca8 100644 --- a/fe/PC/src/views/systemManage/Department.vue +++ b/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 })