修改界面样式

src/views/warehouseManagement/inboundRequests/components/allTable.vue

@@ -1,10 +1,12 @@
 <template>
-  <div class="stockOrOutgoingManagement_index">
+  <div class="allTable">
     <el-card shadow="never">
       <ele-pro-table
         ref="table"
         :columns="columns"
         :datasource="datasource"
+        height="calc(100vh-300px)"
+        :pageSize="20"
         @cell-click="cellClick"
         cache-key="systemRoleTable"
       >
@@ -316,61 +318,23 @@
 </script>
 
 <style lang="scss" scoped>
-  #stockOrOutgoingManagement_index {
+  .allTable {
     height: 100%;
-    width: 100%;
-    padding: 10px;
     box-sizing: border-box;
-    // element-ui样式穿透
-    ::v-deep .el-card {
-      height: 100%;
-      .el-card__body {
-        height: 100%;
-        box-sizing: border-box;
-        display: flex;
-        flex-direction: column;
-        .ele-pro-table {
-          flex: 1;
-          display: flex;
-          flex-direction: column;
-          .el-table {
-            display: flex;
-            flex-direction: column;
-            .el-table__body-wrapper {
-              flex: 1;
-            }
-          }
-        }
+    display: flex;
+    flex-direction: column;
+    .ele-pro-table {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      .el-table {
+        flex: 1;
+        // display: flex;
+        // flex-direction: column;
+        // .el-table__body-wrapper {
+        //   flex: 1;
+        // }
       }
     }
-    .w100 {
-      width: 100% !important;
-    }
-    .p20 {
-      padding: 20px;
-    }
-    .mt20 {
-      margin-top: 20px;
-    }
-    .mt10 {
-      margin-top: 10px;
-    }
-    .el-form {
-      overflow: hidden;
-    }
-    .float-right {
-      float: right;
-      text-align: right;
-      margin-right: 20px;
-    }
-    .right {
-      text-align: right;
-    }
-    .col {
-      color: #aaa;
-    }
-    .pr10 {
-      padding-right: 10px;
-    }
   }
 </style>

src/views/warehouseManagement/inboundRequests/components/search.vue

@@ -109,7 +109,7 @@
       </el-col>
       <el-col
         style="display: flex; justify-content: flex-end"
-        v-bind="styleResponsive ? { lg: 24, md: 24 } : { span: 24 }"
+        v-bind="styleResponsive ? { lg: 18, md: 24 } : { span: 18 }"
       >
         <el-form-item label-width="0px">
           <el-button

src/views/warehouseManagement/inboundRequests/components/tgTable.vue

@@ -1,9 +1,11 @@
 <template>
-  <div>
+  <div class="tgTable">
     <!-- 数据表格 -->
     <ele-pro-table
       ref="table"
       :columns="columns"
+      height="calc(100vh-300px)"
+      :pageSize="20"
       :datasource="datasource"
       cache-key="workOrderTable"
     >
@@ -175,3 +177,25 @@
     }
   };
 </script>
+
+<style lang="scss" scoped>
+  .tgTable {
+    height: 100%;
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+    .ele-pro-table {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      .el-table {
+        flex: 1;
+        // display: flex;
+        // flex-direction: column;
+        // .el-table__body-wrapper {
+        //   flex: 1;
+        // }
+      }
+    }
+  }
+</style>

src/views/warehouseManagement/inboundRequests/index.vue

@@ -65,21 +65,28 @@
   #inboundRequests {
     height: 100%;
     width: 100%;
-    // :deep(.el-card) {
-    //   height: 100%;
-    //   .el-card__body {
-    //     height: 100%;
-    //     display: flex;
-    //     flex-direction: column;
-    //     .el-tabs--border-card {
-    //       flex: 1;
-    //       display: flex;
-    //       flex-direction: column;
-    //       .el-tabs__content {
-    //         flex: 1;
-    //       }
-    //     }
-    //   }
-    // }
+    :deep(.el-card) {
+      height: 100%;
+      .el-card__body {
+        height: 100%;
+        box-sizing: border-box;
+        display: flex;
+        flex-direction: column;
+        .el-tabs {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+          .el-tabs__content {
+            flex: 1;
+            .el-tab-pane {
+              height: 100%;
+            }
+          }
+        }
+        .el-form-item {
+          margin-bottom: 5px !important;
+        }
+      }
+    }
   }
 </style>

src/views/warehouseManagement/inventoryAllocation/add.vue

@@ -646,7 +646,7 @@
         factoryId: '', // 工厂ID
         transferOrderId: '', // 调拨单ID
         page: 1,
-        size: 10,
+        size: 20,
         total: 0
       };
     },
@@ -1412,6 +1412,9 @@
 <style lang="scss" scoped>
   #inventoryAllocate {
     height: 100%;
+    .el-form-item {
+      margin-bottom: 5px !important;
+    }
     .submit_item {
       display: flex;
       justify-content: flex-end;

src/views/warehouseManagement/inventoryAllocation/components/inventory-search.vue

@@ -303,4 +303,7 @@
     align-items: center;
     justify-content: flex-end;
   }
+  .el-form-item {
+    margin-bottom: 5px !important;
+  }
 </style>

src/views/warehouseManagement/inventoryAllocation/index.vue

@@ -1,11 +1,13 @@
 <template>
-  <div class="ele-body">
+  <div id="inventoryAllocation_index">
     <el-card shadow="never" v-loading="loading">
       <inventory-search @search="reload"> </inventory-search>
       <!-- 数据表格 -->
       <ele-pro-table
         ref="table"
         :columns="columns"
+        height="calc(100vh-300px)"
+        :pageSize="20"
         :datasource="datasource"
         cache-key="systemRoleTable"
       >
@@ -104,7 +106,7 @@
             label: '调拨单号',
             align: 'center',
             showOverflowTooltip: true,
-            minWidth: 110
+            minWidth: 180
           },
           {
             prop: 'type',
@@ -172,7 +174,7 @@
           {
             columnKey: 'action',
             label: '操作',
-            width: 300,
+            width: 200,
             align: 'center',
             slot: 'action',
             showOverflowTooltip: true
@@ -244,4 +246,37 @@
   };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+  #inventoryAllocation_index {
+    height: 100%;
+    width: 100%;
+    padding: 10px;
+    box-sizing: border-box;
+    // element-ui样式穿透
+    :deep(.el-card) {
+      height: 100%;
+      .el-card__body {
+        height: 100%;
+        box-sizing: border-box;
+        display: flex;
+        flex-direction: column;
+        .ele-pro-table {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+          .el-table {
+            flex: 1;
+            // display: flex;
+            // flex-direction: column;
+            // .el-table__body-wrapper {
+            //   flex: 1;
+            // }
+          }
+        }
+      }
+      .el-form-item {
+        margin-bottom: 5px !important;
+      }
+    }
+  }
+</style>

src/views/warehouseManagement/outgoingManagement/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="outgoingManagement_index">
+  <div id="outgoingManagement_index">
     <el-card shadow="never">
       <el-form :model="formData" ref="formName" label-width="80px">
         <el-row :gutter="10">
@@ -130,8 +130,10 @@
       <ele-pro-table
         ref="table"
         :columns="columns"
+        height="calc(100vh-300px)"
         :datasource="datasource"
         @cell-click="cellClick"
+        :pageSize="20"
         cache-key="systemRoleTable"
       >
         <!-- 表头工具栏 -->
@@ -329,7 +331,6 @@
             width: 50,
             align: 'center'
           },
-
           {
             prop: 'bizNo',
             label: '单号',
@@ -344,7 +345,7 @@
             label: '出库场景',
             align: 'center',
             showOverflowTooltip: true,
-            width: 150
+            width: 90
           },
           {
             prop: 'assetType',
@@ -352,7 +353,7 @@
             label: '物品类型',
             align: 'center',
             showOverflowTooltip: true,
-            width: 150
+            width: 100
           },
           {
             prop: 'categoryNames',
@@ -365,8 +366,7 @@
             prop: 'categoryCodes',
             label: '物品编码',
             align: 'center',
-            showOverflowTooltip: true,
-            width: 150
+            showOverflowTooltip: true
           },
           // {
           //   prop: 'verifyStatus',
@@ -391,7 +391,7 @@
             align: 'center',
             slot: 'fromUser',
             showOverflowTooltip: true,
-            width: 200
+            width: 100
           },
           {
             prop: 'createTime',
@@ -419,7 +419,7 @@
           {
             columnKey: 'action',
             label: '操作',
-            width: 300,
+            width: 150,
             align: 'center',
             slot: 'action',
             showOverflowTooltip: true
@@ -592,13 +592,14 @@
   };
 </script>
 
-<style lang="scss">
-  .outgoingManagement_index {
+<style lang="scss" scoped>
+  #outgoingManagement_index {
     height: 100%;
     width: 100%;
     padding: 10px;
     box-sizing: border-box;
-    .el-card {
+    // element-ui样式穿透
+    :deep(.el-card) {
       height: 100%;
       .el-card__body {
         height: 100%;
@@ -610,14 +611,18 @@
           display: flex;
           flex-direction: column;
           .el-table {
-            display: flex;
-            flex-direction: column;
-            .el-table__body-wrapper {
-              flex: 1;
-            }
+            flex: 1;
+            // display: flex;
+            // flex-direction: column;
+            // .el-table__body-wrapper {
+            //   flex: 1;
+            // }
           }
         }
       }
+      .el-form-item {
+        margin-bottom: 5px !important;
+      }
     }
     .w100 {
       width: 100% !important;

src/views/warehouseManagement/picking/index.vue

@@ -1,11 +1,13 @@
 <template>
-  <div class="ele-body">
+  <div id="picking_index">
     <el-card shadow="never" v-loading="loading">
       <inventory-search @search="reload"> </inventory-search>
       <!-- 数据表格 -->
       <ele-pro-table
         ref="table"
         :columns="columns"
+        height="calc(100vh-300px)"
+        :pageSize="20"
         :datasource="datasource"
         cache-key="systemRoleTable"
       >
@@ -158,7 +160,7 @@
           {
             columnKey: 'action',
             label: '操作',
-            width: 300,
+            width: 200,
             align: 'center',
             slot: 'action',
             showOverflowTooltip: true
@@ -248,4 +250,37 @@
   };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+  #picking_index {
+    height: 100%;
+    width: 100%;
+    padding: 10px;
+    box-sizing: border-box;
+    // element-ui样式穿透
+    :deep(.el-card) {
+      height: 100%;
+      .el-card__body {
+        height: 100%;
+        box-sizing: border-box;
+        display: flex;
+        flex-direction: column;
+        .ele-pro-table {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+          .el-table {
+            flex: 1;
+            // display: flex;
+            // flex-direction: column;
+            // .el-table__body-wrapper {
+            //   flex: 1;
+            // }
+          }
+        }
+      }
+      .el-form-item {
+        margin-bottom: 5px !important;
+      }
+    }
+  }
+</style>

src/views/warehouseManagement/statisticalReports/inventoryBalance/index.vue

@@ -48,6 +48,7 @@
         class="table"
         :columns="columns"
         :datasource="datasource"
+        :pageSize="20"
         height="calc(100vh - 405px)"
         full-height="calc(100vh - 116px)"
         tool-class="ele-toolbar-form"
@@ -211,6 +212,32 @@
     width: 100%;
     padding: 10px;
     box-sizing: border-box;
+    // element-ui样式穿透
+    :deep(.el-card) {
+      height: 100%;
+      .el-card__body {
+        height: 100%;
+        box-sizing: border-box;
+        display: flex;
+        flex-direction: column;
+        .ele-pro-table {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+          .el-table {
+            flex: 1;
+            // display: flex;
+            // flex-direction: column;
+            // .el-table__body-wrapper {
+            //   flex: 1;
+            // }
+          }
+        }
+      }
+      .el-form-item {
+        margin-bottom: 5px !important;
+      }
+    }
     .ele-form-actions {
       display: flex;
       justify-content: flex-end;

src/views/warehouseManagement/statisticalReports/transceiverDetails/index.vue

@@ -48,6 +48,7 @@
         class="table"
         :columns="columns"
         :datasource="datasource"
+        :pageSize="20"
         height="calc(100vh - 405px)"
         full-height="calc(100vh - 116px)"
         tool-class="ele-toolbar-form"
@@ -211,6 +212,32 @@
     width: 100%;
     padding: 10px;
     box-sizing: border-box;
+    // element-ui样式穿透
+    :deep(.el-card) {
+      height: 100%;
+      .el-card__body {
+        height: 100%;
+        box-sizing: border-box;
+        display: flex;
+        flex-direction: column;
+        .ele-pro-table {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+          .el-table {
+            flex: 1;
+            // display: flex;
+            // flex-direction: column;
+            // .el-table__body-wrapper {
+            //   flex: 1;
+            // }
+          }
+        }
+      }
+      .el-form-item {
+        margin-bottom: 5px !important;
+      }
+    }
     .ele-form-actions {
       display: flex;
       justify-content: flex-end;

src/views/warehouseManagement/statisticalReports/transceiverSummary/index.vue

@@ -47,6 +47,7 @@
         ref="table"
         class="table"
         :columns="columns"
+        :pageSize="20"
         :datasource="datasource"
         height="calc(100vh - 405px)"
         full-height="calc(100vh - 116px)"
@@ -211,6 +212,32 @@
     width: 100%;
     padding: 10px;
     box-sizing: border-box;
+    // element-ui样式穿透
+    :deep(.el-card) {
+      height: 100%;
+      .el-card__body {
+        height: 100%;
+        box-sizing: border-box;
+        display: flex;
+        flex-direction: column;
+        .ele-pro-table {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+          .el-table {
+            flex: 1;
+            // display: flex;
+            // flex-direction: column;
+            // .el-table__body-wrapper {
+            //   flex: 1;
+            // }
+          }
+        }
+      }
+      .el-form-item {
+        margin-bottom: 5px !important;
+      }
+    }
     .ele-form-actions {
       display: flex;
       justify-content: flex-end;

src/views/warehouseManagement/stockLedger/components/details/InWarehouse.vue

@@ -114,7 +114,8 @@
       ref="table"
       height="calc(100vh - 300px)"
       :columns="columns"
-      :datasource="getList"
+      :datasource="datasource"
+      :pageSize="20"
       row-key="id"
     >
       <!-- 展开内容 -->
@@ -135,16 +136,9 @@
           </ele-pro-table>
         </div>
       </template>
-
-      <!-- 操作列 -->
-      <template v-slot:action="{ row }">
-        <el-link
-          type="primary"
-          :underline="false"
-          icon="el-icon-view"
-          @click="handleCellClick(row)"
-        >
-          详情
+      <template v-slot:bizNo="{ row }">
+        <el-link type="primary" @click="handleCellClick(row)">
+          {{ row.bizNo }}
         </el-link>
       </template>
     </ele-pro-table>
@@ -247,6 +241,7 @@
             className: ''
           },
           {
+            slot: 'bizNo',
             prop: 'bizNo',
             label: '入库单号',
             showOverflowTooltip: true,
@@ -325,15 +320,6 @@
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 110
-          },
-          {
-            columnKey: 'action',
-            label: '操作',
-            width: 300,
-            align: 'center',
-            resizable: false,
-            slot: 'action',
-            showOverflowTooltip: true
           }
         ],
 
@@ -452,6 +438,13 @@
       this.getList();
     },
     methods: {
+      async datasource({ page, limit, where, order }) {
+        console.log(page);
+        console.log(limit);
+        this.pageNum = page;
+        this.size = limit;
+        return await this.getList();
+      },
       getSceneState: useDictLabel(sceneState),
       search() {
         this.pageNum = 1;

src/views/warehouseManagement/stockLedger/components/details/InventoryAllocation.vue

@@ -103,7 +103,7 @@
           key: ''
         },
         tableData: [],
-        size: 10,
+        size: 20,
         page: 1,
         total: 0
       };
@@ -210,7 +210,7 @@
     box-sizing: border-box;
     display: flex;
     flex-direction: column;
-    ::v-deep .table {
+    :deep(.table) {
       flex: 1;
       display: flex;
       flex-direction: column;
@@ -219,6 +219,8 @@
       }
     }
     .pagination {
+      padding: 10px 0;
+      box-sizing: border-box;
       display: flex;
       align-items: center;
       justify-content: center;

src/views/warehouseManagement/stockLedger/components/details/OutWarehouse.vue

@@ -114,7 +114,8 @@
       ref="table"
       height="calc(100vh - 300px)"
       :columns="columns"
-      :datasource="getList"
+      :datasource="datasource"
+      :pageSize="20"
       row-key="id"
     >
       <!-- 展开内容 -->
@@ -135,16 +136,9 @@
           </ele-pro-table>
         </div>
       </template>
-
-      <!-- 操作列 -->
-      <template v-slot:action="{ row }">
-        <el-link
-          type="primary"
-          :underline="false"
-          icon="el-icon-view"
-          @click="handleCellClick(row)"
-        >
-          详情
+      <template v-slot:bizNo="{ row }">
+        <el-link type="primary" @click="handleCellClick(row)">
+          {{ row.bizNo }}
         </el-link>
       </template>
     </ele-pro-table>
@@ -264,6 +258,7 @@
             className: ''
           },
           {
+            slot: 'bizNo',
             prop: 'bizNo',
             label: '出库单号',
             showOverflowTooltip: true,
@@ -342,15 +337,6 @@
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 110
-          },
-          {
-            columnKey: 'action',
-            label: '操作',
-            width: 300,
-            align: 'center',
-            resizable: false,
-            slot: 'action',
-            showOverflowTooltip: true
           }
         ],
 
@@ -444,6 +430,13 @@
       this.getList();
     },
     methods: {
+      async datasource({ page, limit, where, order }) {
+        console.log(page);
+        console.log(limit);
+        this.pageNum = page;
+        this.size = limit;
+        return await this.getList();
+      },
       getSceneState: useDictLabel(outputSceneState),
       handleDeta(row) {
         for (const key in this.vuexUser) {

src/views/warehouseManagement/stockLedger/components/details/ReportLoss.vue

@@ -39,7 +39,7 @@
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="4" style="text-align: right; margin-bottom: 20px">
+        <el-col :span="4" style="text-align: right">
           <el-button
             @click="search"
             type="primary"
@@ -153,7 +153,7 @@
           4: ''
         },
         tableData: [],
-        size: 10,
+        size: 20,
         page: 1,
         total: 0
       };
@@ -200,11 +200,11 @@
   .reportLoss {
     height: 100%;
     width: 100%;
-    padding-top: 20px;
+    padding-top: 10px;
     box-sizing: border-box;
     display: flex;
     flex-direction: column;
-    ::v-deep .table {
+    :deep(.table) {
       flex: 1;
       display: flex;
       flex-direction: column;
@@ -212,7 +212,12 @@
         flex: 1;
       }
     }
+    .el-form-item {
+      margin-bottom: 5px !important;
+    }
     .pagination {
+      padding: 10px 0;
+      box-sizing: border-box;
       display: flex;
       align-items: center;
       justify-content: center;

src/views/warehouseManagement/stockLedger/components/item-list.vue

@@ -12,10 +12,10 @@
       class="table"
       :columns="columns"
       :datasource="datasource"
-      height="calc(100vh - 405px)"
+      height="calc(100vh - 325px)"
       full-height="calc(100vh - 116px)"
       tool-class="ele-toolbar-form"
-      cache-key="systemOrgUserTable"
+      :pageSize="20"
       @select="selectChange"
       @select-all="changeSelectAll"
     >

src/views/warehouseManagement/stockLedger/components/item-search.vue

@@ -299,6 +299,11 @@
     flex-wrap: wrap;
   }
   .ele-form-actions {
-    float: right;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+  }
+  :deep(.el-form-item) {
+    margin-bottom: 5px !important;
   }
 </style>

src/views/warehouseManagement/stockManagement/add.vue

@@ -2897,10 +2897,13 @@
       margin-bottom: 0 !important;
     }
   }
+  .el-form-item {
+    margin-bottom: 5px;
+  }
   .right_control {
     display: flex;
     > button {
-      margin-left: 20px;
+      margin-left: 5px;
     }
   }
   .storage_btn {

src/views/warehouseManagement/stockManagement/components/selectType.vue

@@ -3,6 +3,7 @@
     <el-dialog
       :title="`${title}信息`"
       append-to-body
+      :close-on-click-modal="false"
       :visible="visibleDialog"
       :before-close="closeWindows"
       width="80vw"
@@ -146,7 +147,7 @@
               background
               layout="total, sizes, prev, pager, next, jumper"
               :total="total"
-              :page-sizes="[15, 30, 50, 100, 500]"
+              :page-sizes="[20, 30, 50, 100, 500]"
               :page-size.sync="pages.size"
               :current-page.sync="pages.pageNum"
               @current-change="handleCurrentChange"
@@ -218,7 +219,7 @@
         pages1: { classificationIdList: [] },
         pages: {
           pageNum: 1,
-          size: 15
+          size: 20
         },
         total: 0,
         curType: '',
@@ -395,8 +396,6 @@
   }
   .search_box {
     overflow: hidden;
-    ::v-deep .el-input-group__append {
-    }
   }
   .select-btn {
     text-align: right;

src/views/warehouseManagement/stockManagement/index.vue

@@ -143,9 +143,10 @@
       <ele-pro-table
         ref="table"
         :columns="columns"
+        height="calc(100vh-300px)"
+        :pageSize="20"
         :datasource="datasource"
         @cell-click="cellClick"
-        cache-key="systemRoleTable"
       >
         <template v-slot:selection="{ row }">
           <el-radio class="radio" v-model="currentId" :label="row.id"
@@ -318,7 +319,7 @@
             label: '入库类型',
             align: 'center',
             showOverflowTooltip: true,
-            width: 150
+            width: 100
           },
           {
             prop: 'assetType',
@@ -326,7 +327,7 @@
             label: '物品类型',
             align: 'center',
             showOverflowTooltip: true,
-            width: 150
+            width: 120
           },
           {
             prop: 'categoryNames',
@@ -590,7 +591,7 @@
     padding: 10px;
     box-sizing: border-box;
     // element-ui样式穿透
-    ::v-deep .el-card {
+    :deep(.el-card) {
       height: 100%;
       .el-card__body {
         height: 100%;
@@ -602,14 +603,18 @@
           display: flex;
           flex-direction: column;
           .el-table {
-            display: flex;
-            flex-direction: column;
-            .el-table__body-wrapper {
-              flex: 1;
-            }
+            flex: 1;
+            // display: flex;
+            // flex-direction: column;
+            // .el-table__body-wrapper {
+            //   flex: 1;
+            // }
           }
         }
       }
+      .el-form-item {
+        margin-bottom: 5px !important;
+      }
     }
     .w100 {
       width: 100% !important;

src/views/warehouseManagement/stocktaking/plan/index.vue

@@ -1,13 +1,14 @@
 <template>
-  <div class="ele-body">
+  <div id="stocktakingPlan_index">
     <el-card shadow="never" v-loading="loading">
       <plan-search ref="inventorySearch" @search="reload"> </plan-search>
       <!-- 数据表格 -->
       <ele-pro-table
         ref="table"
         :columns="columns"
+        height="calc(100vh-300px)"
+        :pageSize="20"
         :datasource="datasource"
-        cache-key="systemRoleTable"
       >
         <!-- 表头工具栏 -->
         <template v-slot:toolbar>
@@ -246,4 +247,37 @@
   };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+  #stocktakingPlan_index {
+    height: 100%;
+    width: 100%;
+    padding: 10px;
+    box-sizing: border-box;
+    // element-ui样式穿透
+    :deep(.el-card) {
+      height: 100%;
+      .el-card__body {
+        height: 100%;
+        box-sizing: border-box;
+        display: flex;
+        flex-direction: column;
+        .ele-pro-table {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+          .el-table {
+            flex: 1;
+            // display: flex;
+            // flex-direction: column;
+            // .el-table__body-wrapper {
+            //   flex: 1;
+            // }
+          }
+        }
+      }
+      .el-form-item {
+        margin-bottom: 5px !important;
+      }
+    }
+  }
+</style>

src/views/warehouseManagement/stocktaking/reportLoss/components/reportloss-search.vue

@@ -96,7 +96,7 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { lg: 12, md: 12 } : { span: 12 }">
         <div class="ele-form-actions">
           <el-button
             type="primary"

src/views/warehouseManagement/stocktaking/reportLoss/index.vue

@@ -1,13 +1,14 @@
 <template>
-  <div class="ele-body">
+  <div id="stocktakingReportLoss_index">
     <el-card shadow="never" v-loading="loading">
       <reportloss-search @search="reload"> </reportloss-search>
       <!-- 数据表格 -->
       <ele-pro-table
         ref="table"
         :columns="columns"
+        height="calc(100vh-300px)"
+        :pageSize="20"
         :datasource="datasource"
-        cache-key="systemRoleTable"
       >
         <template v-slot:code="{ row }">
           <el-link type="primary" @click="goDetail(row)">
@@ -147,7 +148,7 @@
           {
             columnKey: 'action',
             label: '操作',
-            width: 230,
+            width: 80,
             align: 'center',
             resizable: false,
             slot: 'action',
@@ -215,4 +216,37 @@
   };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+  #stocktakingReportLoss_index {
+    height: 100%;
+    width: 100%;
+    padding: 10px;
+    box-sizing: border-box;
+    // element-ui样式穿透
+    :deep(.el-card) {
+      height: 100%;
+      .el-card__body {
+        height: 100%;
+        box-sizing: border-box;
+        display: flex;
+        flex-direction: column;
+        .ele-pro-table {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+          .el-table {
+            flex: 1;
+            // display: flex;
+            // flex-direction: column;
+            // .el-table__body-wrapper {
+            //   flex: 1;
+            // }
+          }
+        }
+      }
+      .el-form-item {
+        margin-bottom: 5px !important;
+      }
+    }
+  }
+</style>

src/views/warehouseManagement/stocktaking/work/index.vue

@@ -1,13 +1,14 @@
 <template>
-  <div class="ele-body">
+  <div id="stocktakingWork_index">
     <el-card shadow="never" v-loading="loading">
       <work-search @search="reload"> </work-search>
       <!-- 数据表格 -->
       <ele-pro-table
         ref="table"
         :columns="columns"
+        height="calc(100vh-300px)"
+        :pageSize="20"
         :datasource="datasource"
-        cache-key="systemRoleTable"
       >
         <template v-slot:code="{ row }">
           <el-link type="primary" @click="goDetail(row)">
@@ -131,7 +132,7 @@
           {
             columnKey: 'action',
             label: '操作',
-            width: 250,
+            width: 80,
             align: 'center',
             resizable: false,
             slot: 'action',
@@ -180,4 +181,37 @@
   };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+  #stocktakingWork_index {
+    height: 100%;
+    width: 100%;
+    padding: 10px;
+    box-sizing: border-box;
+    // element-ui样式穿透
+    :deep(.el-card) {
+      height: 100%;
+      .el-card__body {
+        height: 100%;
+        box-sizing: border-box;
+        display: flex;
+        flex-direction: column;
+        .ele-pro-table {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+          .el-table {
+            flex: 1;
+            // display: flex;
+            // flex-direction: column;
+            // .el-table__body-wrapper {
+            //   flex: 1;
+            // }
+          }
+        }
+      }
+      .el-form-item {
+        margin-bottom: 5px !important;
+      }
+    }
+  }
+</style>

src/views/warehouseManagement/warehouseDefinition/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="ele-body">
+  <div id="warehouseDefinition_index">
     <el-card shadow="nvner">
       <el-form :model="formData" ref="formName" label-width="100px">
         <el-row>
@@ -403,6 +403,39 @@
 </script>
 
 <style lang="scss" scoped>
+  #warehouseDefinition_index {
+    height: 100%;
+    width: 100%;
+    padding: 10px;
+    box-sizing: border-box;
+    // element-ui样式穿透
+    :deep(.el-card) {
+      height: 100%;
+      .el-card__body {
+        height: 100%;
+        box-sizing: border-box;
+        display: flex;
+        flex-direction: column;
+        .ele-pro-table {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+          .el-table {
+            flex: 1;
+            // display: flex;
+            // flex-direction: column;
+            // .el-table__body-wrapper {
+            //   flex: 1;
+            // }
+          }
+        }
+      }
+      .el-form-item {
+        margin-bottom: 5px !important;
+      }
+    }
+  }
+
   .divider11 {
     display: flex;
     align-items: center;
@@ -425,10 +458,12 @@
     }
   }
   .warehouse-container {
+    flex: 1 0 auto;
+    height: 0;
     display: flex;
     flex-wrap: wrap;
     padding-top: 20px;
-
+    overflow-y: auto;
     .warehouse-card-placeholder {
       width: 25%;
     }

vue.config.js

@@ -34,8 +34,8 @@ module.exports = {
         // target: 'http://124.71.68.31:50001', // 测试环境
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.132:18086',
-        // target: 'http://192.168.1.251:18086',
-        target: 'http://192.168.1.116:18086',
+        target: 'http://192.168.1.251:18086',
+        // target: 'http://192.168.1.116:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''