lilei 1 年之前
父節點
當前提交
8604df4a59

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

@@ -67,7 +67,7 @@
       <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 - 260
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   mounted () {

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

@@ -46,7 +46,7 @@
     <a-card>
       <a-spin :spinning="spinning" tip="Loading...">
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
           :defaultLoadData="false"
@@ -289,7 +289,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 260
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   mounted () {

+ 10 - 13
src/views/reportData/productRebateReport/detailList.vue

@@ -2,7 +2,7 @@
   <div>
     <a-card size="small" :bordered="false" class="searchBoxNormal">
       <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
+      <div class="table-page-search-wrapper" ref="tableSearch1">
         <a-form-model
           id="rebateDetailReport-form"
           ref="ruleForm"
@@ -98,7 +98,8 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :pageSize="30"
+          :style="{ height: tableHeight+75+'px' }"
           :scroll="{ x: 2200,y: tableHeight-20 }"
           :defaultLoadData="false"
           bordered>
@@ -213,10 +214,7 @@ export default {
   },
   watch: {
     advanced (newValue, oldValue) {
-      const _this = this
-      this.$nextTick(() => { // 页面渲染完成后的回调
-        _this.setTableH()
-      })
+      this.setTableH()
     },
     '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
       this.setTableH()
@@ -307,16 +305,15 @@ export default {
     pageInit () {
       this.disabled = false
       this.spinning = false
-      this.setTableStartH()
+      this.setTableH()
     },
     setTableH () {
-      const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 265
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        const tableSearchH = this.$refs.tableSearch1.offsetHeight
+        console.log(tableSearchH)
+        this.tableHeight = window.innerHeight - tableSearchH - 250
+      })
     },
-    setTableStartH () {
-      const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 360
-    }
   },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用

+ 9 - 2
src/views/reportData/productRebateReport/index.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="tabsReportList-wrap">
     <div style="background-color: #fff;margin-bottom: 5px;">
-      <a-tabs default-active-key="1" v-model="curTab">
+      <a-tabs default-active-key="1" v-model="curTab" @change="changeTab">
         <a-tab-pane key="1" tab="返利表"></a-tab-pane>
         <a-tab-pane key="2" tab="返利明细报表" force-render></a-tab-pane>
       </a-tabs>
     </div>
     <div>
       <report v-show="curTab==1"></report>
-      <detailReport v-show="curTab==2"></detailReport>
+      <detailReport ref="detailList" v-show="curTab==2"></detailReport>
     </div>
   </div>
 </template>
@@ -26,6 +26,13 @@ export default {
     return {
       curTab: '1'
     }
+  },
+  methods:{
+    changeTab(v){
+      if(v==2){
+        this.$refs.detailList.setTableH()
+      }
+    }
   }
 }
 </script>

+ 17 - 2
src/views/reportData/productRebateReport/list.vue

@@ -74,11 +74,12 @@
           class="sTable fixPagination"
           ref="table"
           size="small"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+75+'px' }"
           :scroll="{ y: tableHeight-20 }"
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
+          :pageSize="30"
           :defaultLoadData="false"
           bordered>
           <template slot="footer">
@@ -260,7 +261,21 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 270
+      this.tableHeight = window.innerHeight - tableSearchH - 250
+    }
+  },
+  watch: {
+    advanced (newValue, oldValue) {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
     }
   },
   mounted () {

+ 7 - 6
src/views/reportData/receivedSendStorageReport/index.vue

@@ -78,14 +78,15 @@
         <!-- 列表 -->
         <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"
-            :style="{ height: tableHeight+84.5+'px' }"
+            :pageSize="30"
+            :style="{ height: tableHeight+70+'px' }"
             :scroll="{ y: tableHeight-50 }"
             :defaultLoadData="false"
             bordered>
@@ -334,7 +335,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 270
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   mounted () {
@@ -361,7 +362,7 @@ export default {
       text-align:center;
     }
   }
-/deep/.ant-tabs-tabpane.ant-tabs-tabpane-active{
-  margin-top:-11px;
-}
+  /deep/ .ant-tabs-bar{
+    margin:0;
+  }
 </style>

+ 3 - 2
src/views/reportData/receivedSendStorageReport/list.vue

@@ -2,7 +2,7 @@
   <div class="productInfoList-wrap">
     <!-- 列表 -->
     <s-table
-      class="sTable"
+      class="sTable fixPagination"
       ref="table"
       size="small"
       :rowKey="(record) => record.no"
@@ -10,7 +10,8 @@
       :columns="columns"
       :data="loadData"
       :showPagination="false"
-      :style="{ height: tableHeight+84.5+'px' }"
+      :pageSize="30"
+      :style="{ height: tableHeight+70+'px' }"
       :scroll="{ y: tableHeight }"
       :defaultLoadData="false"
       bordered>