diff --git a/public/components/property/simplifyCarFee/simplifyCarFee.html b/public/components/property/simplifyCarFee/simplifyCarFee.html index bfd66f411..20c82abfc 100644 --- a/public/components/property/simplifyCarFee/simplifyCarFee.html +++ b/public/components/property/simplifyCarFee/simplifyCarFee.html @@ -45,17 +45,17 @@ {{fee.startTime}} {{_getEndTime(fee)}} {{_getDeadlineTime(fee)}} - +
上期度数:{{fee.preDegrees}}
本期度数:{{fee.curDegrees}}
单价:{{fee.squarePrice}}
附加费:{{fee.additionalAmount}}
- +
算法:{{_getAttrValue(fee.feeAttrs,'390005')}}
用量:{{_getAttrValue(fee.feeAttrs,'390003')}}
- +
单价:{{fee.squarePrice}}
固定费:{{fee.additionalAmount}}
diff --git a/public/components/property/simplifyCarFee/simplifyCarFee.js b/public/components/property/simplifyCarFee/simplifyCarFee.js index 13bf0842e..d61157dae 100644 --- a/public/components/property/simplifyCarFee/simplifyCarFee.js +++ b/public/components/property/simplifyCarFee/simplifyCarFee.js @@ -190,8 +190,16 @@ num: '', parkingName: '' } + }, + _simplifyCarGetFeeOwnerInfo: function (attrs) { + + let ownerName = $that._getAttrValue(attrs, '390008'); + let ownerLink = $that._getAttrValue(attrs, '390009'); + + return '业主:'+ownerName + ',电话:' + ownerLink; } + } }); diff --git a/public/components/property/simplifyRoomFee/simplifyRoomFee.html b/public/components/property/simplifyRoomFee/simplifyRoomFee.html index 217a6a7db..e34c588b1 100644 --- a/public/components/property/simplifyRoomFee/simplifyRoomFee.html +++ b/public/components/property/simplifyRoomFee/simplifyRoomFee.html @@ -71,22 +71,22 @@ {{fee.startTime}} {{_getEndTime(fee)}} {{_getDeadlineTime(fee)}} - +
上期度数:{{fee.preDegrees}}
本期度数:{{fee.curDegrees}}
单价:{{fee.squarePrice}}
附加费:{{fee.additionalAmount}}
- +
用量:{{_getAttrValue(fee.feeAttrs,'390006')}}
单价:{{fee.squarePrice}}
附加费:{{fee.additionalAmount}}
- +
算法:{{_getAttrValue(fee.feeAttrs,'390005')}}
用量:{{_getAttrValue(fee.feeAttrs,'390003')}}
- +
单价:{{fee.squarePrice}}
附加费:{{fee.additionalAmount}}
固定费:{{fee.additionalAmount}}
diff --git a/public/components/property/simplifyRoomFee/simplifyRoomFee.js b/public/components/property/simplifyRoomFee/simplifyRoomFee.js index 54705691b..3772dd707 100644 --- a/public/components/property/simplifyRoomFee/simplifyRoomFee.js +++ b/public/components/property/simplifyRoomFee/simplifyRoomFee.js @@ -120,7 +120,7 @@ if (_fee.state == '2009001') { return "-"; } - return vc.dateSub(_fee.deadlineTime,_fee.feeFlag); + return vc.dateSub(_fee.deadlineTime, _fee.feeFlag); }, _getEndTime: function (_fee) { if (_fee.state == '2009001') { @@ -197,6 +197,13 @@ }, _changeSimplifyRoomConfigId: function () { vc.emit('simplifyRoomFee', 'notify', {}); + }, + _simplifyRoomGetFeeOwnerInfo: function (attrs) { + + let ownerName = $that._getAttrValue(attrs, '390008'); + let ownerLink = $that._getAttrValue(attrs, '390009'); + + return '业主:'+ownerName + ',电话:' + ownerLink; } diff --git a/public/components/property/simplifyShopsHireLog/simplifyShopsHireLog.html b/public/components/property/simplifyShopsHireLog/simplifyShopsHireLog.html new file mode 100644 index 000000000..3f43b9262 --- /dev/null +++ b/public/components/property/simplifyShopsHireLog/simplifyShopsHireLog.html @@ -0,0 +1,38 @@ +
+
+ + + + + + + + + + + + + + + + + + + + + +
租客名称租客电话起租时间截租时间创建时间操作
{{owner.name}}{{owner.link}}{{owner.startTime}}{{owner.endTime}}{{owner.createTime}} +
+ +
+
+
+
+ +
+
+
+ +
\ No newline at end of file diff --git a/public/components/property/simplifyShopsHireLog/simplifyShopsHireLog.js b/public/components/property/simplifyShopsHireLog/simplifyShopsHireLog.js new file mode 100644 index 000000000..2651c2f65 --- /dev/null +++ b/public/components/property/simplifyShopsHireLog/simplifyShopsHireLog.js @@ -0,0 +1,77 @@ +(function (vc) { + var DEFAULT_PAGE = 1; + var DEFAULT_ROWS = 10; + vc.extends({ + data: { + simplifyShopsHireLogInfo: { + owners: [], + ownerId: '', + roomId: '' + } + }, + _initMethod: function () { + + }, + _initEvent: function () { + //切换 至费用页面 + vc.on('simplifyShopsHireLog', 'switch', function (_param) { + if(_param.roomId == ''){ + return + } + $that.clearSimplifyShopsHireLogInfo(); + vc.copyObject(_param, $that.simplifyShopsHireLogInfo) + $that._listSimplifyShopsHireLog(DEFAULT_PAGE, DEFAULT_ROWS); + }); + vc.on('simplifyShopsHireLog', 'listMachineTranslate', function () { + $that._listSimplifyShopsHireLog(DEFAULT_PAGE, DEFAULT_ROWS); + }); + vc.on('simplifyShopsHireLog','paginationPlus', 'page_event', + function (_currentPage) { + $that._listSimplifyShopsHireLog(_currentPage, DEFAULT_ROWS); + }); + }, + methods: { + _listSimplifyShopsHireLog: function (_page, _row) { + + let param = { + params: { + page: _page, + row: _row, + communityId: vc.getCurrentCommunity().communityId, + roomId: $that.simplifyShopsHireLogInfo.roomId + } + } + + //发送get请求 + vc.http.apiGet('/ownerApi/queryShopsHireLog', + param, + function (json, res) { + var _ownerManageInfo = JSON.parse(json); + vc.component.simplifyShopsHireLogInfo.total = _ownerManageInfo.total; + vc.component.simplifyShopsHireLogInfo.records = _ownerManageInfo.records; + vc.component.simplifyShopsHireLogInfo.owners = _ownerManageInfo.data; + vc.emit('simplifyShopsHireLog','paginationPlus', 'init', { + total: vc.component.simplifyShopsHireLogInfo.records, + currentPage: _page + }); + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); + + }, + _openOwnerFee: function (_owner) { + vc.emit('editMachineTranslate', 'openEditMachineTranslateModal', _owner); + }, + clearSimplifyShopsHireLogInfo: function () { + $that.simplifyShopsHireLogInfo = { + owners: [], + ownerId: '', + roomId: '' + } + } + + } + + }); +})(window.vc); diff --git a/public/pages/property/simplifyAcceptance/simplifyAcceptance.html b/public/pages/property/simplifyAcceptance/simplifyAcceptance.html index 090aaed0b..6f1a05cef 100644 --- a/public/pages/property/simplifyAcceptance/simplifyAcceptance.html +++ b/public/pages/property/simplifyAcceptance/simplifyAcceptance.html @@ -179,6 +179,10 @@ 补打收据 + @@ -209,7 +213,9 @@
- +
+ +