Merge branch 'master' of http://120.26.64.82:3000/BFFE/SZJCFLFJ

src/views/system/securityCheck/components/securityCheckTableWaybill.vue

@@ -128,12 +128,12 @@ export default {
   width: 100%;
   ::v-deep .ant-table {
     width: 100%;
-    .ant-table-placeholder {
-      min-height: 600px;
-    }
-    .ant-table-tbody {
-      min-height: 600px !important;
-    }
+    // .ant-table-placeholder {
+    //   min-height: 600px;
+    // }
+    // .ant-table-tbody {
+    //   min-height: 600px !important;
+    // }
     .ant-table-thead {
       th {
         padding: 18px 12px;

src/views/system/securityCheck/views/waybillTable.vue

@@ -46,7 +46,7 @@ export default {
           return `共${total}条`
         },
       },
-      tableHeight: '600px',
+      tableHeight: '50vh',
       tableCols: [
         {
           dataIndex: 'waybillNo',
@@ -189,7 +189,7 @@ export default {
       const topBarHeight = 80
       const headerHeight = this.$refs['tableWrapperHeader'].offsetHeight
       const footerBlackHeight = 24
-      this.tableHeight = `calc(100vh - ${topBarHeight + headerHeight + footerBlackHeight}px - 20px)`
+      this.tableHeight = `calc(100vh - ${topBarHeight + headerHeight + footerBlackHeight}px -20px)`
     },
     async getData() {
       try {