表格横竖

pages/withdrawal/info.vue

@@ -174,36 +174,42 @@
 			<view class="applyBtn">
 				<u-button class="save" type="success" @click="down()">下载对账单</u-button>
 			</view>
-			<table class="border-table " style="width: 1800px;" id="my-table-id">
+			<table class="border-table " v-if="info.erect" style="width: 1800px;" id="my-table-id">
 				<tr>
 					<td colspan=""></td>
-					<td colspan="12">e家能源月度账单明细表</td>
+					<td colspan="18">e家能源月度账单明细表</td>
 				</tr>
 				<tr>
 					<td colspan=""></td>
 					<td colspan="3">园区：{{info.parkName}}</td>
-					<td colspan="9">抄表时间：{{info.startTime}}至{{info.endTime}}</td>
+					<td colspan="15">抄表时间：{{info.startTime}}至{{info.endTime}}</td>
 				</tr>
 				<tr>
 					<td width="50px">序号</td>
 					<td width="250px">单位名称</td>
-					<td width="220px">本期代收费金额<br />
-						（房租、物业、保洁）</td>
-						
+					<td width="220px">本期代收费金额</td>
+					
+					<td width="150px">电量起止码</td>
 						
 					<td width="150px">本期使用电量（度）</td>
-					<td width="150px">分摊线损（度）</td>
+					<td width="150px">分摊线损</td>
 					<td width="150px">分摊公摊（度）</td>
-					<td width="150px">电单价/度</td>	
+					<td width="150px">电单价（元/度）</td>	
 					<td width="150px">电费</td>
 						
-					<td width="150px">水单价/吨</td>	
-					<td width="150px">本期使用水量（吨）</td>
+						<td width="150px">水量起止码</td>
+						<td width="150px">本期使用水量（吨）</td>
+					<td width="150px">水单价（元/吨）</td>	
+					
+					
 					<!-- <td width="150px">电单价/度</td> -->
 					<td width="150px">水费</td>
 				<!-- 	<td width="150px">分摊线损（度）</td>
-					<td width="150px">分摊公摊（度）</td> -->
-					<td width="150px">节能收益</td>
+					<td width="150px">分摊公摊（度）</td> -->
+					<td width="150px">节能电量</td>
+					<td width="150px">节能收益</td>
+					<td width="150px">账户期初余额</td>
+					<td width="150px">账户期末余额</td>
 					<td width="150px">总收入</td>
 
 				</tr>
@@ -211,6 +217,8 @@
 					<td>{{item.index}}</td>
 					<td>{{item.name}}</td>
 					<td>{{item.proxyFee?item.proxyFee:'/'}}</td>
+					
+					<td>{{item.electricityMeterRange?item.electricityMeterRange:'/'}}</td>
 					
 					<td>{{item.electricityConsumption?item.electricityConsumption:'/'}}</td>
 					<td>{{item.lineLoss?item.lineLoss:'/'}}</td>
@@ -219,36 +227,82 @@
 					<td>{{item.electricityFee?item.electricityFee:'/'}}</td>
 					
 					
-					<td>{{item.waterPrice?item.waterPrice:'/'}}</td>
+					<td>{{item.waterMeterRange?item.waterMeterRange:'/'}}</td>
 					<td>{{item.waterConsumption?item.waterConsumption:'/'}}</td>
+					
+					<td>{{item.waterPrice?item.waterPrice:'/'}}</td>
+					
 					<td>{{item.waterFee?item.waterFee:'/'}}</td>
 					
 					
 				
-				
-					<td>{{item.saveEnergyIncome?item.saveEnergyIncome:'/'}}</td>
-					<td>{{item.totalAmount?item.totalAmount:'/'}}</td>
-
-				</tr>
-				<tr>
-					<td></td>
-					<td>合计</td>
-					<td>{{sumKey('proxyFee')}}</td>
-					
-					<td>{{sumKey('electricityConsumption')}}</td>
-					<td></td>
-					<td></td>
-					<td></td>
-					<td>{{sumKey('electricityFee')}}</td>
-					
-					<td></td>
-					<td>{{sumKey('waterConsumption')}}</td>
-					<td>{{sumKey('waterFee')}}</td>
+					<td>{{item.saveEnergyKwh?item.saveEnergyKwh:'/'}}</td>
+					<td>{{item.saveEnergyIncome?item.saveEnergyIncome:'/'}}</td>
+					
+					<td>{{item.openingBalance?item.openingBalance:'/'}}</td>
+					<td>{{item.endingBalance?item.endingBalance:'/'}}</td>
 					
-					<td>{{sumKey('saveEnergyIncome')}}</td>
-					<td>{{sumKey('totalAmount')}}</td>
+					<td>{{item.totalAmount?item.totalAmount:'/'}}</td>
 
 				</tr>
+				
+			</table>
+			<table class="border-table " v-else style="width: 1800px;" id="my-table-id">
+				<tr>
+					<td colspan=""></td>
+					<td colspan="12">e家能源月度账单明细表</td>
+				</tr>
+				<tr>
+					<td colspan=""></td>
+					<td colspan="3">园区：{{info.parkName}}</td>
+					<td colspan="9">抄表时间：{{info.startTime}}至{{info.endTime}}</td>
+				</tr>
+				<tr>
+					<td width="50px">序号</td>
+					<td width="250px">单位名称</td>
+				
+					
+					<td width="150px">电量起止码</td>
+						
+					<td width="150px">本期使用电量（度）</td>
+					<td width="150px">分摊线损</td>
+					<td width="150px">分摊公摊（度）</td>
+					<td width="150px">电单价（元/度）</td>	
+					<td width="150px">电费</td>
+					
+					 
+			
+					<td width="150px">节能电量（度）</td>
+					<td width="150px">节能收益（元）</td>
+					<td width="150px">账户期初余额</td>
+					<td width="150px">账户期末余额</td>
+					<td width="150px">总收入</td>
+			
+				</tr>
+				<tr v-for="(item,i) in info.monthList" :key="i">
+					<td>{{item.index}}</td>
+					<td>{{item.name}}</td>
+				
+					<td>{{item.electricityMeterRange?item.electricityMeterRange:'/'}}</td>
+					
+					<td>{{item.electricityConsumption?item.electricityConsumption:'/'}}</td>
+					<td>{{item.lineLoss?item.lineLoss:'/'}}</td>
+					<td>{{item.shareElectricityConsumption?item.shareElectricityConsumption:'/'}}</td>
+					<td>{{item.electricityPrice?item.electricityPrice:'/'}}</td>
+					<td>{{item.electricityFee?item.electricityFee:'/'}}</td>
+					
+				
+					
+				
+					<td>{{item.saveEnergyKwh?item.saveEnergyKwh:'/'}}</td>
+					<td>{{item.saveEnergyIncome?item.saveEnergyIncome:'/'}}</td>
+					<td>{{item.openingBalance?item.openingBalance:'/'}}</td>
+					<td>{{item.endingBalance?item.endingBalance:'/'}}</td>
+					
+					<td>{{item.totalAmount?item.totalAmount:'/'}}</td>
+			
+				</tr>
+			
 			</table>
 		</scroll-view>
 	</view>
@@ -312,7 +366,8 @@
 				}],
 				id: "",
 				current: 0,
-				info: {
+				info: {
+					erect:false,
 					application: {},
 					endTime: "",
 					monthList: [],
@@ -499,10 +554,11 @@
 				this.info.monthList.forEach(item => {
 					var n = item[key]
 					if (n) {
-						num += n
+						num += parseFloat(n)
 					}
 
-				})
+				})
+				
 				return num.toFixed(2)
 			},
 			getInfo() {
@@ -515,7 +571,8 @@
 					recordId: this.id
 				}).then((res) => {
 					uni.hideLoading();
-					this.info = res.data
+					this.info = res.data
+					
 					this.data.accountName = this.info.application.accountName
 					this.data.bankName = this.info.application.bankName
 					this.data.accountNo = this.info.application.accountNo