Selaa lähdekoodia

bug修复。窗口大小变更时,表格高度也应随之变更

chenrui 3 vuotta sitten
vanhempi
commit
80104273f7
51 muutettua tiedostoa jossa 226 lisäystä ja 32 poistoa
  1. 18 6
      src/layouts/PageView.vue
  2. 8 1
      src/store/modules/app.js
  3. 3 0
      src/views/allocationManagement/chainTransferIn/list.vue
  4. 3 0
      src/views/allocationManagement/chainTransferOut/list.vue
  5. 3 0
      src/views/allocationManagement/storeTransferOut/list.vue
  6. 8 5
      src/views/allocationManagement/warehouseAllocation/list.vue
  7. 5 0
      src/views/basicData/bulkPartsTypeManagement/list.vue
  8. 5 0
      src/views/basicData/customerTypeManagement/list.vue
  9. 5 0
      src/views/basicData/expenseType/list.vue
  10. 5 0
      src/views/basicData/storeTransferOutTypeManagement/list.vue
  11. 3 0
      src/views/bulkManagement/bulkImport/list.vue
  12. 3 0
      src/views/bulkManagement/bulkReturnGoods/list.vue
  13. 3 0
      src/views/bulkManagement/bulkWarehousingOrder/list.vue
  14. 3 0
      src/views/customerManagement/customerInfo/list.vue
  15. 3 0
      src/views/financialManagement/companyCollectionPayment/list.vue
  16. 5 0
      src/views/financialManagement/companyReceivablePayable/list.vue
  17. 3 0
      src/views/financialManagement/expenseManagement/list.vue
  18. 3 0
      src/views/financialManagement/financialCollection/list.vue
  19. 3 0
      src/views/financialManagement/financialPayment/list.vue
  20. 3 0
      src/views/financialManagement/inventoryCheckAudit/list.vue
  21. 3 0
      src/views/financialManagement/ledgerRecord/list.vue
  22. 3 0
      src/views/financialManagement/warehousingAudit/list.vue
  23. 3 0
      src/views/financialManagement/withdrawalManagement/list.vue
  24. 3 0
      src/views/inventoryManagement/inventoryChecking/list.vue
  25. 3 0
      src/views/inventoryManagement/inventoryImport/list.vue
  26. 3 0
      src/views/inventoryManagement/inventoryQuery/list.vue
  27. 3 0
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  28. 3 0
      src/views/inventoryManagement/inventoryWarning/list.vue
  29. 5 0
      src/views/inventoryManagement/satelliteWarehouseInventory/list.vue
  30. 5 0
      src/views/inventoryManagement/warehouse/list.vue
  31. 5 0
      src/views/inventoryManagement/warehouse/storingLocation/list.vue
  32. 15 12
      src/views/notice/list.vue
  33. 4 1
      src/views/outboundOrderManagement/outboundOrder/list.vue
  34. 5 0
      src/views/power/role/roleList.vue
  35. 5 0
      src/views/power/user/userList.vue
  36. 3 0
      src/views/productManagement/newProduct/list.vue
  37. 3 0
      src/views/productManagement/priceChangeRecord/list.vue
  38. 5 0
      src/views/productManagement/productBrand/list.vue
  39. 3 0
      src/views/productManagement/productInfo/list.vue
  40. 3 0
      src/views/productManagement/productInfoJg/list.vue
  41. 4 1
      src/views/productManagement/productOnlineInfo/list.vue
  42. 4 1
      src/views/purchasingManagement/purchaseOrder/list.vue
  43. 4 1
      src/views/purchasingManagement/purchaseReturn/list.vue
  44. 4 1
      src/views/salesManagement/giftRecord/list.vue
  45. 3 0
      src/views/salesManagement/salesQuery/list.vue
  46. 3 0
      src/views/salesManagement/salesReturn/list.vue
  47. 3 0
      src/views/salesManagement/salesman/list.vue
  48. 6 3
      src/views/salesManagement/urgentItemsOffset/list.vue
  49. 5 0
      src/views/storeManagement/bind/list.vue
  50. 5 0
      src/views/storeManagement/userAuthorization/list.vue
  51. 5 0
      src/views/supplierManagement/supplierInfo/list.vue

+ 18 - 6
src/layouts/PageView.vue

@@ -38,7 +38,7 @@
         </div>
       </div>
     </page-header>
-    <div class="content" :style="{ height: contHeight+'px' }">
+    <div class="content" :style="{ height: pageHeight+'px' }">
       <div class="page-header-index-wide">
         <slot>
           <!-- keep-alive  -->
@@ -86,25 +86,37 @@ export default {
       linkList: [],
       extraImage: '',
       search: false,
-      tabs: {}
+      tabs: {},
+      pageHeight: 0
     }
   },
   computed: {
     ...mapState({
       multiTab: state => state.app.multiTab
-    }),
-    contHeight () {
-      return window.innerHeight - 85
-    }
+    })
+    // contHeight () {
+    //   return window.innerHeight - 80
+    // }
   },
   mounted () {
     this.tabs = this.directTabs
     this.getPageMeta()
+    this.setpageH()
+    const _this = this
+    window.onresize = () => {
+      return (() => {
+        _this.$store.dispatch('SetWinHeight', window.innerHeight)
+        _this.setpageH()
+      })()
+    }
   },
   updated () {
     this.getPageMeta()
   },
   methods: {
+    setpageH () {
+      this.pageHeight = window.innerHeight - 85
+    },
     getPageMeta () {
       // eslint-disable-next-line
       this.pageTitle = (typeof(this.title) === 'string' || !this.title) ? this.title : this.$route.meta.title

+ 8 - 1
src/store/modules/app.js

@@ -29,7 +29,8 @@ const app = {
     isShowVideo: false, // 是否显示视频弹窗
     isNewTab: false,
     isNewSubTab: false,
-    updateList: false
+    updateList: false,
+    winHeight: 0 //  窗口高度
   },
   mutations: {
     SET_SIDEBAR_TYPE: (state, type) => {
@@ -87,6 +88,9 @@ const app = {
     // 是否显示视频弹窗
     IS_ShOW_VIDEO: (state, bool) => {
       state.isShowVideo = bool
+    },
+    SET_WIN_HEIGHT: (state, val) => {
+      state.winHeight = val
     }
   },
   actions: {
@@ -152,6 +156,9 @@ const app = {
       commit
     }, bool) {
       commit('TOGGLE_MULTI_TAB', bool)
+    },
+    SetWinHeight ({ commit }, val) {
+      commit('SET_WIN_HEIGHT', val)
     }
   }
 }

+ 3 - 0
src/views/allocationManagement/chainTransferIn/list.vue

@@ -249,6 +249,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/allocationManagement/chainTransferOut/list.vue

@@ -316,6 +316,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/allocationManagement/storeTransferOut/list.vue

@@ -301,6 +301,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 8 - 5
src/views/allocationManagement/warehouseAllocation/list.vue

@@ -121,12 +121,12 @@ export default {
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       warehouseList: [], // 仓库列表
-     time: [
-       getDate.getCurrMonthDays().starttime,
-       getDate.getCurrMonthDays().endtime
-     ],
+      time: [
+        getDate.getCurrMonthDays().starttime,
+        getDate.getCurrMonthDays().endtime
+      ],
       queryParam: { //  查询条件
-        beginDate:  getDate.getCurrMonthDays().starttime,
+        beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
         outWarehouseSn: undefined, //  调出仓库
         putWarehouseSn: undefined, //  调入仓库
@@ -258,6 +258,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 5 - 0
src/views/basicData/bulkPartsTypeManagement/list.vue

@@ -134,6 +134,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 195
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 5 - 0
src/views/basicData/customerTypeManagement/list.vue

@@ -150,6 +150,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 5 - 0
src/views/basicData/expenseType/list.vue

@@ -170,6 +170,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 195
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 5 - 0
src/views/basicData/storeTransferOutTypeManagement/list.vue

@@ -135,6 +135,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 195
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 3 - 0
src/views/bulkManagement/bulkImport/list.vue

@@ -229,6 +229,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -329,6 +329,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -359,6 +359,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/customerManagement/customerInfo/list.vue

@@ -343,6 +343,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/financialManagement/companyCollectionPayment/list.vue

@@ -213,6 +213,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 5 - 0
src/views/financialManagement/companyReceivablePayable/list.vue

@@ -153,6 +153,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 230
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 3 - 0
src/views/financialManagement/expenseManagement/list.vue

@@ -321,6 +321,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/financialManagement/financialCollection/list.vue

@@ -344,6 +344,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/financialManagement/financialPayment/list.vue

@@ -343,6 +343,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/financialManagement/inventoryCheckAudit/list.vue

@@ -184,6 +184,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/financialManagement/ledgerRecord/list.vue

@@ -172,6 +172,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/financialManagement/warehousingAudit/list.vue

@@ -222,6 +222,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/financialManagement/withdrawalManagement/list.vue

@@ -158,6 +158,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/inventoryManagement/inventoryChecking/list.vue

@@ -283,6 +283,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/inventoryManagement/inventoryImport/list.vue

@@ -223,6 +223,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

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

@@ -353,6 +353,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -216,6 +216,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -443,6 +443,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 5 - 0
src/views/inventoryManagement/satelliteWarehouseInventory/list.vue

@@ -196,6 +196,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 5 - 0
src/views/inventoryManagement/warehouse/list.vue

@@ -165,6 +165,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 5 - 0
src/views/inventoryManagement/warehouse/storingLocation/list.vue

@@ -176,6 +176,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 290
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 15 - 12
src/views/notice/list.vue

@@ -95,18 +95,6 @@ export default {
       return this.$store.getters.wsMessageData()
     }
   },
-  watch: {
-    // 监听ws消息通知
-    wsMessage (a, b) {
-      if (a !== b && a) {
-        // 新未读消息
-        if (a.type == 'no_read_count') {
-          this.resetData()
-          this.handelSearch()
-        }
-      }
-    }
-  },
   methods: {
     ...mapActions([
       'getMessageList', // 查询列表
@@ -208,6 +196,21 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 210
     }
   },
+  watch: {
+    // 监听ws消息通知
+    wsMessage (a, b) {
+      if (a !== b && a) {
+        // 新未读消息
+        if (a.type == 'no_read_count') {
+          this.resetData()
+          this.handelSearch()
+        }
+      }
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 4 - 1
src/views/outboundOrderManagement/outboundOrder/list.vue

@@ -373,7 +373,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 195
+      this.tableHeight = window.innerHeight - tableSearchH - 205
     }
   },
   watch: {
@@ -382,6 +382,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 5 - 0
src/views/power/role/roleList.vue

@@ -228,6 +228,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 255
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 5 - 0
src/views/power/user/userList.vue

@@ -233,6 +233,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 3 - 0
src/views/productManagement/newProduct/list.vue

@@ -241,6 +241,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/productManagement/priceChangeRecord/list.vue

@@ -337,6 +337,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 5 - 0
src/views/productManagement/productBrand/list.vue

@@ -163,6 +163,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 3 - 0
src/views/productManagement/productInfo/list.vue

@@ -340,6 +340,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/productManagement/productInfoJg/list.vue

@@ -296,6 +296,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 4 - 1
src/views/productManagement/productOnlineInfo/list.vue

@@ -249,7 +249,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 195
+      this.tableHeight = window.innerHeight - tableSearchH - 205
     }
   },
   watch: {
@@ -258,6 +258,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 4 - 1
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -170,7 +170,7 @@ export default {
         financialStatus: undefined,
         purchaseBillSource: undefined,
         beginDate: getDate.getCurrMonthDays().starttime,
-        endDate:  getDate.getCurrMonthDays().endtime
+        endDate: getDate.getCurrMonthDays().endtime
       },
       totalData: {
         totalRecord: 0,
@@ -322,6 +322,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 4 - 1
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -165,7 +165,7 @@ export default {
     //  重置
     resetSearchForm () {
       this.$refs.rangeDate.resetDate(this.time)
-      this.queryParam.beginDate =  getDate.getCurrMonthDays().starttime
+      this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.purchaseReturnNo = ''
       this.queryParam.state = undefined
@@ -281,6 +281,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 4 - 1
src/views/salesManagement/giftRecord/list.vue

@@ -76,7 +76,7 @@ export default {
       ],
       queryParam: { //  查询条件
         beginDate: getDate.getCurrMonthDays().starttime,
-        endDate:  getDate.getCurrMonthDays().endtime,
+        endDate: getDate.getCurrMonthDays().endtime,
         productCode: '', //  产品编码
         productOrigCode: '', //  原厂编码
         salesBillNo: '', //  关联销售单号
@@ -153,6 +153,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/salesManagement/salesQuery/list.vue

@@ -443,6 +443,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   activated () {

+ 3 - 0
src/views/salesManagement/salesReturn/list.vue

@@ -289,6 +289,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/salesManagement/salesman/list.vue

@@ -197,6 +197,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 6 - 3
src/views/salesManagement/urgentItemsOffset/list.vue

@@ -85,9 +85,9 @@ export default {
       tableHeight: 0,
       advanced: true, // 高级搜索 展开/关闭
       time: [
-              getDate.getCurrMonthDays().starttime,
-              getDate.getCurrMonthDays().endtime
-            ],
+        getDate.getCurrMonthDays().starttime,
+        getDate.getCurrMonthDays().endtime
+      ],
       queryParam: { //  查询条件
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
@@ -174,6 +174,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   activated () {

+ 5 - 0
src/views/storeManagement/bind/list.vue

@@ -154,6 +154,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 5 - 0
src/views/storeManagement/userAuthorization/list.vue

@@ -164,6 +164,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 5 - 0
src/views/supplierManagement/supplierInfo/list.vue

@@ -137,6 +137,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()