zhengkaixin 1 سال پیش
والد
کامیت
2d533737ba
1فایلهای تغییر یافته به همراه22 افزوده شده و 11 حذف شده
  1. 22 11
      pages/deductionRecord/deductionDetails.vue

+ 22 - 11
pages/deductionRecord/deductionDetails.vue

@@ -144,49 +144,60 @@
 						
 						
 					</template>
 					</template>
 					 
 					 
-					<template v-if="contractItem.id&&tenantBalanceRecord.extraJson.sharedKwh!=null">
+					<template v-if="contractItem.id&&tenantBalanceRecord.remark=='公摊电费'&&tenantBalanceRecord.extraJson.sharedKwh!=null">
 						
 						
 						
 						
 						<table class="table1" >
 						<table class="table1" >
-							<tr class="tr1">
+							<!-- <tr class="tr1">
 								<td></td>
 								<td></td>
 								<td>起止码</td>
 								<td>起止码</td>
 								<td>度数</td>
 								<td>度数</td>
+							</tr> -->
+							<tr>
+								<td class="td1">起止码</td>
+								<td>{{tenantBalanceRecord.extraJson.startMeter}}-{{tenantBalanceRecord.extraJson.endMeter}}</td>
+							
 							</tr>
 							</tr>
 							<tr>
 							<tr>
 								<td class="td1">楼层电量</td>
 								<td class="td1">楼层电量</td>
-								<td>{{tenantBalanceRecord.extraJson.startMeter}}-{{tenantBalanceRecord.extraJson.endMeter}}</td>
-								<td class="td3" >{{tenantBalanceRecord.extraJson.totalKwh}}度</td>
+								<td class="td3" >{{tenantBalanceRecord.extraJson.totalKwh}}度
+								<span v-if="tenantBalanceRecord.extraJson.lineLoss">(其中线损电量:{{tenantBalanceRecord.extraJson.lineLoss}}度)</span>
+								</td>
 							</tr>
 							</tr>
 							<tr>
 							<tr>
 								<td class="td1">表计电量</td>
 								<td class="td1">表计电量</td>
-								<td></td>
+								<!-- <td></td> -->
 								<td class="td3" >{{tenantBalanceRecord.extraJson.childSumKwh}}度</td>
 								<td class="td3" >{{tenantBalanceRecord.extraJson.childSumKwh}}度</td>
 							</tr>
 							</tr>
 							<tr>
 							<tr>
 								<td class="td1">公摊电量</td>
 								<td class="td1">公摊电量</td>
-								<td></td>
+								<!-- <td></td> -->
 								<td class="td3" >{{(tenantBalanceRecord.extraJson.sharedKwh)}}度</td>
 								<td class="td3" >{{(tenantBalanceRecord.extraJson.sharedKwh)}}度</td>
 							</tr>
 							</tr>
 							<tr>
 							<tr>
 								<td class="td1">楼层总面积</td>
 								<td class="td1">楼层总面积</td>
-								<td></td>
+								<!-- <td></td> -->
 								<td class="td3" >{{tenantBalanceRecord.extraJson.totalHouseArea}}平方米</td>
 								<td class="td3" >{{tenantBalanceRecord.extraJson.totalHouseArea}}平方米</td>
 							</tr>
 							</tr>
 							<tr>
 							<tr>
 								<td class="td1">租用面积</td>
 								<td class="td1">租用面积</td>
-								<td></td>
+								<!-- <td></td> -->
 								<td class="td3" >{{tenantBalanceRecord.extraJson.houseArea}}平方米</td>
 								<td class="td3" >{{tenantBalanceRecord.extraJson.houseArea}}平方米</td>
 							</tr>
 							</tr>
 							<tr>
 							<tr>
 								<td class="td1">租用面积占比</td>
 								<td class="td1">租用面积占比</td>
-								<td></td>
+								<!-- <td></td> -->
 								<td class="td3" >{{tenantBalanceRecord.extraJson.houseAreaPercent}}%</td>
 								<td class="td3" >{{tenantBalanceRecord.extraJson.houseAreaPercent}}%</td>
 							</tr>
 							</tr>
-							<tr style="font-weight: bold;color:#fff;background-color:#307af6 ;height: 80rpx;" >
+							<tr v-if="tenantBalanceRecord.extraJson.allocationRatio">
+								<td class="td1">分摊系数</td>
+								<!-- <td></td> -->
+								<td class="td3" >{{tenantBalanceRecord.extraJson.allocationRatio}}</td>
+							</tr>
+						<tr style="font-weight: bold;color:#fff;background-color:#307af6 ;" >
 							
 							
 								<td class="td1">租户公摊电量</td>
 								<td class="td1">租户公摊电量</td>
-								<td></td>
+								<!-- <td></td> -->
 								<td class="td3" >{{tenantBalanceRecord.extraJson.tenantSharedKwh}}度</td>
 								<td class="td3" >{{tenantBalanceRecord.extraJson.tenantSharedKwh}}度</td>
 							</tr>
 							</tr>