调整

pages/deductionRecord/deductionDetails.vue

@@ -27,7 +27,7 @@
 					已扣费
 				</view>
 				<view class="details">
-					<view class="item" v-if="tenantContract">
+					<view class="item">
 						<view class="item-title">
 							合同信息
 						</view>
@@ -43,8 +43,8 @@
 							00880088
 						</view>
 					</view>
-					<view class="item">
-						<view class="item-title" v-if="tenantBalanceRecord.remark=='电费'">
+					<view class="item" v-if="tenantBalanceRecord.remark=='电费'">
+						<view class="item-title">
 							收费标准  
 						</view>
 						<view class="item-value" v-if="contractItem.id">
@@ -96,7 +96,7 @@
 						
 					</template>
 					
-					<template v-if="tenantBalanceRecord.remark=='电费'&&tenantBalanceRecord.extraJson!=null">
+					<template v-if="tenantBalanceRecord.remark=='电费'&&tenantBalanceRecord.extraJson">
 						
 						
 						<table class="table1" v-if="tenantBalanceRecord.extraJson.children">
@@ -114,9 +114,8 @@
 								<td class="td1">{{item.meterName}}</td>
 								<td>{{item.startMeter}}-{{item.endMeter}}</td>
 								<td class="td3">{{item.kwh}}度</td>
-							</tr> 
-							<tr style="font-weight: bold;color:#fff;background-color:#307af6 ;height: 80rpx;" >
-								
+							</tr>
+							<tr style="font-weight: bold;color:#fff;background-color:#307af6 ;" >
 								<td   class="td1" colspan="2">扣除后用电量</td>
 						
 									<td>{{tenantBalanceRecord.extraJson.remainKwh}}度</td>
@@ -147,12 +146,8 @@
 					<template v-if="contractItem.id&&tenantBalanceRecord.extraJson.sharedKwh!=null">
 						
 						
-						<table class="table1" >
-							<!-- <tr class="tr1">
-								<td></td>
-								<td>起止码</td>
-								<td>度数</td>
-							</tr> -->
+						<table class="border-table" >
+							
 							<tr>
 								<td class="td1">起止码</td>
 								<td>{{tenantBalanceRecord.extraJson.startMeter}}-{{tenantBalanceRecord.extraJson.endMeter}}</td>
@@ -161,7 +156,7 @@
 							<tr>
 								<td class="td1">楼层电量</td>
 								<td class="td3" >{{tenantBalanceRecord.extraJson.totalKwh}}度
-								<span v-if="tenantBalanceRecord.extraJson.lineLoss&&0">(其中线损电量:{{tenantBalanceRecord.extraJson.lineLoss}}度)</span>
+								<span v-if="tenantBalanceRecord.extraJson.lineLoss">(其中线损电量:{{tenantBalanceRecord.extraJson.lineLoss}}度)</span>
 								</td>
 							</tr>
 							<tr>
@@ -169,11 +164,13 @@
 								<!-- <td></td> -->
 								<td class="td3" >{{tenantBalanceRecord.extraJson.childSumKwh}}度</td>
 							</tr>
+							
 							<tr>
 								<td class="td1">分摊电量</td>
 								<!-- <td></td> -->
 								<td class="td3" >{{(tenantBalanceRecord.extraJson.sharedKwh)}}度</td>
 							</tr>
+							
 							<tr>
 								<td class="td1">租用总面积</td>
 								<!-- <td></td> -->
@@ -189,7 +186,7 @@
 								<!-- <td></td> -->
 								<td class="td3" >{{tenantBalanceRecord.extraJson.houseAreaPercent}}%</td>
 							</tr>
-							<tr >
+							<tr v-if="tenantBalanceRecord.extraJson.allocationRatio">
 								<td class="td1">分摊系数</td>
 								<!-- <td></td> -->
 								<td class="td3" >{{tenantBalanceRecord.extraJson.allocationRatio}}</td>
@@ -212,7 +209,126 @@
 						
 						
 					</template>
-					
+					<template v-if="contractItem.id&&tenantBalanceRecord.extraJson.pubilcKwh!=null">
+						
+						<template v-if="row.extraJson.publicSharedMethod == null">
+							
+						<table class="border-table">
+						    <tr>
+						      <td>起始码</td>
+						      <td>{{row.extraJson.startMeter +"-" + row.extraJson.endMeter}}</td>
+						    </tr>
+						    <tr>
+						      <td>楼层电量</td>
+						      <td>
+						        {{ row.extraJson.totalKwh }}度{{
+						          row.extraJson.lineLoss > 0
+						            ? "(其中线损电量:" +
+						              row.extraJson.lineLoss +
+						              "度)"
+						            : ""
+						        }}</td>
+						    </tr>
+						    <tr>
+						      <td>表计电量</td>
+						      <td>{{ row.extraJson.childSumKwh }}度</td>
+						    </tr>
+						    <tr>
+						      <td>公摊电量</td>
+						      <td>{{ row.extraJson.sharedKwh }}度</td>
+						    </tr>
+						    <tr>
+						      <td>分摊方式</td>
+						      <td>{{ explainSharedMethod(row.extraJson.unitSharedMethod) }}</td>
+						    </tr>
+							
+						    <template v-if="row.extraJson.unitSharedMethod=='2'">
+						    <tr>
+						      <td>总租用面积</td>
+						      <td>{{ row.extraJson.totalHouseArea }}平方米</td>
+						    </tr>
+						    <tr>
+						      <td>租户租用面积</td>
+						      <td>{{ row.extraJson.houseArea }}平方米</td>
+						    </tr>
+						    </template>
+							
+						    <template v-if="row.extraJson.unitSharedMethod=='3'">
+						    <tr>
+						      <td>租户用电量</td>
+						      <td>{{ row.extraJson.childKwh }}度</td>
+						    </tr>
+						    </template>
+							
+						    <tr>
+						      <td>分摊占比</td>
+						      <td>{{ row.extraJson.unitSharedRatio }}%</td>
+						    </tr>
+						   
+						    <tr>
+						      <td>电价</td>
+						      <td>{{ row.extraJson.price }}元/度</td>
+						    </tr>
+							
+							<tr  style="font-weight: bold;color:#fff;background-color:#307af6 ;">
+							  <td>合用分摊电量</td>
+							  <td>{{ row.extraJson.tenantSharedKwh }}度</td>
+							</tr>
+						  </table>
+						</template>
+						
+						<template v-else-if="row.extraJson.publicSharedMethod != null">
+						  <!--公用分摊电量-->
+						  <table class="border-table">
+						    <tr>
+						      <td>公用电量</td>
+						      <td>{{ row.extraJson.publicKwh }}度</td>
+						    </tr>                      
+						    <tr>
+						      <td>分摊方式</td>
+						      <td>{{ explainSharedMethod(row.extraJson.publicSharedMethod) }}</td>
+						    </tr>
+						    <template v-if="row.extraJson.publicSharedMethod=='2'">
+						      <tr>
+						        <td>总租用面积</td>
+						        <td>{{ row.extraJson.totalHouseArea }}平方米</td>
+						      </tr>
+						      <tr>
+						        <td>租户租用面积</td>
+						        <td>{{ row.extraJson.houseArea }}平方米</td>
+						      </tr>
+						    </template>                      
+						    <template v-if="row.extraJson.publicSharedMethod=='3'">
+						    <tr>
+						      <td>总用电量</td>
+						      <td>{{ row.extraJson.totalKwh }}度</td>
+						    </tr>
+						    <tr>
+						      <td>租户用电量</td>
+						      <td>{{ row.extraJson.selfKwh }}度</td>
+						    </tr>
+						    </template>
+						    <tr>
+						      <td>分摊占比</td>
+						      <td>{{ row.extraJson.publicSharedRatio }}%</td>
+						    </tr>
+						  
+						    <tr>
+						      <td>电价</td>
+						      <td>{{ row.extraJson.price }}元/度</td>
+						    </tr>
+							
+							<tr  style="font-weight: bold;color:#fff;background-color:#307af6 ;" >
+							  <td>公用分摊电量</td>
+							  <td>{{ row.extraJson.tenantSharedKwh }}度</td>
+							</tr>
+						  </table>
+							
+							</template>
+						
+						
+						
+					</template>
 				
 					 
 				</view>
@@ -261,12 +377,14 @@
 
 <script>
 	import * as API from '@/apis/pagejs/deduction.js'
+	// import * as API from '@/apis/pagejs/tenantList.js'
 
 	export default {
 		data() {
 			return {
 				id: '',
 				tenantBalanceRecord: {},
+				row:{},
 				contractItem: {},
 				tenantContract: {},
 
@@ -279,7 +397,18 @@
 			this.getRechargeDetails()
 		},
 		methods: {
-			
+			explainSharedMethod(value) {
+			      switch(value){
+			        case "2":
+			          return "按面积分摊";
+			        case "3":
+			          return "按电量分摊";
+			        case "4":
+			          return "按比例分摊";
+			        default:
+			          return "";
+			      }
+			    },
 			getRechargeDetails() {
 				uni.showLoading({
 					title: "加载中",
@@ -290,13 +419,12 @@
 					id: this.id
 				}).then((response) => {
 					uni.hideLoading();
-					if( response.data.contractItem){
-						this.contractItem = response.data.contractItem;
-						
-					}
-					
+
+					this.contractItem = response.data.contractItem;
+
 					this.tenantContract = response.data.tenantContract;
 					this.tenantBalanceRecord = response.data.tenantBalanceRecord;
+					this.row = response.data.tenantBalanceRecord;
 				}).catch(error => {
 					uni.hideLoading();
 					uni.showToast({
@@ -310,29 +438,32 @@
 </script>
 
 <style lang="scss" scoped>
-	.table1{
+	.table1,.border-table{
 		margin: 8rpx 0;
 		width: 100%;
 		   border-collapse: collapse;
 		td{
 			border: 1px solid #e7e7e7;
 			text-align: end;
+			
 			padding: 16rpx 16rpx;
 		}
-		.td1{
-			text-align: start;
-			min-width: 20%;
-			max-width: 30%;
-		}
-		.td3{
-			
-			white-space: pre;
+		
+		tr{
+			 background-color:#f5f5f6 
 		}
 		tr{
-			 background-color:#f5f5f6 ;
-			
-			 
+			td:first-child{
+				    white-space: pre;
+				text-align: start;
+				min-width: 20%;
+				max-width: 30%;
+			}
+			td:last-child{
+				white-space: pre;
+			}
 		}
+		
 		.tr1{
 			text-align: end;
 				font-weight: bold;

pages/deductionRecord/deductionRecord.vue

@@ -199,7 +199,16 @@
 			},
 			extraInfoText(extraInfo){
 				var obj=JSON.parse(extraInfo)
-			
+				
+				if(obj.pubilcKwh!=null&&obj.publicSharedMethod == null){
+					return  `合用分摊电量${obj.tenantSharedKwh}度`
+					
+				}
+				if(obj.pubilcKwh!=null&&obj.publicSharedMethod != null){
+					return  `公用分摊电量${obj.tenantSharedKwh}度`
+					
+				}
+				
 				if(obj.sharedKwh!=null){
 					return  `分摊电量合计${obj.tenantSharedKwh}度`