diff --git a/components/fee/qrcode-owe-fee.vue b/components/fee/qrcode-owe-fee.vue
index 9b6f1a2..9ad14f7 100644
--- a/components/fee/qrcode-owe-fee.vue
+++ b/components/fee/qrcode-owe-fee.vue
@@ -11,7 +11,7 @@
:checked="item.selected == '1'?true:false" :value="item.feeId">
-
+
{{item.feeName}}({{item.payerObjName}})
@@ -21,19 +21,38 @@
-
+
应缴:￥{{item.feeTotalPrice}}
+
+
+ 上期读数:{{item.preDegrees}}
+
+
+ 上期读表时间:{{_getReadTime(item.preReadingTime)}}
+
+
+ 本期读数:{{item.curDegrees}}
+
+
+ 本期读表时间:{{_getReadTime(item.curReadingTime)}}
+
+
+ 使用量:{{item.curDegrees-item.preDegrees}}
+
+
+ 单价:{{item.squarePrice}}
+
+
-
合计：{{receivableAmount}}元
@@ -71,7 +108,9 @@
getQrcodeOweFees
} from '@/api/fee/qrCodePayFee.js';
import {
- dateSubOneDay
+ dateSubOneDay,
+ getDate,
+ formatDate
} from '../../lib/java110/utils/DateUtil.js';
import noDataPage from '@/components/no-data-page/no-data-page.vue'
export default {
@@ -186,6 +225,22 @@
_getDeadlineTime: function(_fee) {
//todo 处理周期性费用和间接费用的结束时间
return dateSubOneDay(_fee.startTime, _fee.deadlineTime, _fee.feeFlag);
+ },
+ _getReadTime:function(_value){
+ let _date = getDate(_value);
+ return formatDate(_date);
+ },
+ _showDetailFee:function(_fee){
+
+ let _fees = this.fees;
+
+ _fees.forEach(item=>{
+ //item.showDetail = false;
+ if(_fee.feeId == item.feeId){
+ item.showDetail = !item.showDetail;
+ }
+ });
+ this.$forceUpdate();
}
}
@@ -235,4 +290,13 @@
.uni-checkbox-input{
}
+ .sub-info{
+ background-color: #fff;
+ //margin-top: 0.5upx;
+ padding:15upx;
+ .sub-info-item {
+ width: 45%;
+ margin:10upx 15upx 0upx 15upx;
+ }
+ }
\ No newline at end of file
diff --git a/pages/fee/oweFee.vue b/pages/fee/oweFee.vue
index 1bbaffa..cd85107 100644
--- a/pages/fee/oweFee.vue
+++ b/pages/fee/oweFee.vue
@@ -3,7 +3,7 @@
应缴费用
-
合计：{{receivableAmount}}元
@@ -48,7 +67,8 @@
import {
addMonth,
formatDate,
- dateSubOneDay
+ dateSubOneDay,
+ getDate,
} from '../../lib/java110/utils/DateUtil.js'
import {
@@ -134,11 +154,27 @@
_getDeadlineTime:function(_fee){
//todo 处理周期性费用和间接费用的结束时间
return dateSubOneDay(_fee.startTime, _fee.deadlineTime, _fee.feeFlag);
+ },
+ _getReadTime:function(_value){
+ let _date = getDate(_value);
+ return formatDate(_date);
+ },
+ _showDetailFee:function(_fee){
+
+ let _fees = this.fees;
+
+ _fees.forEach(item=>{
+ //item.showDetail = false;
+ if(_fee.feeId == item.feeId){
+ item.showDetail = !item.showDetail;
+ }
+ });
+ this.$forceUpdate();
}
}
};
-