lilei 2 years ago
parent
commit
5da9f7e675

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
 {
   "message": "发现有新版本发布,确定更新系统?",
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
   "vendorJsVersion": "",
-  "version": 1675824803501
+  "version": 1675825858553
 }
 }

+ 8 - 5
src/views/purchasingManagement/purchaseOrderNew/chooseProductModal.vue

@@ -152,10 +152,11 @@ export default {
       if (newValue) {
       if (newValue) {
         this.resetSearchForm()
         this.resetSearchForm()
         this.$refs.searchProductCode.focus()
         this.$refs.searchProductCode.focus()
-        this.$nextTick(() => {
-          this.setTableH()
-        })
+        this.setTableH()
       }
       }
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
     }
   },
   },
   data () {
   data () {
@@ -264,8 +265,10 @@ export default {
       this.$emit('add', record, 0)
       this.$emit('add', record, 0)
     },
     },
     setTableH () {
     setTableH () {
-      const searchBoxH = this.$refs.searchBox.offsetHeight
-      this.tableHeight = window.innerHeight - searchBoxH - 285
+      this.$nextTick(() => {
+        const searchBoxH = this.$refs.searchBox.offsetHeight
+        this.tableHeight = window.innerHeight - searchBoxH - 285
+      })
     }
     }
   }
   }
 }
 }

+ 8 - 5
src/views/purchasingManagement/purchaseOrderNew/outStockModal.vue

@@ -157,8 +157,10 @@ export default {
   },
   },
   methods: {
   methods: {
     setTableH () {
     setTableH () {
-      const searchBoxH = this.$refs.searchBox.offsetHeight
-      this.tableHeight = window.innerHeight - searchBoxH - 340
+      this.$nextTick(() => {
+        const searchBoxH = this.$refs.searchBox.offsetHeight
+        this.tableHeight = window.innerHeight - searchBoxH - 340
+      })
     },
     },
     //  产品分类  change
     //  产品分类  change
     changeProductType (val, opt) {
     changeProductType (val, opt) {
@@ -262,6 +264,9 @@ export default {
     }
     }
   },
   },
   watch: {
   watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    },
     //  父页面传过来的弹框状态
     //  父页面传过来的弹框状态
     openModal (newValue, oldValue) {
     openModal (newValue, oldValue) {
       this.isShow = newValue
       this.isShow = newValue
@@ -271,9 +276,7 @@ export default {
       if (!newValue) {
       if (!newValue) {
         this.onCancel()
         this.onCancel()
       } else {
       } else {
-        this.$nextTick(() => {
-          this.setTableH()
-        })
+        this.setTableH()
         this.title = '上次采购缺货产品明细(采购单号:' + this.paramsData.purchaseBillNo + ')'
         this.title = '上次采购缺货产品明细(采购单号:' + this.paramsData.purchaseBillNo + ')'
       }
       }
     }
     }

+ 1 - 2
src/views/shoppingCarManagement/shoppingCar/list.vue

@@ -210,13 +210,12 @@ export default {
     setTableH () {
     setTableH () {
       this.$nextTick(() => { // 页面渲染完成后的回调
       this.$nextTick(() => { // 页面渲染完成后的回调
         const tableSearchH = this.$refs.tableSearch.offsetHeight
         const tableSearchH = this.$refs.tableSearch.offsetHeight
-        this.tableHeight = window.innerHeight - tableSearchH - (this.modes == 'pages' ? 235 : 320)
+        this.tableHeight = window.innerHeight - tableSearchH - (this.modes == 'pages' ? 200 : 320)
       })
       })
     },
     },
   },
   },
   watch: {
   watch: {
     '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
     '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
-      console.log(newValue)
       this.setTableH()
       this.setTableH()
     }
     }
   },
   },