diff --git a/public/pages/property/payFeeManage/payFeeManage.html b/public/pages/property/payFeeManage/payFeeManage.html index f78c798af..41a114736 100644 --- a/public/pages/property/payFeeManage/payFeeManage.html +++ b/public/pages/property/payFeeManage/payFeeManage.html @@ -1,4 +1,4 @@ -
+
@@ -6,7 +6,7 @@
查询条件
@@ -14,17 +14,20 @@
- +
- +
@@ -35,7 +38,8 @@
- +
@@ -56,54 +60,59 @@
- +
- - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - + + +
费用类型费用项目付费方缴费ID付费周期应付金额实付金额操作员工缴费时间详情
费用类型费用项目付费方缴费ID付费周期应付金额实付金额操作员工缴费时间详情
{{payFee.feeTypeCdName}}{{payFee.feeName}}{{payFee.payObjName}}{{payFee.detailId}}{{payFee.cycles}}个月{{payFee.receivableAmount}}{{payFee.receivedAmount}}{{payFee.userName}}{{payFee.createTime}} - - -
{{payFee.feeTypeCdName}}{{payFee.feeName}}{{payFee.payObjName}}{{payFee.detailId}}{{payFee.cycles}}个月{{payFee.receivableAmount}}{{payFee.receivedAmount}}{{payFee.userName}}{{payFee.createTime}} + + +
-
    -
    +
      +
      - +
      +
      + 应收: {{payFeeManageInfo.totalReceivableAmount}}元 + 实收: {{payFeeManageInfo.totalReceivedAmount}}元 +
      +
      + +
      +
      - + \ No newline at end of file diff --git a/public/pages/property/payFeeManage/payFeeManage.js b/public/pages/property/payFeeManage/payFeeManage.js index 2f0e4290e..3c5856cc1 100644 --- a/public/pages/property/payFeeManage/payFeeManage.js +++ b/public/pages/property/payFeeManage/payFeeManage.js @@ -8,9 +8,11 @@ data: { payFeeManageInfo: { payFees: [], - payObjTypes:[], + payObjTypes: [], total: 0, records: 1, + totalReceivableAmount: 0, + totalReceivedAmount: 0, moreCondition: false, name: '', conditions: { @@ -18,7 +20,7 @@ payObjType: '3333', startTime: '', endTime: '', - userCode:'' + userCode: '' } } }, @@ -26,7 +28,7 @@ vc.component._initDate(); vc.component._listpayFees(DEFAULT_PAGE, DEFAULT_ROWS); //vc.component._listFeeType(); - vc.getDict('pay_fee',"payer_obj_type",function(_data){ + vc.getDict('pay_fee', "payer_obj_type", function (_data) { vc.component.payFeeManageInfo.payObjTypes = _data; }); }, @@ -36,7 +38,7 @@ }); }, methods: { - _initDate:function(){ + _initDate: function () { $(".start_time").datetimepicker({ language: 'zh-CN', fontAwesome: 'fa', @@ -58,12 +60,12 @@ $('.start_time').datetimepicker() .on('changeDate', function (ev) { var value = $(".start_time").val(); - vc.component.payFeeManageInfo.conditions.startTime = value ; + vc.component.payFeeManageInfo.conditions.startTime = value; }); $('.end_time').datetimepicker() .on('changeDate', function (ev) { var value = $(".end_time").val(); - vc.component.payFeeManageInfo.conditions.endTime = value ; + vc.component.payFeeManageInfo.conditions.endTime = value; }); }, _listpayFees: function (_page, _rows) { @@ -81,11 +83,14 @@ function (json, res) { var _payFeeManageInfo = JSON.parse(json); vc.component.payFeeManageInfo.total = _payFeeManageInfo.total; - vc.component.payFeeManageInfo.records = parseInt(_payFeeManageInfo.total/_rows +1); + vc.component.payFeeManageInfo.totalReceivedAmount = _payFeeManageInfo.totalReceivedAmount; + vc.component.payFeeManageInfo.totalReceivableAmount = _payFeeManageInfo.totalReceivableAmount; + vc.component.payFeeManageInfo.records = parseInt(_payFeeManageInfo.total / _rows + 1); vc.component.payFeeManageInfo.payFees = _payFeeManageInfo.payFees; vc.emit('pagination', 'init', { total: vc.component.payFeeManageInfo.records, - currentPage: _page + currentPage: _page, + dataCount: vc.component.payFeeManageInfo.total }); }, function (errInfo, error) { console.log('请求失败处理'); @@ -103,13 +108,13 @@ vc.component.payFeeManageInfo.moreCondition = true; } }, - _exportExcel:function () { + _exportExcel: function () { }, _listFeeType: function () { var param = { - params:{ - "hc":"cc@cc" + params: { + "hc": "cc@cc" } }; @@ -126,8 +131,8 @@ } ); }, - _detailFee:function(_fee){ - vc.jumpToPage('/admin.html#/pages/property/propertyFee?'+vc.objToGetParam(_fee)); + _detailFee: function (_fee) { + vc.jumpToPage('/admin.html#/pages/property/propertyFee?' + vc.objToGetParam(_fee)); } } }); diff --git a/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html b/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html index cf17521ff..500173f32 100644 --- a/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html +++ b/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html @@ -125,7 +125,15 @@ - +
      +
      + 应收: {{reportPayFeeDetailInfo.totalReceivableAmount}}元 + 实收: {{reportPayFeeDetailInfo.totalReceivedAmount}}元 +
      +
      + +
      +
      diff --git a/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.js b/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.js index ec15037cf..7863cad79 100644 --- a/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.js +++ b/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.js @@ -13,6 +13,8 @@ moreCondition: false, title: '', roomUnits: [], + totalReceivableAmount: 0, + totalReceivedAmount: 0, conditions: { floorId: '', floorName: '', @@ -73,9 +75,12 @@ vc.component.reportPayFeeDetailInfo.total = _reportPayFeeDetailInfo.total; vc.component.reportPayFeeDetailInfo.records = _reportPayFeeDetailInfo.records; vc.component.reportPayFeeDetailInfo.fees = _reportPayFeeDetailInfo.data; + vc.component.reportPayFeeDetailInfo.totalReceivedAmount = _reportPayFeeDetailInfo.totalReceivedAmount; + vc.component.reportPayFeeDetailInfo.totalReceivableAmount = _reportPayFeeDetailInfo.totalReceivableAmount; vc.emit('pagination', 'init', { total: vc.component.reportPayFeeDetailInfo.records, - currentPage: _page + currentPage: _page, + dataCount: vc.component.reportPayFeeDetailInfo.total }); }, function (errInfo, error) { console.log('请求失败处理');