diff --git a/public/admin.html b/public/admin.html index 41f69c089..e50a40a95 100755 --- a/public/admin.html +++ b/public/admin.html @@ -46,7 +46,7 @@ - diff --git a/public/components/property/simplifyCarFee/simplifyCarFee.html b/public/components/property/simplifyCarFee/simplifyCarFee.html index 6b4b2c8a5..7f4be96b5 100755 --- a/public/components/property/simplifyCarFee/simplifyCarFee.html +++ b/public/components/property/simplifyCarFee/simplifyCarFee.html @@ -84,7 +84,10 @@
注意: 计费结束时间 “-” 表示未到计费时间 或 收费已结束
-
+
+ 欠费小计:{{simplifyCarFeeInfo.totalAmount}} +
+
diff --git a/public/components/property/simplifyCarFee/simplifyCarFee.js b/public/components/property/simplifyCarFee/simplifyCarFee.js index d61157dae..595230fda 100755 --- a/public/components/property/simplifyCarFee/simplifyCarFee.js +++ b/public/components/property/simplifyCarFee/simplifyCarFee.js @@ -14,7 +14,8 @@ records: 1, areaNum: '', num: '', - parkingName: '' + parkingName: '', + totalAmount: 0.0 } }, _initMethod: function () { @@ -24,8 +25,8 @@ //切换 至费用页面 vc.on('simplifyCarFee', 'switch', function (_param) { - if(_param.ownerId == ''){ - return ; + if (_param.ownerId == '') { + return; } $that.clearSimplifyCarFeeInfo(); vc.copyObject(_param, $that.simplifyCarFeeInfo) @@ -65,6 +66,12 @@ vc.component.simplifyCarFeeInfo.total = _feeConfigInfo.total; vc.component.simplifyCarFeeInfo.records = _feeConfigInfo.records; vc.component.simplifyCarFeeInfo.fees = _feeConfigInfo.fees; + let _totalAmount = 0.0; + _feeConfigInfo.fees.forEach(item => { + _totalAmount += parseFloat(item.amountOwed); + + }) + $that.simplifyCarFeeInfo.totalAmount = _totalAmount; vc.emit('simplifyCarFee', 'paginationPlus', 'init', { total: _feeConfigInfo.records, currentPage: _page @@ -174,7 +181,7 @@ $that.simplifyCarFeeInfo.carNum = _car.carNum; $that.simplifyCarFeeInfo.num = _car.num; $that.simplifyCarFeeInfo.parkingName = _car.areaNum + '停车场' + _car.num + '停车位'; - $that._listSimplifyCarFee(DEFAULT_PAGE,DEFAULT_ROWS); + $that._listSimplifyCarFee(DEFAULT_PAGE, DEFAULT_ROWS); }, clearSimplifyCarFeeInfo: function () { $that.simplifyCarFeeInfo = { @@ -188,7 +195,8 @@ records: 1, areaNum: '', num: '', - parkingName: '' + parkingName: '', + totalAmount: 0.0 } }, _simplifyCarGetFeeOwnerInfo: function (attrs) { @@ -196,7 +204,7 @@ let ownerName = $that._getAttrValue(attrs, '390008'); let ownerLink = $that._getAttrValue(attrs, '390009'); - return '业主:'+ownerName + ',电话:' + ownerLink; + return '业主:' + ownerName + ',电话:' + ownerLink; } diff --git a/public/components/property/simplifyRoomFee/simplifyRoomFee.html b/public/components/property/simplifyRoomFee/simplifyRoomFee.html index f4e1701fe..1ddf990a9 100755 --- a/public/components/property/simplifyRoomFee/simplifyRoomFee.html +++ b/public/components/property/simplifyRoomFee/simplifyRoomFee.html @@ -134,7 +134,10 @@
注意: 计费结束时间 “-” 表示未到计费时间 或 收费已结束
-
+
+ 欠费小计:{{simplifyRoomFeeInfo.totalAmount}} +
+
diff --git a/public/components/property/simplifyRoomFee/simplifyRoomFee.js b/public/components/property/simplifyRoomFee/simplifyRoomFee.js index c8b1a104a..db71cadc4 100755 --- a/public/components/property/simplifyRoomFee/simplifyRoomFee.js +++ b/public/components/property/simplifyRoomFee/simplifyRoomFee.js @@ -18,7 +18,8 @@ configId: '', feeTypeCds: [], feeTypeCd: '', - state: '2008001' + state: '2008001', + totalAmount:0.0 } }, _initMethod: function () { @@ -71,6 +72,12 @@ let _feeConfigInfo = JSON.parse(json); vc.component.simplifyRoomFeeInfo.total = _feeConfigInfo.total; vc.component.simplifyRoomFeeInfo.records = _feeConfigInfo.records; + let _totalAmount = 0.0; + _feeConfigInfo.fees.forEach(item => { + _totalAmount += parseFloat(item.amountOwed); + + }) + $that.simplifyRoomFeeInfo.totalAmount = _totalAmount; vc.component.simplifyRoomFeeInfo.fees = _feeConfigInfo.fees; vc.emit('simplifyRoomFee', 'paginationPlus', 'init', { total: _feeConfigInfo.records, @@ -183,7 +190,8 @@ feeConfigs: _feeConfigs, feeTypeCd: '', configId: '', - state: '2008001' + state: '2008001', + totalAmount: 0.0 } }, _changeSimplifyRoomFeeFeeTypeCd: function (_feeTypeCd) { diff --git a/public/pages/property/printPayFee/printPayFee.html b/public/pages/property/printPayFee/printPayFee.html index d30fb021e..3db5b50a2 100755 --- a/public/pages/property/printPayFee/printPayFee.html +++ b/public/pages/property/printPayFee/printPayFee.html @@ -34,7 +34,11 @@ {{index +1}} {{item.feeName}} {{item.objName}} - + + {{vc.dateFormat(item.startTime)}}至{{vc.dateSubOneDay(vc.dateFormat(item.startTime),vc.dateFormat(item.endTime),item.feeFlag)}} + {{item.preDegrees}} 至 {{item.curDegree}} + + {{vc.dateFormat(item.startTime)}}至{{vc.dateSubOneDay(vc.dateFormat(item.startTime),vc.dateFormat(item.endTime),item.feeFlag)}}