调整

components/l-signature/l-signature.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="lime-signature" :style="[canvasStyle, styles]" ref="limeSignature">
+	<view class="lime-signature" ref="limeSignature">
 		<!-- #ifndef APP-VUE || APP-NVUE -->
 		<canvas 
 		v-if="useCanvas2d"

pages/withdrawal/info.vue

@@ -177,25 +177,32 @@
 			<table class="border-table " style="width: 1800px;" id="my-table-id">
 				<tr>
 					<td colspan=""></td>
-					<td colspan="11">e家能源月度账单明细表</td>
+					<td colspan="12">e家能源月度账单明细表</td>
 				</tr>
 				<tr>
 					<td colspan=""></td>
 					<td colspan="3">园区：{{info.parkName}}</td>
-					<td colspan="8">抄表时间：{{info.startTime}}至{{info.endTime}}</td>
+					<td colspan="9">抄表时间：{{info.startTime}}至{{info.endTime}}</td>
 				</tr>
 				<tr>
 					<td width="50px">序号</td>
 					<td width="250px">单位名称</td>
 					<td width="220px">本期代收费金额<br />
-						（房租、物业、保洁）</td>
-					<td width="150px">本期使用电量（度）</td>
+						（房租、物业、保洁）</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>
 
@@ -203,17 +210,22 @@
 				<tr v-for="(item,i) in info.monthList" :key="i">
 					<td>{{item.index}}</td>
 					<td>{{item.name}}</td>
-
-					<td>{{item.proxyFee?item.proxyFee:'/'}}</td>
+					<td>{{item.proxyFee?item.proxyFee:'/'}}</td>
+					
 					<td>{{item.electricityConsumption?item.electricityConsumption:'/'}}</td>
-
-
-					<td>{{item.waterConsumption?item.waterConsumption:'/'}}</td>
-					<td>{{item.electricityPrice?item.electricityPrice:'/'}}</td>
-					<td>{{item.waterPrice?item.waterPrice:'/'}}</td>
-					<td>{{item.electricityWaterFee?item.electricityWaterFee:'/'}}</td>
-					<td>{{item.lineLoss?item.lineLoss:'/'}}</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.waterPrice?item.waterPrice:'/'}}</td>
+					<td>{{item.waterConsumption?item.waterConsumption:'/'}}</td>
+					<td>{{item.waterFee?item.waterFee:'/'}}</td>
+					
+					
+				
+				
 					<td>{{item.saveEnergyIncome?item.saveEnergyIncome:'/'}}</td>
 					<td>{{item.totalAmount?item.totalAmount:'/'}}</td>
 
@@ -221,17 +233,18 @@
 				<tr>
 					<td></td>
 					<td>合计</td>
-
-					<td>{{sumKey('proxyFee')}}</td>
+					<td>{{sumKey('proxyFee')}}</td>
+					
 					<td>{{sumKey('electricityConsumption')}}</td>
-
-
-					<td>{{sumKey('waterConsumption')}}</td>
-					<td></td>
 					<td></td>
-					<td>{{sumKey('electricityWaterFee')}}</td>
 					<td></td>
 					<td></td>
+					<td>{{sumKey('electricityFee')}}</td>
+					
+					<td></td>
+					<td>{{sumKey('waterConsumption')}}</td>
+					<td>{{sumKey('waterFee')}}</td>
+					
 					<td>{{sumKey('saveEnergyIncome')}}</td>
 					<td>{{sumKey('totalAmount')}}</td>