diff --git a/public/components/car/carDetailOwner/carDetailOwner.html b/public/components/car/carDetailOwner/carDetailOwner.html index 2315efead..2971de7b9 100644 --- a/public/components/car/carDetailOwner/carDetailOwner.html +++ b/public/components/car/carDetailOwner/carDetailOwner.html @@ -70,39 +70,25 @@ {{owner.address || '-'}} - {{owner.roomCount || 0}} - - - {{owner.memberCount || 0}} - + {{owner.memberCount || 0}} - {{owner.carCount || 0}} - - {{owner.complaintCount || 0}} - - {{owner.repairCount || 0}} - - {{owner.oweFee || '0.00'}} - - {{owner.contractCount || 0}} -
@@ -125,12 +111,6 @@
- - - - - - - + \ No newline at end of file diff --git a/public/components/car/carDetailOwner/carDetailOwner.js b/public/components/car/carDetailOwner/carDetailOwner.js index 3f7789e49..d386dc491 100644 --- a/public/components/car/carDetailOwner/carDetailOwner.js +++ b/public/components/car/carDetailOwner/carDetailOwner.js @@ -61,28 +61,8 @@ _qureyCarDetailOwner: function () { $that._loadCarDetailOwnerData(DEFAULT_PAGE, DEFAULT_ROWS); }, - _viewOwnerRooms: function (_owner) { - vc.emit('ownerRooms', 'openOwnerRoomModel', _owner); - }, - _viewOwnerMembers: function (_owner) { - vc.emit('ownerMembers', 'openOwnerMemberModel', _owner); - }, - - _viewOwnerCars: function (_owner) { - vc.emit('ownerCars', 'openOwnerCarModel', _owner); - }, - _viewComplaints: function (_owner) { - vc.emit('ownerComplaints', 'openOwnerComplaintModel', _owner); - }, - _viewRepairs: function (_owner) { - vc.emit('ownerRepairs', 'openOwnerRepairModel', _owner); - }, - _viewOweFees: function (_owner) { - vc.emit('ownerOweFees', 'openOwnerOweFeeModel', _owner); - }, - _viewRoomContracts: function (_owner) { - vc.emit('roomContracts', 'openRoomContractModel', _owner); - }, + + _viewOwnerFace: function (_url) { vc.emit('viewImage', 'showImage', { url: _url diff --git a/public/components/fee/feeDetailFeeRule/feeDetailFeeRule.js b/public/components/fee/feeDetailFeeRule/feeDetailFeeRule.js index 1f0b0bf04..7555e7016 100644 --- a/public/components/fee/feeDetailFeeRule/feeDetailFeeRule.js +++ b/public/components/fee/feeDetailFeeRule/feeDetailFeeRule.js @@ -9,12 +9,14 @@ feeDetailFeeRuleInfo: { rules: [], feeId: '', + roomId:'', } }, _initMethod: function() {}, _initEvent: function() { vc.on('feeDetailFeeRule', 'switch', function(_data) { $that.feeDetailFeeRuleInfo.feeId = _data.feeId; + $that.feeDetailFeeRuleInfo.roomId = _data.roomId; $that._loadFeeDetailFeeRuleData(DEFAULT_PAGE, DEFAULT_ROWS); }); vc.on('feeDetailFeeRule', 'notify', @@ -32,6 +34,7 @@ params: { communityId: vc.getCurrentCommunity().communityId, feeId: $that.feeDetailFeeRuleInfo.feeId, + payerObjId: $that.feeDetailFeeRuleInfo.roomId, detailId: '-1', page: _page, row: _row diff --git a/public/components/fee/feeDetailRuleBill/feeDetailRuleBill.js b/public/components/fee/feeDetailRuleBill/feeDetailRuleBill.js index 47a1e0871..3368cf713 100644 --- a/public/components/fee/feeDetailRuleBill/feeDetailRuleBill.js +++ b/public/components/fee/feeDetailRuleBill/feeDetailRuleBill.js @@ -9,12 +9,15 @@ feeDetailRuleBillInfo: { bills: [], feeId: '', + roomId:'' } }, _initMethod: function() {}, _initEvent: function() { vc.on('feeDetailRuleBill', 'switch', function(_data) { $that.feeDetailRuleBillInfo.feeId = _data.feeId; + $that.feeDetailRuleBillInfo.roomId = _data.roomId; + $that._loadFeeDetailRuleBillData(DEFAULT_PAGE, DEFAULT_ROWS); }); vc.on('feeDetailRuleBill', 'notify', @@ -32,6 +35,7 @@ params: { communityId: vc.getCurrentCommunity().communityId, feeId: $that.feeDetailRuleBillInfo.feeId, + payerObjId: $that.feeDetailRuleBillInfo.roomId, page: _page, row: _row } diff --git a/public/components/fee/feeDetailSub/feeDetailSub.html b/public/components/fee/feeDetailSub/feeDetailSub.html index eac223189..2e4d7dd86 100644 --- a/public/components/fee/feeDetailSub/feeDetailSub.html +++ b/public/components/fee/feeDetailSub/feeDetailSub.html @@ -1,6 +1,12 @@
-
+
+
+ +
@@ -57,5 +63,7 @@ + + \ No newline at end of file diff --git a/public/components/fee/feeDetailSub/feeDetailSub.js b/public/components/fee/feeDetailSub/feeDetailSub.js index 385a7cd26..cfea0bdc6 100644 --- a/public/components/fee/feeDetailSub/feeDetailSub.js +++ b/public/components/fee/feeDetailSub/feeDetailSub.js @@ -11,6 +11,7 @@ feeId: '', total: '', records: '', + fee:{} } }, _initMethod: function() {}, @@ -22,9 +23,12 @@ } vc.copyObject(_param, $that.feeDetailSubInfo); $that._listFeeDetailSub(DEFAULT_PAGE, DEFAULT_ROWS); + $that._loadFeeDetailSubFeeInfo(); }); vc.on('feeDetailSub', 'loadSub', function() { $that._listFeeDetailSub(DEFAULT_PAGE, DEFAULT_ROWS); + $that._loadFeeDetailSubFeeInfo(); + }); vc.on('feeDetailSub', 'paginationPlus', 'page_event', function(_currentPage) { @@ -60,8 +64,33 @@ } ); }, + _loadFeeDetailSubFeeInfo: function () { + let param = { + params: { + page: 1, + row: 1, + feeId: $that.feeDetailSubInfo.feeId, + communityId: vc.getCurrentCommunity().communityId + } + }; + //发送get请求 + vc.http.apiGet('/fee.listFee', + param, + function (json) { + let _feeInfo = JSON.parse(json); + // 员工列表 和 岗位列表匹配 + $that.feeDetailSubInfo.fee = _feeInfo.fees[0]; + }, + function () { + console.log('请求失败处理'); + } + ); + }, _mergeFee:function(_fee){ vc.emit('mergeFee', 'openMergeFeeModal',_fee); + }, + _splitPayFee: function (_fee) { + vc.emit('splitFee', 'openSplitFeeModal', $that.feeDetailSubInfo.fee); } } }); diff --git a/public/components/fee/splitFee/splitFee.js b/public/components/fee/splitFee/splitFee.js index 66f4ca4db..136a26b74 100644 --- a/public/components/fee/splitFee/splitFee.js +++ b/public/components/fee/splitFee/splitFee.js @@ -10,9 +10,7 @@ } }, _initMethod: function () { - vc.initDate('splitFeeTime', function (_value) { - $that.splitFeeInfo.splitTime = _value; - }); + }, _initEvent: function () { vc.on('splitFee', 'openSplitFeeModal', @@ -23,6 +21,9 @@ $that.splitFeeInfo.splitTime = ''; $that.splitFeeInfo.remark = ''; $('#splitFeeModel').modal('show'); + vc.initDate('splitFeeTime', function (_value) { + $that.splitFeeInfo.splitTime = _value; + }); }); }, methods: { @@ -47,7 +48,7 @@ if (_json.code == 0) { //关闭model $('#splitFeeModel').modal('hide'); - vc.emit('roomCreateFee', 'notify', {}); + vc.emit('feeDetailSub', 'loadSub', {}); vc.emit('listParkingSpaceFee', 'notify', {}); vc.toast("操作成功"); diff --git a/public/pages/fee/feeDetail/feeDetail.html b/public/pages/fee/feeDetail/feeDetail.html index 7cfdc8627..10c39c0c0 100644 --- a/public/pages/fee/feeDetail/feeDetail.html +++ b/public/pages/fee/feeDetail/feeDetail.html @@ -188,7 +188,7 @@ -
  • +
  • diff --git a/public/pages/fee/feeDetail/feeDetail.js b/public/pages/fee/feeDetail/feeDetail.js index 1632a25ac..725de9947 100644 --- a/public/pages/fee/feeDetail/feeDetail.js +++ b/public/pages/fee/feeDetail/feeDetail.js @@ -77,6 +77,7 @@ feeId: $that.feeDetailInfo.feeId, payerObjId: $that.feeDetailInfo.payerObjId, configId:$that.feeDetailInfo.configId, + state:$that.feeDetailInfo.state, ownerId:_ownerId }); }, diff --git a/public/pages/property/roomCreateFee/roomCreateFee.html b/public/pages/property/roomCreateFee/roomCreateFee.html index f2498101d..0512759eb 100644 --- a/public/pages/property/roomCreateFee/roomCreateFee.html +++ b/public/pages/property/roomCreateFee/roomCreateFee.html @@ -142,6 +142,20 @@
    • +
  • + + + +
    • +
  • + + + +
    • @@ -175,6 +189,13 @@
    +
    + +
    +
    + +
    + @@ -182,7 +203,6 @@ -