From 2c5da653b993e05900c251ee9eca206dfca25dd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Mon, 26 Jun 2023 15:44:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=B8=B8=E6=89=93=E5=8D=B0M100?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AFtable=E8=87=AA=E9=80=82=E5=BA=94=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basedate/m100Online/normalPritIndex.vue   | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
index cbc36b79..746b4c28 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
@@ -244,7 +244,7 @@
       <ScrapZHB v-bind:customerInfosZHB="customerInfosZHB"></ScrapZHB>
     </el-drawer>
 
-    <div class="l-table" style="margin-top: -10px">
+    <div class="l-table" style="margin-top: -15px">
       <!--表格渲染-->
       <el-table
         ref="multipleTable"
@@ -434,7 +434,7 @@
       <pagination
         v-show="totalCount > 0"
         :total="totalCount"
-        style="margin-bottom: -5px; float: right"
+        style="float: right"
         :page.sync="page"
         :limit.sync="listQuery.MaxResultCount"
         @pagination="getList"
@@ -674,13 +674,7 @@ export default {
     };
   },
   mounted() {
-    this.$nextTick(() => {
-      var offsetHei = document.documentElement.clientHeight;
-      //console.log(offsetHei);
-      let boxH = this.$refs.box.offsetHeight;
-      this.tableHeight = offsetHei - boxH - 67 - 79; //57为footer高度，79为页面上部标签高度
-      //this.tableHeight = offsetHei -260
-    });
+    this.setTableHeight()
 
     let timer = setInterval(() => {
       this.open();
@@ -766,6 +760,15 @@ export default {
     ...mapGetters(["userInfo"]), //获取当前用户信息
   },
   methods: {
+    setTableHeight(){
+      this.$nextTick(() => {
+        var offsetHei = document.documentElement.clientHeight;
+        //console.log(offsetHei);
+        let boxH = this.$refs.box.offsetHeight;
+        this.tableHeight = offsetHei - boxH - 67 - 79 - 10; //57为footer高度，79为页面上部标签高度
+        //this.tableHeight = offsetHei -260
+      });
+    },
     opens() {
 
       this.getList();
@@ -820,7 +823,7 @@ export default {
                   if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
                     //写提示信息
                     console.log(
-                      "222222222222222222222222222222222222222222222222"
+                      "222222222222222222222222222222222222222222222222-1"
                     );
                     this.$refs.sp01.style.color = "red";
                     this.$refs.sp01.style.fontWeight = "bold";
@@ -837,8 +840,9 @@ export default {
                   if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
                     //写提示信息
                     console.log(
-                      "222222222222222222222222222222222222222222222222"
+                      "222222222222222222222222222222222222222222222222-2"
                     );
+                    this.setTableHeight()
                     this.$refs.sp05.style.color = "red";
                     this.$refs.sp05.style.fontWeight = "bold";
                   } else {
@@ -1914,6 +1918,7 @@ export default {
         return a.productLineCode - b.productLineCode;
       });
       //console.log(this.PLList)
+      this.setTableHeight()
       //变更打印按钮文字
       if (this.listQuery.productType === 1) {
         this.$refs.btn1.$el.innerText = "打印门板发货排序单";
@@ -1929,6 +1934,7 @@ export default {
         this.listQuery.state = [];
         this.isShowState = false;
       }
+      
       if (this.listQuery.productType === 2) {
         this.listQueryList.ZHBBillStatus = 2;
       } else {