lilei 1 éve
szülő
commit
992086874b
26 módosított fájl, 94 hozzáadás és 79 törlés
  1. 1 1
      src/views/reportData/allCountryCostReport/list.vue
  2. 6 5
      src/views/reportData/allocationDetails/list.vue
  3. 7 5
      src/views/reportData/allocationPresentation/list.vue
  4. 3 3
      src/views/reportData/billingBackReport/list.vue
  5. 3 3
      src/views/reportData/billingOrderReport/list.vue
  6. 3 3
      src/views/reportData/billingReturnReport/list.vue
  7. 1 1
      src/views/reportData/expenseAccountReport/bearerList.vue
  8. 1 1
      src/views/reportData/expenseAccountReport/categoryList.vue
  9. 5 4
      src/views/reportData/hPriceDifferenceDetailReport/list.vue
  10. 6 5
      src/views/reportData/priceDifferenceDetailReport/list.vue
  11. 1 1
      src/views/reportData/productRebateReport/detailList.vue
  12. 1 1
      src/views/reportData/productRebateReport/list.vue
  13. 1 1
      src/views/reportData/receivedSendStorageReport/index.vue
  14. 6 3
      src/views/reportData/regionTypeSalesReport/list.vue
  15. 4 3
      src/views/reportData/returnGoodsPresentation/list.vue
  16. 3 3
      src/views/reportData/returnSlipReport/list.vue
  17. 3 3
      src/views/reportData/salesPresentation/list.vue
  18. 5 4
      src/views/reportData/salesReturnDetailReport/list.vue
  19. 4 4
      src/views/reportData/salesReturnReport/list.vue
  20. 5 4
      src/views/reportData/salesReturnsReport/list.vue
  21. 5 4
      src/views/reportData/transferReturnDetailReport/list.vue
  22. 4 3
      src/views/reportData/transferReturnReport/list.vue
  23. 3 3
      src/views/reportData/urchaseDetailReturn/detailList.vue
  24. 3 3
      src/views/reportData/urchaseReturn/list.vue
  25. 5 4
      src/views/reportData/warehousingOrder/list.vue
  26. 5 4
      src/views/reportData/warehousingOrderDetail/list.vue

+ 1 - 1
src/views/reportData/allCountryCostReport/list.vue

@@ -6,7 +6,7 @@
         </a-tab-pane>
       </a-tabs>
 
-      <div class="table-page-search-wrapper">
+      <div class="table-page-search-wrapper searchBoxNormal">
         <a-form-model
           id="returnGoodsPresentationList-form"
           ref="ruleForm"

+ 6 - 5
src/views/reportData/allocationDetails/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="allocationDetailsList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="allocationDetailsList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper" ref="tableSearch">
         <a-form-model
@@ -120,15 +120,16 @@
     <a-card size="small" :bordered="false" class="allocationDetailsList-wrap">
       <a-spin :spinning="spinning" tip="Loading...">
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
           :defaultLoadData="false"
-          :style="{ height: tableHeight+84.5+'px' }"
-          :scroll="{ x: 2610 ,y: tableHeight-40 }"
+          :pageSize="30"
+          :style="{ height: tableHeight+70+'px' }"
+          :scroll="{ x: 2610 ,y: tableHeight-45 }"
           bordered>
           <template slot="footer">
             <a-row :gutter="15">
@@ -449,7 +450,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   mounted () {

+ 7 - 5
src/views/reportData/allocationPresentation/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="searchBottomSpace">
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 搜索条件 -->
         <div class="table-page-search-wrapper" ref="tableSearch">
@@ -74,14 +74,15 @@
       </a-spin></a-card>
     <a-tabs :tabBarStyle="{'background':'#fff'}">
       <a-tab-pane key="1" tab="费用/调拨类型列表">
-        <a-card size="small" :bordered="false" class="allocationPresentationList-wrap">
+        <a-card size="small" :bordered="false" class="allocationPresentationList-wrap" :style="{'margin-top':'-15px'}">
           <!-- 列表 -->
           <s-table
-            class="sTable"
+            class="sTable fixPagination"
             ref="table"
             size="small"
             :defaultLoadData="false"
             :rowKey="(record) => record.no"
+            :pageSize="30"
             rowKeyName="no"
             :columns="columns"
             :data="loadData"
@@ -92,7 +93,7 @@
         </a-card>
       </a-tab-pane>
       <a-tab-pane key="2" tab="费用/调拨类型合计" force-render>
-        <a-card size="small" :bordered="false" class="allocationPresentationList-wrap" :style="{'height':tableHeight*1+110*1+'px'}">
+        <a-card size="small" :bordered="false" class="allocationPresentationList-wrap" :style="{'height':tableHeight*1+110*1+'px',overflow:'auto','margin-top':'-15px'}">
           <div class="h-title">
             <div><div>费用类型</div></div>
             <div><div>调拨类别</div></div>
@@ -369,7 +370,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 280
+      this.tableHeight = window.innerHeight - tableSearchH - 260
     }
   },
   mounted () {
@@ -393,6 +394,7 @@ export default {
     .h-title{
       display: flex;
       align-items: center;
+      margin-top:10px;
       > div{
         padding: 10px;
         width: 33.3%;

+ 3 - 3
src/views/reportData/billingBackReport/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="searchBottomSpace">
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <div class="table-page-search-wrapper newTableSearchName" ref="tableSearch">
         <a-form-model
           id="billingBackReportList-form"
@@ -47,7 +47,7 @@
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
           :defaultLoadData="false"
@@ -262,7 +262,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 215
     }
   },
   mounted () {

+ 3 - 3
src/views/reportData/billingOrderReport/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="searchBottomSpace">
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <div class="table-page-search-wrapper newTableSearchName" ref="tableSearch">
         <a-form-model
           id="billingOrderReport-form"
@@ -52,7 +52,7 @@
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
           :defaultLoadData="false"
@@ -269,7 +269,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 215
     }
   },
   mounted () {

+ 3 - 3
src/views/reportData/billingReturnReport/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="billingReturnReportList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="billingReturnReportList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper newTableSearchName" ref="tableSearch">
         <a-form-model
@@ -76,7 +76,7 @@
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
           :rowKey="(record) => record.no"
@@ -316,7 +316,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 215
     }
   },
   mounted () {

+ 1 - 1
src/views/reportData/expenseAccountReport/bearerList.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="searchBottomSpace">
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <div class="table-page-search-wrapper" ref="tableSearch">
         <a-form-model
           id="returnGoodsPresentationList-form"

+ 1 - 1
src/views/reportData/expenseAccountReport/categoryList.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="searchBottomSpace">
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <div class="table-page-search-wrapper" ref="tableSearch">
         <a-form-model
           id="returnGoodsPresentationList-form"

+ 5 - 4
src/views/reportData/hPriceDifferenceDetailReport/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="hPriceDifferenceDetailList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="hPriceDifferenceDetailList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper" ref="tableSearch">
         <a-form-model
@@ -106,7 +106,7 @@
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
           :rowKey="(record) => record.no"
@@ -114,7 +114,8 @@
           :columns="columns"
           :data="loadData"
           :defaultLoadData="false"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :pageSize="30"
+          :style="{ height: tableHeight+70+'px' }"
           :scroll="{ x: 1850 ,y: tableHeight-50 }"
           bordered>
           <template slot="footer">
@@ -369,7 +370,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   mounted () {

+ 6 - 5
src/views/reportData/priceDifferenceDetailReport/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="priceDifferenceDetailList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="priceDifferenceDetailList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form-model
@@ -59,7 +59,7 @@
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
           :rowKey="(record) => record.no"
@@ -67,8 +67,9 @@
           :columns="columns"
           :data="loadData"
           :defaultLoadData="false"
-          :style="{ height: tableHeight+84.5+'px' }"
-          :scroll="{ y: tableHeight-50 }"
+          :pageSize="30"
+          :style="{ height: tableHeight+70+'px' }"
+          :scroll="{ y: tableHeight-30 }"
           bordered>
           <template slot="footer">
             <table>
@@ -244,7 +245,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   mounted () {

+ 1 - 1
src/views/reportData/productRebateReport/detailList.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="searchBottomSpace">
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form-model

+ 1 - 1
src/views/reportData/productRebateReport/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="searchBottomSpace">
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form-model

+ 1 - 1
src/views/reportData/receivedSendStorageReport/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="receivedSendStorageReport-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="receivedSendStorageReport-wrap searchBoxNormal">
       <div ref="tableSearch" class="table-page-search-wrapper newTableSearchName">
         <a-form-model
           layout="inline"

+ 6 - 3
src/views/reportData/regionTypeSalesReport/list.vue

@@ -5,7 +5,7 @@
         <a-tab-pane :key="item.id" :tab="item.name" v-for="item in tabsList">
         </a-tab-pane>
       </a-tabs>
-      <a-card size="small" style="margin-bottom:15px;">
+      <a-card size="small">
         <div class="table-page-search-wrapper newTableSearchName" ref="tableSearch">
           <a-form-model
             id="returnGoodsPresentationList-form"
@@ -65,7 +65,7 @@
         </div>
       </a-card>
       <!-- 列表 -->
-      <a-card size="small">
+      <a-card size="small" style="margin-top:4px!important">
         <s-table
           class="sTable"
           ref="table"
@@ -253,7 +253,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 280
+      this.tableHeight = window.innerHeight - tableSearchH - 250
     }
   },
   mounted () {
@@ -275,5 +275,8 @@ export default {
 <style lang="less" scoped>
   /deep/.ant-card.ant-card-bordered.ant-card-small{
     margin-top:-12px !important;
+    .ant-card-body{
+      padding-bottom: 0;
+    }
   }
 </style>

+ 4 - 3
src/views/reportData/returnGoodsPresentation/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="returnGoodsPresentationList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="returnGoodsPresentationList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper newTableSearchName" ref="tableSearch">
         <a-form-model
@@ -82,7 +82,7 @@
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
           :defaultLoadData="false"
@@ -90,6 +90,7 @@
           rowKeyName="no"
           :columns="columns"
           :data="loadData"
+          :pageSize="30"
           :style="{ height: tableHeight+84.5+'px' }"
           :scroll="{ x:2370,y: tableHeight-134}"
           bordered>
@@ -323,7 +324,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 215
     }
   },
   mounted () {

+ 3 - 3
src/views/reportData/returnSlipReport/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="returnSlipReportList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="returnSlipReportList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper newTableSearchName" ref="tableSearch">
         <a-form-model
@@ -102,7 +102,7 @@
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
           :rowKey="(record) => record.no"
@@ -355,7 +355,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 215
     }
   },
   mounted () {

+ 3 - 3
src/views/reportData/salesPresentation/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="salesPresentationList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="salesPresentationList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper newTableSearchName" ref="tableSearch">
         <a-form-model
@@ -81,7 +81,7 @@
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
           :defaultLoadData="false"
@@ -318,7 +318,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 215
     }
   },
   mounted () {

+ 5 - 4
src/views/reportData/salesReturnDetailReport/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="salesReturnDetailList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="salesReturnDetailList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper" ref="tableSearch">
         <a-form-model
@@ -138,14 +138,15 @@
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
           :rowKey="(record) => record.no"
           rowKeyName="no"
           :columns="columns"
           :data="loadData"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :pageSize="30"
+          :style="{ height: tableHeight+70+'px' }"
           :scroll="{ x: 2960, y: tableHeight - 60 }"
           :defaultLoadData="false"
           bordered>
@@ -451,7 +452,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   mounted () {

+ 4 - 4
src/views/reportData/salesReturnReport/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="salesReturnReportList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="salesReturnReportList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper newTableSearchName" ref="tableSearch">
         <a-form-model
@@ -76,7 +76,7 @@
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
           :rowKey="(record) => record.no"
@@ -84,7 +84,7 @@
           :columns="columns"
           :data="loadData"
           :style="{ height: tableHeight+84.5+'px' }"
-          :scroll="{ x: 2250, y: tableHeight-136 }"
+          :scroll="{ x: 2250, y: tableHeight-135 }"
           :defaultLoadData="false"
           bordered>
           <template slot="footer" v-if="countLabel.length||countBrandLabel.length">
@@ -317,7 +317,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 215
     }
   },
   mounted () {

+ 5 - 4
src/views/reportData/salesReturnsReport/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="salesReturnsReportList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="salesReturnsReportList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper" ref="tableSearch">
         <a-form-model
@@ -107,14 +107,15 @@
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
           :rowKey="(record) => record.no"
           rowKeyName="no"
           :columns="columns"
           :data="loadData"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :pageSize="30"
+          :style="{ height: tableHeight+70+'px' }"
           :scroll="{ x: 1740, y: tableHeight - 30 }"
           :defaultLoadData="false"
           bordered>
@@ -363,7 +364,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   mounted () {

+ 5 - 4
src/views/reportData/transferReturnDetailReport/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="allocateReturnDetailReport-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="allocateReturnDetailReport-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper" ref="tableSearch">
         <a-form-model
@@ -104,13 +104,14 @@
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :pageSize="30"
+          :style="{ height: tableHeight+70+'px' }"
           :scroll="{ x: 3050 ,y: tableHeight-30 }"
           :defaultLoadData="false"
           bordered>
@@ -399,7 +400,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   mounted () {

+ 4 - 3
src/views/reportData/transferReturnReport/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="allocateReturnReport-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="allocateReturnReport-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper" ref="tableSearch">
         <a-form-model
@@ -74,12 +74,13 @@
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
+          :pageSize="30"
           :style="{ height: tableHeight+84.5+'px' }"
           :scroll="{ x: 1100 ,y: tableHeight-30 }"
           :defaultLoadData="false"
@@ -314,7 +315,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 215
     }
   },
   mounted () {

+ 3 - 3
src/views/reportData/urchaseDetailReturn/detailList.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="salesReturnDetailList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="salesReturnDetailList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper" ref="tableSearch">
         <a-form-model
@@ -94,7 +94,7 @@
     <a-card size="small" :bordered="false" class="salesReturnDetailList-wrap">
       <a-spin :spinning="spinning" tip="Loading...">
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
           :rowKey="(record) => record.id"
@@ -343,7 +343,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 215
     }
   },
   mounted () {

+ 3 - 3
src/views/reportData/urchaseReturn/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="urchaseReturn-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="urchaseReturn-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper" ref="tableSearch">
         <a-form-model
@@ -64,7 +64,7 @@
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
           :rowKey="(record) => record.id"
@@ -252,7 +252,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 215
     }
   },
   mounted () {

+ 5 - 4
src/views/reportData/warehousingOrder/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="warehousingOrderList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="warehousingOrderList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper" ref="tableSearch">
         <a-form-model
@@ -87,15 +87,16 @@
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
           :rowKey="(record) => record.no"
           rowKeyName="no"
           :columns="columns"
           :data="loadData"
+          :pageSize="30"
           :defaultLoadData="false"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+70+'px' }"
           :scroll="{ y: tableHeight-30}"
           bordered>
           <template slot="footer">
@@ -287,7 +288,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   mounted () {

+ 5 - 4
src/views/reportData/warehousingOrderDetail/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="warehousingOrderDetailList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="warehousingOrderDetailList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper" ref="tableSearch">
         <a-form-model
@@ -97,15 +97,16 @@
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
           :rowKey="(record) => record.no"
           rowKeyName="no"
           :columns="columns"
           :data="loadData"
+          :pageSize="30"
           :defaultLoadData="false"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+70+'px' }"
           :scroll="{ x:1890,y: tableHeight-34}"
           bordered>
           <template slot="footer">
@@ -303,7 +304,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   mounted () {