添加主列表、详情渲染后统一方法封装，所有业务线列表及详情有重构的函数更改开发

2 years ago · 2f5ddcb552
35 changed files with 50 additions and 46 deletions
--- a/fe/PC/src/mixins/TableHeaderMixins.js
+++ b/fe/PC/src/mixins/TableHeaderMixins.js
@ -151,8 +151,7 @@ export const TableHeaderMixins = {
        this.totalCount = res.totalCount
        this.httpOverallSearchData = null //清空全面筛选的回显数据
        if(searchOverallRef)searchOverallRef.changeMoreListShow(false)//关闭高级筛选
-        // todo:getSupplierByCodes
-        this.getSupplierByCodesHandle_table()
+        this.pagingCallback()
      }).catch(err => {
        this.Loading.tableLoading = false
      })
@ -212,8 +211,7 @@ export const TableHeaderMixins = {
        this.httpOverallSearchData = {}
        this.httpOverallSearchData.params = JSON.parse(JSON.stringify(_data_primary))
        this.httpOverallSearchData.moreList = JSON.parse(JSON.stringify(_data_moreList))
-        console.log(this.httpOverallSearchData)
-        this.getSupplierByCodesHandle_table()
+        this.pagingCallback()
      }).catch(err => {
        this.Loading.tableLoading = false
      })
--- a/fe/PC/src/mixins/TableMixins.js
+++ b/fe/PC/src/mixins/TableMixins.js
@ -47,7 +47,7 @@ export const tableMixins = {
        getPageList(this.PageListParams, this.URL).then(res => {
          this.tableData = res.items
          this.totalCount = res.totalCount
-          this.getSupplierByCodesHandle_table()
+          this.pagingCallback()
        }).catch(err => {
          this.Loading.tableLoading = false
        })
@ -101,7 +101,7 @@ export const tableMixins = {
          } else {
            this.propsData = res
          }
-          this.getSupplierByCodesHandle_props()
+          this.inlineDialogCallback()
      }).catch(err => {
        this.Loading.DrawerLoading = false
      })
@ -136,8 +136,6 @@ export const tableMixins = {
    },
    // 获取供应商信息过滤tableData
    getSupplierByCodesHandle_table() {
-      this.Loading.tableLoading = false
-      return
      for(let i=0;i<this.tableColumns.length;i++){
        if(this.tableColumns[i].prop == 'supplierName' || this.tableColumns[i].prop == "supplierAddress"){
          let _allSuCode = []
@ -175,8 +173,6 @@ export const tableMixins = {
    },
    // 获取供应商信息过滤propsData
    getSupplierByCodesHandle_props() {
-      this.Loading.DrawerLoading = false
-      return
      for(let i=0;i<this.tabsDesTions.length;i++){
        if(!this.propsData.supplierCode){
          this.Loading.DrawerLoading = false
@ -248,6 +244,16 @@ export const tableMixins = {
          this.Loading.appMainLoading = false
        });
      }
+    },
+    // 主列表更新后全局通用操作
+    pagingCallback(){
+      this.Loading.tableLoading = false
+      // this.getSupplierByCodesHandle_table()
+    },
+    // 点击抽屉，获取明细后全局通用操作
+    inlineDialogCallback(){
+      this.Loading.DrawerLoading = false
+      // this.getSupplierByCodesHandle_props()
    }
  }
 }
--- a/fe/PC/src/views/finishedProductManage/deliver/DeliverNote-Query.vue
+++ b/fe/PC/src/views/finishedProductManage/deliver/DeliverNote-Query.vue
@ -87,7 +87,7 @@ export default {
        .then(res => {
          this.tableData = res.items
          this.totalCount = res.totalCount
-          this.getSupplierByCodesHandle_table()
+          this.pagingCallback()
        })
        .catch(err => {
          this.Loading.tableLoading = false
--- a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue
+++ b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue
@ -86,7 +86,7 @@ export default {
        .then(res => {
          this.tableData = res.items
          this.totalCount = res.totalCount
-          this.getSupplierByCodesHandle_table()
+          this.pagingCallback()
        })
        .catch(err => {
          this.Loading.tableLoading = false
--- a/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleNote.vue
+++ b/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleNote.vue
@ -109,7 +109,7 @@ export default {
            item.preStartTime = item.noteAndBackFlushDetails[0].preStartTime
            item.workHour = item.noteAndBackFlushDetails[0].workHour
          })
-          this.getSupplierByCodesHandle_table()
+          this.pagingCallback()
        })
        .catch(err => {
          this.Loading.tableLoading = false
@ -139,7 +139,7 @@ export default {
          this.propsData.rawLocationCode = this.propsData.noteAndBackFlushDetails[0].rawLocationCode
          this.propsData.preStartTime = this.propsData.noteAndBackFlushDetails[0].preStartTime
          this.propsData.workHour = this.propsData.noteAndBackFlushDetails[0].workHour
-          this.getSupplierByCodesHandle_props()
+          this.inlineDialogCallback()
        })
        .catch(err => {
          this.Loading.DrawerLoading = false
--- a/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleRequest.vue
+++ b/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleRequest.vue
@ -123,7 +123,7 @@ export default {
            item.preStartTime = item.details[0].preStartTime
            item.workHour = item.details[0].workHour
          })
-          this.getSupplierByCodesHandle_table()
+          this.pagingCallback()
        })
        .catch(err => {
          this.Loading.tableLoading = false
@ -151,7 +151,7 @@ export default {
        this.propsData.rawLocationCode = this.propsData.details[0].rawLocationCode
        this.propsData.preStartTime = this.propsData.details[0].preStartTime
        this.propsData.workHour = this.propsData.details[0].workHour
-        this.getSupplierByCodesHandle_props()
+        this.inlineDialogCallback()
      }).catch(err => {
        this.Loading.DrawerLoading = false
      })
--- a/fe/PC/src/views/finishedProductManage/partiallyPreparedProducts/partiallyPreparedProductsNote.vue
+++ b/fe/PC/src/views/finishedProductManage/partiallyPreparedProducts/partiallyPreparedProductsNote.vue
@ -90,7 +90,7 @@ export default {
        .then(res => {
          this.tableData = res.items
          this.totalCount = res.totalCount
-          this.getSupplierByCodesHandle_table()
+          this.pagingCallback()
        }).catch(err => {
          this.Loading.tableLoading = false
        })
--- a/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptRequest.vue
+++ b/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptRequest.vue
@ -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.getSupplierByCodesHandle_table()
+        this.pagingCallback()
      }).catch(err => {
        this.Loading.tableLoading = false
      })
--- a/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationConfirm.vue
+++ b/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationConfirm.vue
@ -150,7 +150,7 @@ export default {
      getPageListWip(this.PageListParams, 'wms/store/transfer-note/get-custom-loc-list').then(res => {
        this.tableData = res.items
        this.totalCount = res.totalCount
-        this.getSupplierByCodesHandle_table()
+        this.pagingCallback()
      }).catch(err => {
        this.Loading.tableLoading = false
      })
--- a/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationNote.vue
+++ b/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationNote.vue
@ -113,7 +113,7 @@ export default {
      getPageListWip(this.PageListParams, 'wms/store/transfer-note/get-custom-loc-list').then(res => {
        this.tableData = res.items
        this.totalCount = res.totalCount
-        this.getSupplierByCodesHandle_table()
+        this.pagingCallback()
      }).catch(err => {
        this.Loading.tableLoading = false
      })
--- a/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationRequest.vue
+++ b/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationRequest.vue
@ -115,7 +115,7 @@ export default {
      getPageListWip(this.PageListParams, 'wms/store/transfer-request/get-custom-loc-list').then(res => {
        this.tableData = res.items
        this.totalCount = res.totalCount
-        this.getSupplierByCodesHandle_table()
+        this.pagingCallback()
      }).catch(err => {
        this.Loading.tableLoading = false
      })
--- a/fe/PC/src/views/inventoryManage/interStorageAllocation/interStorageAllocationNote.vue
+++ b/fe/PC/src/views/inventoryManage/interStorageAllocation/interStorageAllocationNote.vue
@ -113,7 +113,7 @@ export default {
      getPageListWip(this.PageListParams, 'wms/store/transfer-note/get-erp-loc-list').then(res => {
        this.tableData = res.items
        this.totalCount = res.totalCount
-        this.getSupplierByCodesHandle_table()
+        this.pagingCallback()
      }).catch(err => {
        this.Loading.tableLoading = false
      })
--- a/fe/PC/src/views/inventoryManage/intraStorageTransfer/intraStorageTransferNote.vue
+++ b/fe/PC/src/views/inventoryManage/intraStorageTransfer/intraStorageTransferNote.vue
@ -109,7 +109,7 @@ export default {
      getPageListWip(this.PageListParams, 'wms/store/transfer-note/get-inside-list').then(res => {
        this.tableData = res.items
        this.totalCount = res.totalCount
-        this.getSupplierByCodesHandle_table()
+        this.pagingCallback()
      }).catch(err => {
        this.Loading.tableLoading = false
      })
--- a/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationConfirm.vue
+++ b/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationConfirm.vue
@ -150,7 +150,7 @@ export default {
      getPageListWip(this.PageListParams, 'wms/store/transfer-note/get-wip-list').then(res => {
          this.tableData = res.items
          this.totalCount = res.totalCount
-          this.getSupplierByCodesHandle_table()
+          this.pagingCallback()
        }).catch(err => {
          this.Loading.tableLoading = false
        })
--- a/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationNote.vue
+++ b/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationNote.vue
@ -113,7 +113,7 @@ export default {
      getPageListWip(this.PageListParams, 'wms/store/transfer-note/get-wip-list').then(res => {
        this.tableData = res.items
        this.totalCount = res.totalCount
-        this.getSupplierByCodesHandle_table()
+        this.pagingCallback()
      }).catch(err => {
        this.Loading.tableLoading = false
      })
--- a/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationRequest.vue
+++ b/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationRequest.vue
@ -112,7 +112,7 @@ export default {
      getPageListWip(this.PageListParams, 'wms/store/transfer-request/get-wip-list').then(res => {
        this.tableData = res.items
        this.totalCount = res.totalCount
-        this.getSupplierByCodesHandle_table()
+        this.pagingCallback()
      }).catch(err => {
        this.Loading.tableLoading = false
      })
--- a/fe/PC/src/views/inventoryManage/lineSideWarehousePayment/lineSideWarehousePaymentNote.vue
+++ b/fe/PC/src/views/inventoryManage/lineSideWarehousePayment/lineSideWarehousePaymentNote.vue
@ -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.getSupplierByCodesHandle_table()
+          this.pagingCallback()
      }).catch(err => {
        this.Loading.tableLoading = false
      })
--- a/fe/PC/src/views/inventoryManage/lineSideWarehousePayment/lineSideWarehousePaymentRequest.vue
+++ b/fe/PC/src/views/inventoryManage/lineSideWarehousePayment/lineSideWarehousePaymentRequest.vue
@ -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.getSupplierByCodesHandle_table()
+        this.pagingCallback()
      }).catch(err => {
        this.Loading.tableLoading = false
      })
--- a/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingNote.vue
+++ b/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingNote.vue
@ -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.getSupplierByCodesHandle_table()
+        this.pagingCallback()
      }).catch(err => {
        this.Loading.tableLoading = false
      })
--- a/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingRequest.vue
+++ b/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingRequest.vue
@ -104,7 +104,7 @@ export default {
      materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => {
        this.tableData = res.items
        this.totalCount = res.totalCount
-        this.getSupplierByCodesHandle_table()
+        this.pagingCallback()
      }).catch(err => {
        this.Loading.tableLoading = false
      })
--- a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallApply.vue
+++ b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallApply.vue
@ -137,7 +137,7 @@ export default {
        .then(res => {
          this.tableData = res.items
          this.totalCount = res.totalCount
-          this.getSupplierByCodesHandle_table()
+          this.pagingCallback()
        }).catch(err => {
          this.Loading.tableLoading = false
        })
--- a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue
+++ b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue
@ -252,7 +252,7 @@ export default {
        .then(res => {
          this.tableData = res.items
          this.totalCount = res.totalCount
-          this.getSupplierByCodesHandle_table()
+          this.pagingCallback()
        })
        .catch(err => {
          this.Loading.tableLoading = false
--- a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallNote.vue
+++ b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallNote.vue
@ -99,7 +99,7 @@ export default {
        .then(res => {
          this.tableData = res.items
          this.totalCount = res.totalCount
-          this.getSupplierByCodesHandle_table()
+          this.pagingCallback()
        })
        .catch(err => {
          this.Loading.tableLoading = false
--- a/fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue
+++ b/fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue
@ -97,7 +97,7 @@ export default {
        .then(res => {
          this.tableData = res.items
          this.totalCount = res.totalCount
-          this.getSupplierByCodesHandle_table()
+          this.pagingCallback()
        })
        .catch(err => {
          this.Loading.tableLoading = false
--- a/fe/PC/src/views/rawMaterialManage/directIssue/directIssueNote.vue
+++ b/fe/PC/src/views/rawMaterialManage/directIssue/directIssueNote.vue
@ -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.getSupplierByCodesHandle_table()
+          this.pagingCallback()
        }).catch(err => {
          this.Loading.tableLoading = false
        })
--- a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue
+++ b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue
@ -254,7 +254,7 @@ export default {
        .then(res => {
          this.tableData = res.items
          this.totalCount = res.totalCount
-          this.getSupplierByCodesHandle_table()
+          this.pagingCallback()
        }).catch(err => {
          this.Loading.tableLoading = false
        })
--- a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueNote.vue
+++ b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueNote.vue
@ -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.getSupplierByCodesHandle_table()
+          this.pagingCallback()
        }).catch(err => {
          this.Loading.tableLoading = false
        })
--- a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueRequest.vue
+++ b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueRequest.vue
@ -113,7 +113,7 @@ export default {
      materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => {
          this.tableData = res.items
          this.totalCount = res.totalCount
-          this.getSupplierByCodesHandle_table()
+          this.pagingCallback()
        }).catch(err => {
          this.Loading.tableLoading = false
        })
--- a/fe/PC/src/views/rawMaterialManage/materialDirectSend/materialDirectSendNote.vue
+++ b/fe/PC/src/views/rawMaterialManage/materialDirectSend/materialDirectSendNote.vue
@ -96,7 +96,7 @@
            getPageListWip(this.PageListParams, 'wms/store/deliver-note/list-for-raw').then(res => {
                this.tableData = res.items
                this.totalCount = res.totalCount
-                this.getSupplierByCodesHandle_table()
+                this.pagingCallback()
            }).catch(err => {
                this.Loading.tableLoading = false
            })
--- a/fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue
+++ b/fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue
@ -94,7 +94,7 @@ export default {
      getPageListWip(this.PageListParams, 'wms/store/putaway-note/get-list-by-purchase').then(res => {
          this.tableData = res.items
          this.totalCount = res.totalCount
-          this.getSupplierByCodesHandle_table()
+          this.pagingCallback()
        }).catch(err => {
          this.Loading.tableLoading = false
        })
--- a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptNote-msQuery.vue
+++ b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptNote-msQuery.vue
@ -169,7 +169,7 @@ export default {
            } else {
              this.propsData = res
            }
-            this.getSupplierByCodesHandle_props()
+            this.inlineDialogCallback()
        }).catch(err => {
          this.Loading.DrawerLoading = false
        })
--- a/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue
+++ b/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue
@ -97,7 +97,7 @@ export default {
        .then(res => {
          this.tableData = res.items
          this.totalCount = res.totalCount
-          this.getSupplierByCodesHandle_table()
+          this.pagingCallback()
        })
        .catch(err => {
          this.Loading.tableLoading = false
--- a/fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue
+++ b/fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue
@ -97,7 +97,7 @@ export default {
        .then(res => {
          this.tableData = res.items
          this.totalCount = res.totalCount
-          this.getSupplierByCodesHandle_table()
+          this.pagingCallback()
        }).catch(err => {
          this.Loading.tableLoading = false
        })
--- a/fe/PC/src/views/rawMaterialManage/scrap/ScrapNote.vue
+++ b/fe/PC/src/views/rawMaterialManage/scrap/ScrapNote.vue
@ -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.getSupplierByCodesHandle_table()
+        this.pagingCallback()
      }).catch(err => {
        this.Loading.tableLoading = false
      })
--- a/fe/PC/src/views/systemManage/Department.vue
+++ b/fe/PC/src/views/systemManage/Department.vue
@ -140,7 +140,7 @@ export default {
      departmentList(this.PageListParams, this.URL).then(res => {
          this.tableData = res.items
          this.totalCount = res.totalCount
-          this.getSupplierByCodesHandle_table()
+          this.pagingCallback()
        }).catch(err => {
          this.Loading.tableLoading = false
        })
@ -163,7 +163,7 @@ export default {
          } else {
            this.propsData = res
          }
-          this.getSupplierByCodesHandle_props()
+          this.inlineDialogCallback()
        })
        .catch(err => {
          this.Loading.DrawerLoading = false