diff --git a/api/fee/feeApi.js b/api/fee/feeApi.js
index 11f9826..eab2627 100755
--- a/api/fee/feeApi.js
+++ b/api/fee/feeApi.js
@@ -54,6 +54,8 @@ export function getRoomFees(_objData,_tmpRoom) {
_tmpRoom.feeName = _roomFee.feeName;
_tmpRoom.feeFlag = _roomFee.feeFlag;
_tmpRoom.paymentCycle = _roomFee.paymentCycle;
+ _tmpRoom.preDegrees = _roomFee.preDegrees;
+ _tmpRoom.curDegrees = _roomFee.curDegrees;
moreRooms.push(_tmpRoom);
});
resolve(moreRooms);
diff --git a/pages/payFeeDetail/payFeeDetail.vue b/pages/payFeeDetail/payFeeDetail.vue
index e504380..56d61a5 100755
--- a/pages/payFeeDetail/payFeeDetail.vue
+++ b/pages/payFeeDetail/payFeeDetail.vue
@@ -31,6 +31,18 @@
缴费时间
{{item.createTime}}
+
+ 上期度数
+ {{item.preDegrees}}
+
+
+ 本期度数
+ {{item.curDegrees}}
+
+
+ 使用量
+ {{item.curDegrees-item.preDegrees}}
+
备注
{{item.remark}}
diff --git a/pages/roomFee/roomFee.vue b/pages/roomFee/roomFee.vue
index 081214e..4d0c22e 100755
--- a/pages/roomFee/roomFee.vue
+++ b/pages/roomFee/roomFee.vue
@@ -74,6 +74,31 @@
{{endTime }}
+
+
+ 上期度数
+
+
+ {{preDegrees }}
+
+
+
+
+ 本期度数
+
+
+ {{curDegrees }}
+
+
+
+
+ 使用量
+
+
+ {{curDegrees-preDegrees}}
+
+
+
@@ -154,6 +179,8 @@
feeFlag:'',
paymentCycle:1,
squarePrice: 0,
+ preDegrees:'',
+ curDegrees:''
};
},
@@ -196,6 +223,8 @@
this.formatEndTime = date2String(_fee.endTime);
this.feeFlag = _fee.feeFlag;
this.squarePrice = _fee.squarePrice;
+ this.preDegrees = _fee.preDegrees;
+ this.curDegrees = _fee.curDegrees;
if(this.feeFlag == '2006012'){
return;
}
@@ -207,6 +236,7 @@
this.feeMonth = this.paymentCycle;
let _endTime = addMonth(_lastDate, parseInt(this.feeMonth));
this.endTime = formatDate(_endTime);
+
this.$nextTick(() => {
this.$refs.vcDiscountRef._loadFeeDiscount(this.feeId,this.communityId,this.feeMonth);