فهرست منبع

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

chenrui 3 سال پیش
والد
کامیت
d23992a83f
56فایلهای تغییر یافته به همراه255 افزوده شده و 29 حذف شده
  1. 18 6
      src/layouts/PageView.vue
  2. 8 1
      src/store/modules/app.js
  3. 4 1
      src/views/allocationManagement/transferOut/list.vue
  4. 5 0
      src/views/basicData/transferTypeManagement/list.vue
  5. 5 0
      src/views/basicData/warehouse/list.vue
  6. 5 0
      src/views/basicData/warehouse/storingLocation/list.vue
  7. 5 0
      src/views/dealerManagement/dealerAccountManagement/list.vue
  8. 5 0
      src/views/dealerManagement/dealerRelationshipBinding/list.vue
  9. 5 0
      src/views/dealerManagement/marketingDivisionSet/list.vue
  10. 4 1
      src/views/dealerManagement/merchantInfoManagement/list.vue
  11. 6 1
      src/views/dealerManagement/merchantInfoManagement/permissionSetting.vue
  12. 5 0
      src/views/dealerManagement/rebateSettings/list.vue
  13. 3 0
      src/views/financialManagement/financialCollection/list.vue
  14. 5 0
      src/views/financialManagement/inventoryConfirmation/list.vue
  15. 3 0
      src/views/financialManagement/returnConfirmation/list.vue
  16. 5 0
      src/views/financialManagement/warehousingConfirmation/list.vue
  17. 5 0
      src/views/inventoryManagement/intelligentReplenishment/list.vue
  18. 5 0
      src/views/inventoryManagement/inventoryCheck/list.vue
  19. 4 1
      src/views/inventoryManagement/inventoryQuery/list.vue
  20. 7 4
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  21. 3 0
      src/views/inventoryManagement/inventoryWarning/list.vue
  22. 5 0
      src/views/inventoryManagement/makeInventory/list.vue
  23. 0 2
      src/views/inventoryManagement/supervisionDisk/check.vue
  24. 5 0
      src/views/inventoryManagement/supervisionDisk/list.vue
  25. 5 0
      src/views/power/OperateJournal/OperateJournal.vue
  26. 5 0
      src/views/power/role/roleList.vue
  27. 5 0
      src/views/power/user/userList.vue
  28. 3 0
      src/views/productManagement/newProduct/list.vue
  29. 3 0
      src/views/productManagement/priceChangeRecord/list.vue
  30. 5 0
      src/views/productManagement/productBrand/list.vue
  31. 3 0
      src/views/productManagement/productInfo/list.vue
  32. 5 0
      src/views/productManagement/productLaunchAudit/list.vue
  33. 3 0
      src/views/productManagement/productLevel/list.vue
  34. 3 0
      src/views/productManagement/productOfflineAudit/list.vue
  35. 3 0
      src/views/productManagement/productPricing/list.vue
  36. 3 0
      src/views/productManagement/productUniversal/list.vue
  37. 3 0
      src/views/promotionRulesManagement/orderStatistics/list.vue
  38. 3 0
      src/views/promotionRulesManagement/productStatistics/list.vue
  39. 3 0
      src/views/promotionRulesManagement/promotionRules/detail.vue
  40. 5 0
      src/views/promotionRulesManagement/promotionRules/list.vue
  41. 5 0
      src/views/promotionRulesManagement/promotionRules/rule.vue
  42. 5 0
      src/views/purchasingManagement/bulkWarehousingOrder/list.vue
  43. 5 0
      src/views/salesManagement/backorder/list.vue
  44. 3 0
      src/views/salesManagement/examineVerify/list.vue
  45. 3 0
      src/views/salesManagement/outboundOrder/list.vue
  46. 3 0
      src/views/salesManagement/priceInquiry/list.vue
  47. 3 0
      src/views/salesManagement/pushOrderManagement/list.vue
  48. 3 0
      src/views/salesManagement/salesQuery/list.vue
  49. 3 0
      src/views/salesManagement/salesReturn/list.vue
  50. 3 0
      src/views/salesManagement/shortageStatisticsC/list.vue
  51. 3 0
      src/views/salesManagement/shortageStatisticsP/list.vue
  52. 15 12
      src/views/setting/notice/list.vue
  53. 5 0
      src/views/setting/noticeManagement/list.vue
  54. 3 0
      src/views/supplierManagement/associatedProduct/add.vue
  55. 3 0
      src/views/supplierManagement/associatedProductDetails/list.vue
  56. 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 - 80
-    }
+    })
+    // 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 - 80
+    },
     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

@@ -27,7 +27,8 @@ const app = {
     multiTab: true,
     isNewTab: false,
     isNewSubTab: false,
-    updateList: false
+    updateList: false,
+    winHeight: 0 //  窗口高度
   },
   mutations: {
     SET_SIDEBAR_TYPE: (state, type) => {
@@ -77,6 +78,9 @@ const app = {
     TOGGLE_MULTI_TAB: (state, bool) => {
       Vue.ls.set(DEFAULT_MULTI_TAB, bool)
       state.multiTab = bool
+    },
+    SET_WIN_HEIGHT: (state, val) => {
+      state.winHeight = val
     }
   },
   actions: {
@@ -118,6 +122,9 @@ const app = {
     },
     ToggleMultiTab ({ commit }, bool) {
       commit('TOGGLE_MULTI_TAB', bool)
+    },
+    SetWinHeight ({ commit }, val) {
+      commit('SET_WIN_HEIGHT', val)
     }
   }
 }

+ 4 - 1
src/views/allocationManagement/transferOut/list.vue

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

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

@@ -127,6 +127,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.$refs.table.refresh(true)

+ 5 - 0
src/views/basicData/warehouse/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()

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

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

+ 5 - 0
src/views/dealerManagement/dealerAccountManagement/list.vue

@@ -220,6 +220,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/dealerManagement/dealerRelationshipBinding/list.vue

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

+ 5 - 0
src/views/dealerManagement/marketingDivisionSet/list.vue

@@ -140,6 +140,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()

+ 4 - 1
src/views/dealerManagement/merchantInfoManagement/list.vue

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

+ 6 - 1
src/views/dealerManagement/merchantInfoManagement/permissionSetting.vue

@@ -288,7 +288,12 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 295
+      this.tableHeight = window.innerHeight - tableSearchH - 292
+    }
+  },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 5 - 0
src/views/dealerManagement/rebateSettings/list.vue

@@ -139,6 +139,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/financialManagement/financialCollection/list.vue

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

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

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

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

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

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

@@ -252,6 +252,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/intelligentReplenishment/list.vue

@@ -190,6 +190,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()

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

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

+ 4 - 1
src/views/inventoryManagement/inventoryQuery/list.vue

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

+ 7 - 4
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -158,10 +158,10 @@ export default {
   computed: {
     columns () {
       const arr = [
-        { title: '序号', dataIndex: 'no', width: '4%', align: 'center',  },
-        { title: '产品编码', dataIndex: 'productCode', width: '6%', align: 'center',customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: '14%',align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: '6%',align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '14%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '批次号', dataIndex: 'stockBatchNo', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据类型', dataIndex: 'bizTypeDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '关联单号', dataIndex: 'bizNo', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -241,6 +241,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

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

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

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

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

+ 0 - 2
src/views/inventoryManagement/supervisionDisk/check.vue

@@ -443,7 +443,6 @@ export default {
   },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
-      console.log(111)
       this.resetSearchForm()
       this.getDetail()
     }
@@ -451,7 +450,6 @@ export default {
   activated () {
     // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
     if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
-      console.log(222)
       this.resetSearchForm()
       this.getDetail()
     }

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

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

+ 5 - 0
src/views/power/OperateJournal/OperateJournal.vue

@@ -120,6 +120,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/power/role/roleList.vue

@@ -229,6 +229,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

@@ -232,6 +232,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

@@ -228,6 +228,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

@@ -212,6 +212,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

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

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

@@ -209,6 +209,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/productLevel/list.vue

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

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

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

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

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

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

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

+ 3 - 0
src/views/promotionRulesManagement/orderStatistics/list.vue

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

+ 3 - 0
src/views/promotionRulesManagement/productStatistics/list.vue

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

+ 3 - 0
src/views/promotionRulesManagement/promotionRules/detail.vue

@@ -240,6 +240,9 @@ export default {
         }
       },
       deep: true
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 5 - 0
src/views/promotionRulesManagement/promotionRules/list.vue

@@ -216,6 +216,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/promotionRulesManagement/promotionRules/rule.vue

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

+ 5 - 0
src/views/purchasingManagement/bulkWarehousingOrder/list.vue

@@ -319,6 +319,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/salesManagement/backorder/list.vue

@@ -132,6 +132,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/salesManagement/examineVerify/list.vue

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+ 15 - 12
src/views/setting/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 - 195
     }
   },
+  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()

+ 5 - 0
src/views/setting/noticeManagement/list.vue

@@ -197,6 +197,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/supplierManagement/associatedProduct/add.vue

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

+ 3 - 0
src/views/supplierManagement/associatedProductDetails/list.vue

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

+ 5 - 0
src/views/supplierManagement/supplierInfo/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()