调整页面的高度，改为自适应

2021-12-08 23:22:31 +08:00 · 2021-12-08 23:22:31 +08:00 · d0fe0f3578
commit d0fe0f3578
parent f57c667d1a
50 changed files with 52 additions and 52 deletions
--- a/jshERP-web/src/views/bill/AllocationOutList.vue
+++ b/jshERP-web/src/views/bill/AllocationOutList.vue
@ -1,7 +1,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/bill/AssembleList.vue
+++ b/jshERP-web/src/views/bill/AssembleList.vue
@ -1,7 +1,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/bill/DisassembleList.vue
+++ b/jshERP-web/src/views/bill/DisassembleList.vue
@ -1,7 +1,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/bill/OtherInList.vue
+++ b/jshERP-web/src/views/bill/OtherInList.vue
@ -1,7 +1,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/bill/OtherOutList.vue
+++ b/jshERP-web/src/views/bill/OtherOutList.vue
@ -1,7 +1,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/bill/PurchaseBackList.vue
+++ b/jshERP-web/src/views/bill/PurchaseBackList.vue
@ -1,7 +1,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/bill/PurchaseOrderList.vue
+++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue
@ -1,7 +1,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/bill/RetailBackList.vue
+++ b/jshERP-web/src/views/bill/RetailBackList.vue
@ -1,7 +1,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/bill/RetailOutList.vue
+++ b/jshERP-web/src/views/bill/RetailOutList.vue
@ -1,7 +1,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/bill/SaleBackList.vue
+++ b/jshERP-web/src/views/bill/SaleBackList.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/bill/SaleOrderList.vue
+++ b/jshERP-web/src/views/bill/SaleOrderList.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/bill/SaleOutList.vue
+++ b/jshERP-web/src/views/bill/SaleOutList.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/dashboard/IndexChart.vue
+++ b/jshERP-web/src/views/dashboard/IndexChart.vue
@ -54,19 +54,19 @@
      <a-col :sm="24" :md="12" :xl="8" :style="{ paddingRight: '0px',marginBottom: '12px' }">
        <a-card :loading="loading" :bordered="false" :body-style="{paddingRight: '5'}" data-step="7" data-title="采购统计"
                data-intro="统计往前6个月每月采购的总金额">
-          <bar title="采购统计" :height="410" :yaxisText="yaxisText" :dataSource="buyPriceData"/>
+          <bar title="采购统计" :height="barHeight" :yaxisText="yaxisText" :dataSource="buyPriceData"/>
        </a-card>
      </a-col>
      <a-col :sm="24" :md="12" :xl="8" :style="{ paddingRight: '0px',marginBottom: '12px' }">
        <a-card :loading="loading" :bordered="false" :body-style="{paddingRight: '5'}" data-step="8" data-title="销售统计"
                data-intro="统计往前6个月每月销售的总金额">
-          <bar title="销售统计" :height="410" :yaxisText="yaxisText" :dataSource="salePriceData"/>
+          <bar title="销售统计" :height="barHeight" :yaxisText="yaxisText" :dataSource="salePriceData"/>
        </a-card>
      </a-col>
      <a-col :sm="24" :md="12" :xl="8" :style="{ paddingRight: '0px',marginBottom: '12px' }">
        <a-card :loading="loading" :bordered="false" :body-style="{paddingRight: '5'}" data-step="9" data-title="零售统计"
                data-intro="统计往前6个月每月零售的总金额">
-          <bar title="零售统计" :height="410" :yaxisText="yaxisText" :dataSource="retailPriceData"/>
+          <bar title="零售统计" :height="barHeight" :yaxisText="yaxisText" :dataSource="retailPriceData"/>
        </a-card>
      </a-col>
    </a-row>
@ -122,6 +122,7 @@
        loading: true,
        center: null,
        statistics: {},
+        barHeight: document.documentElement.clientHeight-465,
        yaxisText: '金额',
        buyPriceData: [],
        salePriceData: [],
--- a/jshERP-web/src/views/financial/AdvanceInList.vue
+++ b/jshERP-web/src/views/financial/AdvanceInList.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/financial/GiroList.vue
+++ b/jshERP-web/src/views/financial/GiroList.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/financial/ItemInList.vue
+++ b/jshERP-web/src/views/financial/ItemInList.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/financial/ItemOutList.vue
+++ b/jshERP-web/src/views/financial/ItemOutList.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/financial/MoneyInList.vue
+++ b/jshERP-web/src/views/financial/MoneyInList.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/financial/MoneyOutList.vue
+++ b/jshERP-web/src/views/financial/MoneyOutList.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/material/MaterialAttributeList.vue
+++ b/jshERP-web/src/views/material/MaterialAttributeList.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- table区域-begin -->
        <div>
          <a-table
--- a/jshERP-web/src/views/material/MaterialCategoryList.vue
+++ b/jshERP-web/src/views/material/MaterialCategoryList.vue
@ -3,7 +3,6 @@
  <a-row :gutter="10">
    <a-col :md="12" :sm="24">
      <a-card :bordered="false">
-
        <!-- 按钮操作区域 -->
        <a-row style="margin-left: 14px">
          <a-button v-if="btnEnableList.indexOf(1)>-1" @click="handleAdd()" type="primary">添加类别</a-button>
--- a/jshERP-web/src/views/material/MaterialList.vue
+++ b/jshERP-web/src/views/material/MaterialList.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/material/MaterialPropertyList.vue
+++ b/jshERP-web/src/views/material/MaterialPropertyList.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/report/AccountReport.vue
+++ b/jshERP-web/src/views/report/AccountReport.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <a-form layout="inline" @keyup.enter.native="searchQuery">
--- a/jshERP-web/src/views/report/AllocationDetail.vue
+++ b/jshERP-web/src/views/report/AllocationDetail.vue
@ -3,7 +3,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域
        projectId 调出仓库
        projectIdto 调入仓库
--- a/jshERP-web/src/views/report/BuyInReport.vue
+++ b/jshERP-web/src/views/report/BuyInReport.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <a-form layout="inline" @keyup.enter.native="searchQuery">
--- a/jshERP-web/src/views/report/CustomerAccount.vue
+++ b/jshERP-web/src/views/report/CustomerAccount.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <a-form layout="inline" @keyup.enter.native="searchQuery">
--- a/jshERP-web/src/views/report/InDetail.vue
+++ b/jshERP-web/src/views/report/InDetail.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <a-form layout="inline" @keyup.enter.native="searchQuery">
--- a/jshERP-web/src/views/report/InMaterialCount.vue
+++ b/jshERP-web/src/views/report/InMaterialCount.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <a-form layout="inline" @keyup.enter.native="searchQuery">
--- a/jshERP-web/src/views/report/InOutStockReport.vue
+++ b/jshERP-web/src/views/report/InOutStockReport.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <a-form layout="inline" @keyup.enter.native="searchQuery">
--- a/jshERP-web/src/views/report/MaterialStock.vue
+++ b/jshERP-web/src/views/report/MaterialStock.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <a-form layout="inline" @keyup.enter.native="searchQuery">
--- a/jshERP-web/src/views/report/OutDetail.vue
+++ b/jshERP-web/src/views/report/OutDetail.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <a-form layout="inline" @keyup.enter.native="searchQuery">
--- a/jshERP-web/src/views/report/OutMaterialCount.vue
+++ b/jshERP-web/src/views/report/OutMaterialCount.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <a-form layout="inline" @keyup.enter.native="searchQuery">
--- a/jshERP-web/src/views/report/SaleOutReport.vue
+++ b/jshERP-web/src/views/report/SaleOutReport.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <a-form layout="inline" @keyup.enter.native="searchQuery">
--- a/jshERP-web/src/views/report/StockWarningReport.vue
+++ b/jshERP-web/src/views/report/StockWarningReport.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <a-form layout="inline" @keyup.enter.native="searchQuery">
--- a/jshERP-web/src/views/report/VendorAccount.vue
+++ b/jshERP-web/src/views/report/VendorAccount.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <a-form layout="inline" @keyup.enter.native="searchQuery">
--- a/jshERP-web/src/views/system/AccountList.vue
+++ b/jshERP-web/src/views/system/AccountList.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/system/CustomerList.vue
+++ b/jshERP-web/src/views/system/CustomerList.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/system/DepotList.vue
+++ b/jshERP-web/src/views/system/DepotList.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/system/FunctionList.vue
+++ b/jshERP-web/src/views/system/FunctionList.vue
@ -2,7 +2,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/system/InOutItemList.vue
+++ b/jshERP-web/src/views/system/InOutItemList.vue
@ -1,7 +1,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/system/LogList.vue
+++ b/jshERP-web/src/views/system/LogList.vue
@ -1,7 +1,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <a-form layout="inline" @keyup.enter.native="searchQuery">
--- a/jshERP-web/src/views/system/MemberList.vue
+++ b/jshERP-web/src/views/system/MemberList.vue
@ -1,7 +1,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/system/PersonList.vue
+++ b/jshERP-web/src/views/system/PersonList.vue
@ -1,7 +1,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/system/PluginList.vue
+++ b/jshERP-web/src/views/system/PluginList.vue
@ -1,7 +1,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/system/RoleList.vue
+++ b/jshERP-web/src/views/system/RoleList.vue
@ -1,7 +1,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/system/TenantList.vue
+++ b/jshERP-web/src/views/system/TenantList.vue
@ -1,7 +1,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <a-form layout="inline" @keyup.enter.native="searchQuery">
--- a/jshERP-web/src/views/system/UnitList.vue
+++ b/jshERP-web/src/views/system/UnitList.vue
@ -1,7 +1,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->
--- a/jshERP-web/src/views/system/UserList.vue
+++ b/jshERP-web/src/views/system/UserList.vue
@ -1,7 +1,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <a-form layout="inline" @keyup.enter.native="searchQuery">
--- a/jshERP-web/src/views/system/VendorList.vue
+++ b/jshERP-web/src/views/system/VendorList.vue
@ -1,7 +1,7 @@
 <template>
  <a-row :gutter="24">
    <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
          <!-- 搜索区域 -->