瀏覽代碼

所有页签不刷新。页签切换不刷新 保留查询条件,新页签打开不保留查询条件,二级页面(编辑详情等)通过按钮进入页面刷新数据不保留查询条件

chenrui 3 年之前
父節點
當前提交
d77a67a3c4
共有 41 個文件被更改,包括 587 次插入786 次删除
  1. 13 7
      src/views/allocationManagement/chainTransferIn/detail.vue
  2. 16 8
      src/views/allocationManagement/chainTransferIn/edit.vue
  3. 20 16
      src/views/allocationManagement/chainTransferIn/list.vue
  4. 13 7
      src/views/allocationManagement/chainTransferOut/detail.vue
  5. 11 14
      src/views/allocationManagement/chainTransferOut/edit.vue
  6. 17 13
      src/views/allocationManagement/chainTransferOut/list.vue
  7. 15 9
      src/views/allocationManagement/storeTransferOut/detail.vue
  8. 13 14
      src/views/allocationManagement/storeTransferOut/edit.vue
  9. 17 13
      src/views/allocationManagement/storeTransferOut/list.vue
  10. 12 34
      src/views/allocationManagement/warehouseAllocation/detail.vue
  11. 17 19
      src/views/allocationManagement/warehouseAllocation/edit.vue
  12. 16 12
      src/views/allocationManagement/warehouseAllocation/list.vue
  13. 13 12
      src/views/financialManagement/companyCollectionPayment/detail.vue
  14. 16 13
      src/views/financialManagement/companyCollectionPayment/list.vue
  15. 14 4
      src/views/financialManagement/companyReceivablePayable/collectionPayment.vue
  16. 15 10
      src/views/financialManagement/companyReceivablePayable/detail.vue
  17. 13 9
      src/views/financialManagement/companyReceivablePayable/list.vue
  18. 10 4
      src/views/financialManagement/expenseManagement/edit.vue
  19. 15 11
      src/views/financialManagement/expenseManagement/list.vue
  20. 24 21
      src/views/financialManagement/financialCollection/list.vue
  21. 24 21
      src/views/financialManagement/financialPayment/list.vue
  22. 15 11
      src/views/financialManagement/inventoryCheckAudit/list.vue
  23. 0 161
      src/views/financialManagement/inventoryReview/detail.vue
  24. 0 190
      src/views/financialManagement/inventoryReview/list.vue
  25. 15 11
      src/views/financialManagement/ledgerRecord/list.vue
  26. 13 7
      src/views/financialManagement/warehousingAudit/detail.vue
  27. 15 11
      src/views/financialManagement/warehousingAudit/list.vue
  28. 16 10
      src/views/financialManagement/withdrawalManagement/list.vue
  29. 15 11
      src/views/inventoryManagement/inventoryChecking/list.vue
  30. 13 7
      src/views/inventoryManagement/inventoryChecking/makeInventory.vue
  31. 15 3
      src/views/inventoryManagement/inventoryChecking/overall.vue
  32. 16 8
      src/views/inventoryManagement/inventoryChecking/selfDisk.vue
  33. 13 6
      src/views/inventoryManagement/inventoryImport/list.vue
  34. 15 11
      src/views/inventoryManagement/inventoryQuery/list.vue
  35. 21 12
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  36. 17 13
      src/views/inventoryManagement/inventoryWarning/list.vue
  37. 12 9
      src/views/inventoryManagement/satelliteWarehouseInventory/list.vue
  38. 15 11
      src/views/inventoryManagement/warehouse/list.vue
  39. 15 11
      src/views/inventoryManagement/warehouse/storingLocation/list.vue
  40. 15 11
      src/views/outboundOrderManagement/outboundOrder/list.vue
  41. 7 1
      src/views/productManagement/productInfo/edit.vue

+ 13 - 7
src/views/allocationManagement/chainTransferIn/detail.vue

@@ -54,6 +54,7 @@
           :columns="columns"
           :data="loadData"
           :scroll="{ x: 1335 }"
+          :defaultLoadData="false"
           bordered>
         </s-table>
       </a-card>
@@ -179,15 +180,20 @@ export default {
     }
   },
   mounted () {
-    this.getDetail()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.$refs.table.refresh(true)
+      this.getDetail()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.$refs.table.refresh(true)
+      this.getDetail()
+    }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.spinning) {
-        vm.getDetail()
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 16 - 8
src/views/allocationManagement/chainTransferIn/edit.vue

@@ -345,19 +345,27 @@ export default {
         window.frames['printfcie'].focus()
         window.frames['printfcie'].print()
       }
+    },
+    pageInit () {
+      this.getDetail()
+      this.getWarehouseCascade()
     }
   },
   mounted () {
-    this.getDetail()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.pageInit()
+      this.resetSearchForm()
+    }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getWarehouseCascade()
-      if (!vm.disabled) {
-        vm.getDetail()
-        vm.resetSearchForm()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 20 - 16
src/views/allocationManagement/chainTransferIn/list.vue

@@ -80,6 +80,7 @@
         :columns="columns"
         :data="loadData"
         :scroll="{ x: 1310, y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         <!-- 连锁调入单号 -->
         <template slot="allocationLinkagePutNo" slot-scope="text, record">
@@ -169,17 +170,7 @@ export default {
       outTenantSnData: []
     }
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   methods: {
-    setTableH () {
-      const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 197
-    },
     //  时间  change
     dateChange (date) {
       this.queryParam.beginDate = date[0]
@@ -239,6 +230,17 @@ export default {
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
+    },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.getPutTenantList()
+    },
+    setTableH () {
+      const tableSearchH = this.$refs.tableSearch.offsetHeight
+      this.tableHeight = window.innerHeight - tableSearchH - 197
     }
   },
   watch: {
@@ -249,19 +251,21 @@ export default {
       }, 400)
     }
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
     }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getPutTenantList()
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 13 - 7
src/views/allocationManagement/chainTransferOut/detail.vue

@@ -58,6 +58,7 @@
               :columns="columns"
               :data="loadData"
               :scroll="{ x: 1090 }"
+              :defaultLoadData="false"
               bordered>
             </s-table>
           </a-collapse-panel>
@@ -189,15 +190,20 @@ export default {
     }
   },
   mounted () {
-    this.getDetail()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.getDetail()
+      this.$refs.table.refresh(true)
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.getDetail()
+      this.$refs.table.refresh(true)
+    }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.getDetail()
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 11 - 14
src/views/allocationManagement/chainTransferOut/edit.vue

@@ -425,10 +425,6 @@ export default {
         }
       })
     },
-    //  导入明细
-    handleImport () {
-      console.log(333)
-    },
     //  返回列表
     handleBack () {
       this.$router.push({ path: '/allocationManagement/chainTransferOut/list', query: { closeLastOldTab: true } })
@@ -520,23 +516,24 @@ export default {
       }
     },
     pageInit () {
+      this.chooseResetSearchForm()
       this.getDetail()
       this.getWarehouseList()
-      if (!this.disabled) {
-        this.resetSearchForm()
-      }
-      if (!this.chooseDisabled) {
-        this.chooseResetSearchForm()
-      }
     }
   },
   mounted () {
-    this.pageInit()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.pageInit()
+    }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.pageInit()
-    })
+    next(vm => {})
   }
 }
 </script>

+ 17 - 13
src/views/allocationManagement/chainTransferOut/list.vue

@@ -84,6 +84,7 @@
         :columns="columns"
         :data="loadData"
         :scroll="{ x: 1380, y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         <!-- 连锁调出单号 -->
         <template slot="allocationLinkageOutNo" slot-scope="text, record">
@@ -291,17 +292,19 @@ export default {
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.openModal = false
+      this.getPutTenantList()
+    },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
     advanced (newValue, oldValue) {
       const _this = this
@@ -310,20 +313,21 @@ export default {
       }, 400)
     }
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
     }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.openModal = false
-      vm.getPutTenantList()
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 15 - 9
src/views/allocationManagement/storeTransferOut/detail.vue

@@ -56,6 +56,7 @@
           :columns="columns"
           :data="loadData"
           :scroll="{ x: 995 }"
+          :defaultLoadData="false"
           bordered>
         </s-table>
       </a-card>
@@ -184,17 +185,22 @@ export default {
     }
   },
   mounted () {
-    this.getDetail()
-    this.getDetailCount()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.$refs.table.refresh(true)
+      this.getDetail()
+      this.getDetailCount()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.$refs.table.refresh(true)
+      this.getDetail()
+      this.getDetailCount()
+    }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.spinning) {
-        vm.getDetail()
-        vm.getDetailCount()
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 13 - 14
src/views/allocationManagement/storeTransferOut/edit.vue

@@ -93,6 +93,7 @@
               :customRow="handleClickRow"
               :data="loadData"
               :scroll="{ x: 1180, y: 300 }"
+              :defaultLoadData="false"
               bordered>
               <!-- 操作 -->
               <template slot="action" slot-scope="text, record">
@@ -450,10 +451,6 @@ export default {
         }
       })
     },
-    //  导入明细
-    handleImport () {
-      console.log(333)
-    },
     //  返回列表
     handleBack () {
       this.$router.push({ path: '/allocationManagement/storeTransferOut/list', query: { closeLastOldTab: true } })
@@ -512,21 +509,23 @@ export default {
       this.getWarehouseList()
       this.getProductBrand()
       this.getProductType()
-      if (!this.disabled) {
-        this.resetSearchForm()
-      }
-      if (!this.chooseDisabled) {
-        this.chooseResetSearchForm()
-      }
+      this.resetSearchForm()
+      this.chooseResetSearchForm()
     }
   },
   mounted () {
-    this.pageInit()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.pageInit()
+    }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.pageInit()
-    })
+    next(vm => {})
   }
 }
 </script>

+ 17 - 13
src/views/allocationManagement/storeTransferOut/list.vue

@@ -73,6 +73,7 @@
         :columns="columns"
         :data="loadData"
         :scroll="{ x: 1500, y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         <!-- 店内调出单号 -->
         <template slot="storeCallOutNo" slot-scope="text, record">
@@ -276,17 +277,19 @@ export default {
         }
       })
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.openModal = false
+      this.getStoreCallOutTypeAllList()
+    },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
     advanced (newValue, oldValue) {
       const _this = this
@@ -295,20 +298,21 @@ export default {
       }, 400)
     }
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
     }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.openModal = false
-      vm.getStoreCallOutTypeAllList()
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 12 - 34
src/views/allocationManagement/warehouseAllocation/detail.vue

@@ -14,12 +14,6 @@
           编辑
         </a-button>
       </template>
-      <!-- 操作区,位于 title 行的行尾 -->
-      <!-- <template slot="extra">
-        <a-button key="2" id="warehouseAllocationDetail-preview-btn">打印预览</a-button>
-        <a-button key="1" type="primary" id="warehouseAllocationDetail-print-btn">快速打印</a-button>
-        <a-button key="3" type="danger" @click="handleExport" :loading="exportLoading" id="warehouseAllocationDetail-export-btn">导出</a-button>
-      </template> -->
     </a-page-header>
     <!-- 基础信息 -->
     <a-card size="small" :bordered="false" class="warehouseAllocationDetail-cont">
@@ -151,39 +145,23 @@ export default {
           this.productTotal = null
         }
       })
-    },
-    //  导出
-    handleExport () {
-      const params = this.queryParam
-      this.exportLoading = true
-      // customerBundleExportDelay(params).then(res => {
-      //   this.exportLoading = false
-      //   this.download(res)
-      // })
-    },
-    download (data) {
-      if (!data) { return }
-      const url = window.URL.createObjectURL(new Blob([data]))
-      const link = document.createElement('a')
-      link.style.display = 'none'
-      link.href = url
-      const a = moment().format('YYYYMMDDHHmmss')
-      const fname = '仓库调拨' + a
-      link.setAttribute('download', fname + '.xlsx')
-      document.body.appendChild(link)
-      link.click()
     }
   },
   mounted () {
-    this.getHouse()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.$refs.table.refresh(true)
+      this.getHouse()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.$refs.table.refresh(true)
+      this.getHouse()
+    }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.getHouse()
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 17 - 19
src/views/allocationManagement/warehouseAllocation/edit.vue

@@ -8,11 +8,6 @@
           <span style="margin: 0 15px;color: #666;">调出仓库:{{ (basicInfoData&&basicInfoData.outWarehouseName) || '--' }}</span>
           <span style="margin: 0 15px;color: #666;">调入仓库:{{ (basicInfoData&&basicInfoData.putWarehouseName) || '--' }}</span>
         </template>
-        <!-- 操作区,位于 title 行的行尾 -->
-        <!-- <template slot="extra">
-          <a-button key="2" id="warehouseAllocationEdit-preview-btn">打印预览</a-button>
-          <a-button key="1" type="primary" id="warehouseAllocationEdit-print-btn">快速打印</a-button>
-        </template> -->
       </a-page-header>
       <!-- 选择产品 -->
       <a-card size="small" :bordered="false" class="warehouseAllocationEdit-cont">
@@ -479,10 +474,6 @@ export default {
         }
       })
     },
-    //  导入明细
-    handleImport () {
-      console.log(333)
-    },
     //  返回列表
     handleBack () {
       this.$router.push({ path: '/allocationManagement/warehouseAllocation/list', query: { closeLastOldTab: true } })
@@ -539,21 +530,28 @@ export default {
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
+    },
+    pageInit () {
+      this.resetSearchForm()
+      this.chooseResetSearchForm()
+      this.getProductBrand()
+      this.getProductType()
+      this.getDetail()
     }
   },
   mounted () {
-    this.getDetail()
-    this.chooseResetSearchForm()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.pageInit()
+    }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getProductBrand()
-      vm.getProductType()
-      if (!vm.disabled) {
-        vm.getDetail()
-        vm.chooseResetSearchForm()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 16 - 12
src/views/allocationManagement/warehouseAllocation/list.vue

@@ -61,6 +61,7 @@
         :columns="columns"
         :data="loadData"
         :scroll="{ x: 1260, y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         <!-- 单号 -->
         <template slot="allocationWarehouseNo" slot-scope="text, record">
@@ -234,17 +235,18 @@ export default {
     handleEdit (row) {
       this.$router.push({ path: `/allocationManagement/warehouseAllocation/edit/${row.id}/${row.allocationWarehouseSn}` })
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.getWarehouseList()
+    },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
     advanced (newValue, oldValue) {
       const _this = this
@@ -253,19 +255,21 @@ export default {
       }, 400)
     }
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
     }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getWarehouseList()
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 13 - 12
src/views/financialManagement/companyCollectionPayment/detail.vue

@@ -6,11 +6,6 @@
         <a id="companyCollectionPaymentDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
         <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">单号:{{ (basicInfoData&&basicInfoData.unitSettleNo) || '--' }}</p>
       </template>
-      <!-- 操作区,位于 title 行的行尾 -->
-      <!-- <template slot="extra">
-        <a-button key="2" id="companyCollectionPaymentDetail-preview-btn">打印预览</a-button>
-        <a-button key="1" type="primary" id="companyCollectionPaymentDetail-print-btn">快速打印</a-button>
-      </template> -->
     </a-page-header>
     <!-- 基础信息 -->
     <a-card size="small" :bordered="false" class="companyCollectionPaymentDetail-cont">
@@ -51,6 +46,7 @@
             :columns="columns"
             :data="loadData"
             :scroll="{ x: 640 }"
+            :defaultLoadData="false"
             bordered>
           </s-table>
         </a-collapse-panel>
@@ -118,15 +114,20 @@ export default {
     }
   },
   mounted () {
-    this.getDetail()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.$refs.table.refresh(true)
+      this.getDetail()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.$refs.table.refresh(true)
+      this.getDetail()
+    }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.getDetail()
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 16 - 13
src/views/financialManagement/companyCollectionPayment/list.vue

@@ -83,6 +83,7 @@
       :columns="columns"
       :data="loadData"
       :scroll="{ x: 1340, y: tableHeight }"
+      :defaultLoadData="false"
       bordered>
       <!-- 结算单号 -->
       <template slot="unitSettleNo" slot-scope="text, record">
@@ -194,17 +195,18 @@ export default {
         }
       })
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.getSettleStyle()
+    },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 230
     }
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
     advanced (newValue, oldValue) {
       const _this = this
@@ -213,20 +215,21 @@ export default {
       }, 400)
     }
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
     }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getSettleStyle()
-      vm.resetSearchForm()
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 14 - 4
src/views/financialManagement/companyReceivablePayable/collectionPayment.vue

@@ -306,11 +306,21 @@ export default {
       this.openModal = false
     }
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.getSettleStyle()
+      this.chooseLoadData = []
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.getSettleStyle()
+      this.chooseLoadData = []
+    }
+  },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getSettleStyle()
-      vm.chooseLoadData = []
-    })
+    next(vm => {})
   }
 }
 </script>

+ 15 - 10
src/views/financialManagement/companyReceivablePayable/detail.vue

@@ -6,11 +6,6 @@
         <a id="companyCollectionPaymentDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
         <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">客户:{{ $route.params.name || '--' }}</p>
       </template>
-      <!-- 操作区,位于 title 行的行尾 -->
-      <!-- <template slot="extra">
-        <a-button key="2" id="companyCollectionPaymentDetail-preview-btn">打印预览</a-button>
-        <a-button key="1" type="primary" id="companyCollectionPaymentDetail-print-btn">快速打印</a-button>
-      </template> -->
     </a-page-header>
     <a-card>
       <!-- 搜索条件 -->
@@ -60,6 +55,7 @@
         :columns="columns"
         :data="loadData"
         :scroll="{ x: 800 }"
+        :defaultLoadData="false"
         bordered>
         <!-- 采购数量 -->
         <template slot="purchaseNum" slot-scope="text, record">
@@ -171,12 +167,21 @@ export default {
       link.click()
     }
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.$refs.table.refresh(true)
+      this.resetSearchForm()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.$refs.table.refresh(true)
+      this.resetSearchForm()
+    }
+  },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.resetSearchForm()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 13 - 9
src/views/financialManagement/companyReceivablePayable/list.vue

@@ -47,6 +47,7 @@
       :columns="columns"
       :data="loadData"
       :scroll="{ y: tableHeight }"
+      :defaultLoadData="false"
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
@@ -141,29 +142,32 @@ export default {
       this.queryParam.settleClientType = undefined
       this.$refs.table.refresh(true)
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 230
     }
   },
   mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
   },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
     }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 10 - 4
src/views/financialManagement/expenseManagement/edit.vue

@@ -201,12 +201,18 @@ export default {
     }
   },
   mounted () {
-    // this.pageInit()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.pageInit()
+    }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.pageInit()
-    })
+    next(vm => {})
   }
 }
 </script>

+ 15 - 11
src/views/financialManagement/expenseManagement/list.vue

@@ -76,6 +76,7 @@
         :columns="columns"
         :data="loadData"
         :scroll="{ x: 1120, y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         <!-- 费用类别 -->
         <template slot="expensesType" slot-scope="text, record">
@@ -303,17 +304,17 @@ export default {
       this.costType = []
       this.$refs.table.refresh(true)
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 270
     }
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
     advanced (newValue, oldValue) {
       const _this = this
@@ -322,18 +323,21 @@ export default {
       }, 400)
     }
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
     }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 24 - 21
src/views/financialManagement/financialCollection/list.vue

@@ -86,6 +86,7 @@
         :columns="columns"
         :data="loadData"
         :scroll="{ x: 1660, y: tableHeight }"
+        :defaultLoadData="false"
         bordered
       >
         <!-- 操作 -->
@@ -212,20 +213,6 @@ export default {
       }
     }
   },
-  activated () {
-    // 如果是新页签打开,则重置当前页面
-    if (this.$store.state.app.isNewTab) {
-      this.resetSearchForm()
-    }
-  },
-  beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.queryByTypeSum()
-      if (!vm.disabled) {
-        vm.resetSearchForm()
-      }
-    })
-  },
   methods: {
     //  时间  change
     dateChange (date) {
@@ -338,18 +325,18 @@ export default {
         })
       }
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.queryByTypeSum()
+    },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 330
     }
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-      _this.queryByTypeSum()
-    })
-  },
   watch: {
     advanced (newValue, oldValue) {
       const _this = this
@@ -357,6 +344,22 @@ export default {
         _this.setTableH()
       }, 400)
     }
+  },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
+  activated () {
+    // 如果是新页签打开,则重置当前页面
+    if (this.$store.state.app.isNewTab) {
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {})
   }
 }
 </script>

+ 24 - 21
src/views/financialManagement/financialPayment/list.vue

@@ -85,6 +85,7 @@
         :columns="columns"
         :data="loadData"
         :scroll="{ x: 1660, y: tableHeight }"
+        :defaultLoadData="false"
         bordered
       >
         <!-- 操作 -->
@@ -211,20 +212,6 @@ export default {
       }
     }
   },
-  activated () {
-    // 如果是新页签打开,则重置当前页面
-    if (this.$store.state.app.isNewTab) {
-      this.resetSearchForm()
-    }
-  },
-  beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.queryByTypeSum()
-      if (!vm.disabled) {
-        vm.resetSearchForm()
-      }
-    })
-  },
   methods: {
     //  时间  change
     dateChange (date) {
@@ -337,18 +324,18 @@ export default {
         })
       }
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.queryByTypeSum()
+    },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 330
     }
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-      _this.queryByTypeSum()
-    })
-  },
   watch: {
     advanced (newValue, oldValue) {
       const _this = this
@@ -356,6 +343,22 @@ export default {
         _this.setTableH()
       }, 400)
     }
+  },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
+  activated () {
+    // 如果是新页签打开,则重置当前页面
+    if (this.$store.state.app.isNewTab) {
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {})
   }
 }
 </script>

+ 15 - 11
src/views/financialManagement/inventoryCheckAudit/list.vue

@@ -34,6 +34,7 @@
         :columns="columns"
         :data="loadData"
         :scroll="{ x: 1150, y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         <!-- 单号 -->
         <template slot="checkWarehouseNo" slot-scope="text, record">
@@ -166,17 +167,17 @@ export default {
       this.queryParam.checkWarehouseNo = ''
       this.$refs.table.refresh(true)
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 195
     }
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
     advanced (newValue, oldValue) {
       const _this = this
@@ -185,18 +186,21 @@ export default {
       }, 400)
     }
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
     }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.resetSearchForm()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 0 - 161
src/views/financialManagement/inventoryReview/detail.vue

@@ -1,161 +0,0 @@
-<template>
-  <div class="inventoryReviewDetail-wrap">
-    <a-page-header :ghost="false" @back="handleBack" >
-      <!-- 自定义的二级文字标题 -->
-      <template slot="subTitle">
-        <a id="inventoryReviewDetail-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
-      </template>
-      <!-- 操作区,位于 title 行的行尾 -->
-      <!-- <template slot="extra">
-        <a-button key="2" id="inventoryReviewDetail-preview-btn">打印预览</a-button>
-        <a-button key="1" type="primary" id="inventoryReviewDetail-print-btn">快速打印</a-button>
-      </template> -->
-    </a-page-header>
-    <!-- 内容 -->
-    <a-page-header title="盘点单号:CG2021010100001" ></a-page-header>
-    <!-- alert -->
-    <a-alert type="info" style="margin-bottom:10px">
-      <div slot="message"><strong class="red">红色代表盘盈</strong>,<strong class="green">绿色代表盈亏</strong></div>
-    </a-alert>
-    <!-- 盈亏统计 -->
-    <a-card size="small" :bordered="false" class="inventoryReviewDetail-cont">
-      <a-collapse :activeKey="['1']">
-        <a-collapse-panel key="1" header="盈亏统计">
-          <a-descriptions :column="2" bordered>
-            <a-descriptions-item label="库存数量">2</a-descriptions-item>
-            <a-descriptions-item label="库存成本">20</a-descriptions-item>
-            <a-descriptions-item label="盘盈数量">¥120.36</a-descriptions-item>
-            <a-descriptions-item label="盘盈成本">3</a-descriptions-item>
-            <a-descriptions-item label="盘亏数量">4</a-descriptions-item>
-            <a-descriptions-item label="盘亏成本">¥11.2</a-descriptions-item>
-            <a-descriptions-item>
-              <template slot="label">
-                盈亏总数量
-                <a-popover>
-                  <template slot="content">
-                    盘盈数量与盘亏数量之和
-                  </template>
-                  <a-icon type="question-circle" theme="twoTone" />
-                </a-popover>
-              </template>
-              4
-            </a-descriptions-item>
-            <a-descriptions-item>
-              <template slot="label">
-                盈亏总成本
-                <a-popover>
-                  <template slot="content">
-                    盘盈成本与盘亏成本之和
-                  </template>
-                  <a-icon type="question-circle" theme="twoTone" />
-                </a-popover>
-              </template>
-              4
-            </a-descriptions-item>
-          </a-descriptions>
-        </a-collapse-panel>
-      </a-collapse>
-    </a-card>
-    <!-- 产品明细 -->
-    <a-card size="small" :bordered="false" class="inventoryReviewDetail-cont">
-      <a-collapse :activeKey="['1']">
-        <a-collapse-panel key="1" header="产品明细">
-          <!-- 列表 -->
-          <s-table
-            class="sTable"
-            ref="table"
-            size="small"
-            :rowKey="(record) => record.id"
-            :columns="columns"
-            :data="loadData"
-            :scroll="{ x: 1290 }"
-            bordered>
-            <!-- 采购数量 -->
-            <template slot="purchaseNum" slot-scope="text, record">
-              <span>{{ record.purchaseNum }}</span>
-            </template>
-            <!-- 缺货数量 -->
-            <template slot="outOfStockNum" slot-scope="text, record">
-              <span>{{ record.outOfStockNum }}</span>
-            </template>
-          </s-table>
-        </a-collapse-panel>
-      </a-collapse>
-    </a-card>
-  </div>
-</template>
-
-<script>
-import { STable, VSelect } from '@/components'
-export default {
-  components: { STable, VSelect },
-  data () {
-    return {
-      // 表头
-      columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
-        { title: '产品编码', dataIndex: 'productCode', width: 160, align: 'center' },
-        { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true },
-        { title: '单位', dataIndex: 'productOrigUnit', width: 100, align: 'center' },
-        { title: '仓库', dataIndex: 'warehouseName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '仓位', dataIndex: 'warehouseLocationName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '库存数量', dataIndex: 'qtsy', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '库存成本', dataIndex: 'price', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '盘点数量', dataIndex: 'qtssy', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '盘点盈亏数量', dataIndex: 'qtdsy', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '盘点盈亏成本', dataIndex: 'prifce', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
-      ],
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        this.disabled = true
-        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-        //   const data = res.data
-        //   const no = (data.pageNo - 1) * data.pageSize
-        //   for (var i = 0; i < data.list.length; i++) {
-        //     data.list[i].no = no + i + 1
-        //   }
-        //   this.disabled = false
-        //   return data
-        // })
-        const _this = this
-        return new Promise(function (resolve, reject) {
-          const data = {
-            pageNo: 1,
-            pageSize: 10,
-            list: [
-              { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-            ],
-            count: 10
-          }
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-          }
-          _this.disabled = false
-          resolve(data)
-        })
-      }
-    }
-  },
-  methods: {
-    //  返回列表
-    handleBack () {
-      this.$router.push({ path: '/financialManagement/inventoryReview/list', query: { closeLastOldTab: true } })
-    }
-  }
-}
-</script>
-
-<style lang="less">
-  .inventoryReviewDetail-wrap{
-    .inventoryReviewDetail-cont{
-      margin-bottom: 10px;
-    }
-    .green{
-      color: #19be6b;
-    }
-    .red{
-      color: #ed1c24;
-    }
-  }
-</style>

+ 0 - 190
src/views/financialManagement/inventoryReview/list.vue

@@ -1,190 +0,0 @@
-<template>
-  <a-card size="small" :bordered="false" class="inventoryReviewList-wrap">
-    <!-- 搜索条件 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-        <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="盘点单号">
-              <a-input id="inventoryReviewList-purchaseNo" v-model.trim="queryParam.purchaseNo" allowClear placeholder="请输入盘点单号"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="盘点审核时间">
-              <rangeDate ref="rangeDate" @change="dateChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="财务审核状态">
-              <v-select
-                v-model="queryParam.billStatus"
-                ref="billStatus"
-                id="inventoryReviewList-billStatus"
-                code="PAYMENT_TYPE"
-                placeholder="请选择财务审核状态"
-                allowClear></v-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryReviewList-refresh">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="inventoryReviewList-reset">重置</a-button>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- alert -->
-    <a-alert type="info" style="margin-bottom:10px">
-      <div slot="message">共 <strong>6</strong> 条记录,其中待审核 <strong>14</strong> 条 </div>
-    </a-alert>
-    <!-- 列表 -->
-    <s-table
-      class="sTable"
-      ref="table"
-      size="small"
-      :rowKey="(record) => record.id"
-      :columns="columns"
-      :data="loadData"
-      :scroll="{ x: 1300 }"
-      bordered>
-      <!-- 采购单号 -->
-      <template slot="purchaseNo" slot-scope="text, record">
-        <span style="color: #ed1c24;cursor: pointer;">{{ record.purchaseNo }}</span>
-      </template>
-      <!-- 采购入库单号 -->
-      <template slot="purchaseNos" slot-scope="text, record">
-        <span style="color: #ed1c24;cursor: pointer;">{{ record.purchaseNo }}</span>
-      </template>
-      <!-- 状态 -->
-      <template slot="state" slot-scope="text, record">
-        <span>{{ record.state == 1 ? '已启用' : '已禁用' }}</span>
-      </template>
-      <!-- 操作 -->
-      <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="primary" class="button-info" @click="handleExamine(record, 1)" id="inventoryReview-adopt-btn">通过</a-button>
-        <a-button size="small" type="primary" class="button-warning" @click="handleExamine(record, 2)" id="inventoryReview-unadopt-btn">不通过</a-button>
-        <a-button size="small" type="primary" class="button-success" @click="handleDetail(record)" id="inventoryReview-detail-btn">详情</a-button>
-      </template>
-    </s-table>
-  </a-card>
-</template>
-
-<script>
-import { STable, VSelect } from '@/components'
-import rangeDate from '@/views/common/rangeDate.vue'
-// import { getRoleList, getServiceList } from '@/api/manage'
-export default {
-  components: { STable, VSelect, rangeDate },
-  data () {
-    return {
-      disabled: false, //  查询、重置按钮是否可操作
-      // 查询参数
-      queryParam: {
-        beginDate: '',
-        endDate: ''
-      },
-      // 表头
-      columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '盘点单号', scopedSlots: { customRender: 'purchaseBillNo' }, align: 'center' },
-        { title: '盘点产品款数', dataIndex: 'totalCategory', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '库存总成本', dataIndex: 'totalAmount', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '盘盈总数量', dataIndex: 'totalQty', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '盘亏总数量', dataIndex: 'totalssQty', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '盘点审核时间', dataIndex: 'sauditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务审核状态', scopedSlots: { customRender: 'auditStatus' }, width: 120, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 250, align: 'center', fixed: 'right' }
-      ],
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        this.disabled = true
-        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-        //   const data = res.data
-        //   const no = (data.pageNo - 1) * data.pageSize
-        //   for (var i = 0; i < data.list.length; i++) {
-        //     data.list[i].no = no + i + 1
-        //   }
-        //   this.disabled = false
-        //   return data
-        // })
-        const _this = this
-        return new Promise(function (resolve, reject) {
-          const data = {
-            pageNo: 1,
-            pageSize: 10,
-            list: [
-              { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-            ],
-            count: 10
-          }
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-          }
-          _this.disabled = false
-          resolve(data)
-        })
-      }
-    }
-  },
-  activated () {
-    // 如果是新页签打开,则重置当前页面
-    if (this.$store.state.app.isNewTab) {
-      this.resetSearchForm()
-    }
-  },
-  methods: {
-    //  时间  change
-    dateChange (date) {
-      this.queryParam.beginDate = date[0]
-      this.queryParam.endDate = date[1]
-    },
-    //  详情
-    handleDetail (row) {
-      this.$router.push({ path: `/financialManagement/inventoryReview/detail/${row.id}` })
-    },
-    //  审核
-    handleExamine (row, type) {
-      const _this = this
-      this.$confirm({
-        title: '提示',
-        content: '操作后不可恢复,确定要进行' + (type == 1 ? ' 通过 ' : ' 不通过 ') + '操作吗?',
-        centered: true,
-        onOk () {
-          // delectRolePower({
-          //   id: row.id
-          // }).then(res => {
-          //   console.log(res, 'res1111')
-          //   if (res.status == 200) {
-          //     _this.$message.success(res.message)
-          //     _this.$refs.table.refresh()
-          //   }
-          // })
-        }
-      })
-    },
-    //  重置
-    resetSearchForm () {
-      this.$refs.rangeDate.resetDate()
-      this.queryParam.beginDate = ''
-      this.queryParam.endDate = ''
-      this.queryParam.orderBundleNo = ''
-      this.queryParam.orderBundle.custMobile = ''
-      this.queryParam.bundleName = ''
-      this.queryParam.itemName = ''
-      this.oldTime = undefined
-      this.newTime = undefined
-      this.$refs.table.refresh(true)
-    }
-  }
-}
-</script>
-<style lang="less">
-  .inventoryReviewList-wrap{
-    .sTable{
-      margin-top: 15px;
-    }
-  }
-</style>

+ 15 - 11
src/views/financialManagement/ledgerRecord/list.vue

@@ -56,6 +56,7 @@
       :columns="columns"
       :data="loadData"
       :scroll="{ x: 1690 }"
+      :defaultLoadData="false"
       bordered>
     </s-table>
   </a-card>
@@ -154,17 +155,17 @@ export default {
       this.$refs.custSatelliteList.resetForm()
       this.$refs.table.refresh(true)
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 230
     }
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
     advanced (newValue, oldValue) {
       const _this = this
@@ -173,18 +174,21 @@ export default {
       }, 400)
     }
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
     }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 13 - 7
src/views/financialManagement/warehousingAudit/detail.vue

@@ -50,6 +50,7 @@
               :columns="columns"
               :data="loadData"
               :scroll="{ x: 1520 }"
+              :defaultLoadData="false"
               bordered>
             </s-table>
           </a-collapse-panel>
@@ -150,15 +151,20 @@ export default {
     }
   },
   mounted () {
-    this.getDetail()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.$refs.table.refresh(true)
+      this.getDetail()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.$refs.table.refresh(true)
+      this.getDetail()
+    }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.getDetail()
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 15 - 11
src/views/financialManagement/warehousingAudit/list.vue

@@ -63,6 +63,7 @@
         :columns="columns"
         :data="loadData"
         :scroll="{ x: 1420, y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         <!-- 采购入库单号 -->
         <template slot="receivingBillNo" slot-scope="text, record">
@@ -204,17 +205,17 @@ export default {
       this.queryParam.auditState = undefined
       this.$refs.table.refresh(true)
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 238
     }
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
     advanced (newValue, oldValue) {
       const _this = this
@@ -223,18 +224,21 @@ export default {
       }, 400)
     }
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
     }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.resetSearchForm()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 16 - 10
src/views/financialManagement/withdrawalManagement/list.vue

@@ -33,6 +33,7 @@
       :columns="columns"
       :data="loadData"
       :scroll="{ x: 1320 }"
+      :defaultLoadData="false"
       bordered>
     </s-table>
     <!-- 提现说明 -->
@@ -139,18 +140,18 @@ export default {
       this.queryParam.endDate = ''
       this.$refs.table.refresh(true)
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.getAccount()
+    },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235 - 217.5
     }
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-    _this.getAccount()
-  },
   watch: {
     advanced (newValue, oldValue) {
       const _this = this
@@ -159,16 +160,21 @@ export default {
       }, 400)
     }
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
     }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getAccount()
-    })
+    next(vm => {})
   }
 }
 </script>

+ 15 - 11
src/views/inventoryManagement/inventoryChecking/list.vue

@@ -56,6 +56,7 @@
       :columns="columns"
       :data="loadData"
       :scroll="{ x: 1160, y: tableHeight }"
+      :defaultLoadData="false"
       bordered>
       <!-- 单号 -->
       <template slot="checkWarehouseNo" slot-scope="text, record">
@@ -265,17 +266,17 @@ export default {
       this.itemSn = null
       this.openDetailModal = false
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
     advanced (newValue, oldValue) {
       const _this = this
@@ -284,18 +285,21 @@ export default {
       }, 400)
     }
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
     }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 13 - 7
src/views/inventoryManagement/inventoryChecking/makeInventory.vue

@@ -113,6 +113,7 @@
           :columns="columns"
           :data="loadData"
           :scroll="{ x: 990 }"
+          :defaultLoadData="false"
           bordered>
           <!-- 产品分类 -->
           <template slot="productType" slot-scope="text, record">
@@ -424,15 +425,20 @@ export default {
     }
   },
   mounted () {
-    this.getDetail()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.getDetail()
+      this.resetSearchForm()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.getDetail()
+      this.resetSearchForm()
+    }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.getDetail()
-        vm.resetSearchForm()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 15 - 3
src/views/inventoryManagement/inventoryChecking/overall.vue

@@ -55,6 +55,7 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
+          :defaultLoadData="false"
           bordered>
         </s-table>
       </a-card>
@@ -161,10 +162,21 @@ export default {
       })
     }
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.getDetail()
+      this.resetSearchForm()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.getDetail()
+      this.resetSearchForm()
+    }
+  },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getDetail()
-    })
+    next(vm => {})
   }
 }
 </script>

+ 16 - 8
src/views/inventoryManagement/inventoryChecking/selfDisk.vue

@@ -94,6 +94,7 @@
           :customRow="handleClickRow"
           :data="loadData"
           :scroll="{ x: 1340, y: 300 }"
+          :defaultLoadData="false"
           bordered>
           <!-- 产品分类 -->
           <template slot="productType" slot-scope="text, record">
@@ -183,6 +184,7 @@
           :columns="chooseColumns"
           :data="chooseLoadData"
           :scroll="{ x: 1420, y: 300 }"
+          :defaultLoadData="false"
           bordered>
           <!-- 产品分类 -->
           <template slot="productType" slot-scope="text, record">
@@ -607,16 +609,22 @@ export default {
     }
   },
   mounted () {
-    this.getDetail()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.getDetail()
+      this.resetSearchForm()
+      this.chooseResetSearchForm()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.getDetail()
+      this.resetSearchForm()
+      this.chooseResetSearchForm()
+    }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.getDetail()
-        vm.resetSearchForm()
-        vm.chooseResetSearchForm()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 13 - 6
src/views/inventoryManagement/inventoryImport/list.vue

@@ -206,17 +206,17 @@ export default {
       document.body.appendChild(link)
       link.click()
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 400
     }
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
     advanced (newValue, oldValue) {
       const _this = this
@@ -225,9 +225,16 @@ export default {
       }, 400)
     }
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
     }
   },

+ 15 - 11
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -89,6 +89,7 @@
         :columns="columns"
         :data="loadData"
         :scroll="{ x: 1340, y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         <!-- 产品分类 -->
         <template slot="productTypeName" slot-scope="text, record">
@@ -334,17 +335,17 @@ export default {
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 230
     }
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
     advanced (newValue, oldValue) {
       const _this = this
@@ -353,18 +354,21 @@ export default {
       }, 400)
     }
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
     }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.resetSearchForm()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 21 - 12
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -80,6 +80,7 @@
         :columns="columns"
         :data="loadData"
         :scroll="{ x: 1760, y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         <!-- 数量 -->
         <template slot="qty" slot-scope="text, record">
@@ -196,17 +197,19 @@ export default {
         }
       })
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.getWarehouseList()
+      this.resetSearchForm()
+    },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 285
     }
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
     advanced (newValue, oldValue) {
       const _this = this
@@ -215,13 +218,19 @@ export default {
       }, 400)
     }
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.pageInit()
+    }
+  },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.getWarehouseList()
-        vm.resetSearchForm()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 17 - 13
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -104,6 +104,7 @@
         :columns="columns"
         :data="loadData"
         :scroll="{ x: 1490, y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         <!-- 产品分类 -->
         <template slot="productType" slot-scope="text, record">
@@ -423,17 +424,19 @@ export default {
       document.body.appendChild(link)
       link.click()
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.getProductType()
+      this.getProductBrand()
+    },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
     advanced (newValue, oldValue) {
       const _this = this
@@ -442,20 +445,21 @@ export default {
       }, 400)
     }
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
     }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getProductType()
-      vm.getProductBrand()
-      if (!vm.disabled) {
-        vm.resetSearchForm()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 12 - 9
src/views/inventoryManagement/satelliteWarehouseInventory/list.vue

@@ -185,29 +185,32 @@ export default {
     closeModal () {
       this.openModal = false
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
   mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
   },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
     }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.resetSearchForm()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 15 - 11
src/views/inventoryManagement/warehouse/list.vue

@@ -31,6 +31,7 @@
         :columns="columns"
         :data="loadData"
         :scroll="{ y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
@@ -153,29 +154,32 @@ export default {
     goStoringLocation (row) {
       this.$router.push({ path: `/inventoryManagement/storingLocation/${row.warehouseSn}`, query: { name: row.name } })
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
     }
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.resetSearchForm()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 15 - 11
src/views/inventoryManagement/warehouse/storingLocation/list.vue

@@ -39,6 +39,7 @@
           :columns="columns"
           :data="loadData"
           :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
           bordered>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
@@ -164,29 +165,32 @@ export default {
     handleBack () {
       this.$router.push({ path: '/inventoryManagement/warehouse/list', query: { closeLastOldTab: true } })
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 290
     }
   },
   mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
   },
   activated () {
-    // 如果是新页签打开,则重置当前页面
-    if (this.$store.state.app.isNewTab) {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.pageInit()
       this.resetSearchForm()
     }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.resetSearchForm()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 15 - 11
src/views/outboundOrderManagement/outboundOrder/list.vue

@@ -61,6 +61,7 @@
         :columns="columns"
         :data="loadData"
         :scroll="{ y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
@@ -306,17 +307,17 @@ export default {
     onSelectChange (selectedRowKeys) {
       this.selectedRowKeys = selectedRowKeys
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 195
     }
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
     advanced (newValue, oldValue) {
       const _this = this
@@ -325,18 +326,21 @@ export default {
       }, 400)
     }
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
     }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.resetSearchForm()
-      }
-    })
+    next(vm => {})
   }
 }
 </script>

+ 7 - 1
src/views/productManagement/productInfo/edit.vue

@@ -308,9 +308,15 @@ export default {
   mounted () {
     this.pageInit()
   },
+  activated () {
+    // 如果是新页签打开,则重置当前页面
+    if (this.$store.state.app.isNewTab) {
+      this.pageInit()
+    }
+  },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.pageInit()
+      // vm.pageInit()
     })
   }
 }