lilei 1 år sedan
förälder
incheckning
aa6d5f6715

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="actualSalesReportList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="actualSalesReportList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper newTableSearchName" ref="tableSearch">
         <a-form-model
@@ -76,15 +76,16 @@
       <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"
           :style="{ height: tableHeight+84.5+'px' }"
-          :scroll="{ x: 2250,y: tableHeight-126 }"
+          :scroll="{ x: 2250,y: tableHeight-135 }"
           :defaultLoadData="false"
           bordered>
           <template slot="footer" v-if="countLabel.length||countBrandLabel.length">
@@ -318,7 +319,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 218
     }
   },
   mounted () {

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="allocationOrderTotalList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="allocationOrderTotalList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper" ref="tableSearch">
         <a-form-model
@@ -61,7 +61,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"
@@ -270,7 +270,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 215
     }
   },
   mounted () {

+ 9 - 3
src/views/reportData/promotionSalesRealTimeReport/index.vue

@@ -3,7 +3,7 @@
     <a-spin :spinning="spinning" tip="Loading...">
       <a-tabs default-active-key="1" @change="handleChange" :tabBarStyle="{'background':'#fff'}">
         <a-tab-pane key="1" tab="促销销售单报表">
-          <a-card size="small" :bordered="false" class="promotionSalesRealTimeReport-wrap searchBottomSpace">
+          <a-card size="small" :bordered="false" class="promotionSalesRealTimeReport-wrap searchBoxNormal">
             <div ref="tableSearch" class="table-page-search-wrapper newTableSearchName">
               <a-form-model
                 layout="inline"
@@ -107,13 +107,14 @@
           <!-- 列表 -->
           <a-card size="small" :bordered="false">
             <s-table
-              class="sTable"
+              class="sTable fixPagination"
               ref="table"
               size="small"
               :rowKey="(record) => record.no"
               rowKeyName="no"
               :columns="columns"
               :data="loadData"
+              :pageSize="30"
               :style="{ height: tableHeight+84.5+'px' }"
               :scroll="{ x:1890,y: tableHeight-34}"
               :defaultLoadData="false"
@@ -400,7 +401,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 280
+      this.tableHeight = window.innerHeight - tableSearchH - 260
     }
   },
   watch: {
@@ -438,6 +439,11 @@ export default {
       text-align:center;
     }
   }
+  .promotionSalesRealTimeReport-wrap{
+    /deep/ .ant-card-body:first-child{
+      padding-bottom: 0;
+    }
+  }
   .ant-tabs-tabpane.ant-tabs-tabpane-active{
     margin-top:-11px !important;
   }

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

@@ -1,7 +1,7 @@
 <template>
   <a-spin :spinning="spinning" tip="Loading...">
     <div class="productInfoList-wrap">
-      <a-card size="small" :bordered="false" class="productInfoList-wrap searchBottomSpace">
+      <a-card size="small" :bordered="false" class="searchBoxNormal">
         <div ref="tableSearch" class="table-page-search-wrapper newTableSearchName">
           <a-form-model layout="inline" ref="ruleForm" :rules="rules" :model="newQueryParam">
             <a-row :gutter="15">
@@ -116,15 +116,16 @@
       <!-- 列表 -->
       <a-card size="small" :bordered="false">
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
           :rowKey="(record) => record.no"
           rowKeyName="no"
           :columns="columns"
           :data="loadData"
+          :pageSize="30"
           :style="{ height: tableHeight+84.5+'px' }"
-          :scroll="{ y: tableHeight-30,x:1890}"
+          :scroll="{ y: tableHeight-20,x:1890}"
           :defaultLoadData="false"
           bordered>
           <!-- 促销时间 -->
@@ -569,7 +570,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 280
+      this.tableHeight = window.innerHeight - tableSearchH - 260
     }
   },
   mounted () {

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="salesAmountReportList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="salesAmountReportList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper newTableSearchName" ref="tableSearch">
         <a-form-model
@@ -75,7 +75,7 @@
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 列表 -->
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
           :defaultLoadData="false"
@@ -83,6 +83,7 @@
           rowKeyName="no"
           :columns="columns"
           :data="loadData"
+          :pageSize="30"
           :style="{ height: tableHeight+84.5+'px' }"
           :scroll="{ x: 2250 ,y: tableHeight-136 }"
           bordered>
@@ -311,7 +312,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/salesDetails/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="salesDetailsList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="salesDetailsList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper" ref="tableSearch">
         <a-form-model
@@ -128,15 +128,16 @@
       <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"
           :style="{ height: tableHeight+84.5+'px' }"
-          :scroll="{ x: 2480 , y: tableHeight }"
+          :scroll="{ x: 2480 , y: tableHeight - 10 }"
           :defaultLoadData="false"
           bordered>
           <template slot="footer">
@@ -422,7 +423,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 215
     }
   },
   mounted () {

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="salesOrderTotalList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="salesOrderTotalList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper" ref="tableSearch">
         <a-form-model
@@ -119,7 +119,7 @@
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 列表 -->
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
           :rowKey="(record) => record.salesBillNo"
@@ -127,6 +127,7 @@
           rowKeyName="salesBillNo"
           :columns="columns"
           :data="loadData"
+          :pageSize="30"
           :scroll="{ x: 1990, y: tableHeight-32 }"
           :defaultLoadData="false"
           bordered>
@@ -625,7 +626,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 236
+      this.tableHeight = window.innerHeight - tableSearchH - 216
     }
   },
   mounted () {

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

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