| 
					
				 | 
			
			
				@@ -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%; 
			 |