chenrui 1 年間 前
コミット
fb336f3e57

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

@@ -74,7 +74,7 @@
       </a-spin></a-card>
     <a-tabs :tabBarStyle="{'background':'#fff'}">
       <a-tab-pane key="1" tab="费用/调拨类型列表">
-        <a-card size="small" :bordered="false" class="allocationPresentationList-wrap" :style="{'margin-top':'-15px'}">
+        <a-card size="small" :bordered="false" class="allocationPresentationList-wrap" :style="{'margin-top':'-16px'}">
           <!-- 列表 -->
           <s-table
             class="sTable fixPagination"
@@ -93,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',overflow:'auto','margin-top':'-15px'}">
+        <a-card size="small" :bordered="false" class="allocationPresentationList-wrap" :style="{'height':tableHeight*1+110*1+'px',overflow:'auto','margin-top':'-16px'}">
           <div class="h-title">
             <div><div>费用类型</div></div>
             <div><div>调拨类别</div></div>
@@ -370,7 +370,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 260
+      this.tableHeight = window.innerHeight - tableSearchH - 255
     }
   },
   mounted () {

+ 10 - 15
src/views/reportData/receivedSendStorageReport/index.vue

@@ -73,10 +73,10 @@
         </a-form-model>
       </div>
     </a-card>
-    <a-tabs default-active-key="1" @change="handleChange" :tabBarStyle="{'background':'#fff'}">
-      <a-tab-pane key="1" tab="明细">
-        <!-- 列表 -->
-        <a-card size="small" :bordered="false">
+    <a-card size="small" :bordered="false">
+      <a-tabs default-active-key="1" @change="handleChange">
+        <a-tab-pane key="1" tab="明细">
+          <!-- 列表 -->
           <s-table
             class="sTable fixPagination"
             ref="table"
@@ -112,14 +112,12 @@
               </a-row>
             </template>
           </s-table>
-        </a-card>
-      </a-tab-pane>
-      <a-tab-pane key="2" tab="汇总" force-render>
-        <a-card size="small" :bordered="false">
+        </a-tab-pane>
+        <a-tab-pane key="2" tab="汇总" force-render>
           <gatherList ref="gatherBox" :tableHeight="tableHeight" :totalData="totalData" :queryParam="queryParam"></gatherList>
-        </a-card>
-      </a-tab-pane>
-    </a-tabs>
+        </a-tab-pane>
+      </a-tabs>
+    </a-card>
     <!-- 导出提示框 -->
     <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </div>
@@ -335,7 +333,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 240
+      this.tableHeight = window.innerHeight - tableSearchH - 255
     }
   },
   mounted () {
@@ -362,7 +360,4 @@ export default {
       text-align:center;
     }
   }
-  /deep/ .ant-tabs-bar{
-    margin:0;
-  }
 </style>