diff --git a/public/components/property/inputSearchRoomByOwner/inputSearchRoomByOwner.html b/public/components/property/inputSearchRoomByOwner/inputSearchRoomByOwner.html new file mode 100644 index 000000000..cf78953ef --- /dev/null +++ b/public/components/property/inputSearchRoomByOwner/inputSearchRoomByOwner.html @@ -0,0 +1,5 @@ +
+
+ {{item.floorNum}}-{{item.unitNum}}-{{item.roomNum}}({{item.ownerName}}) +
+
\ No newline at end of file diff --git a/public/components/property/inputSearchRoomByOwner/inputSearchRoomByOwner.js b/public/components/property/inputSearchRoomByOwner/inputSearchRoomByOwner.js new file mode 100644 index 000000000..47183e4f9 --- /dev/null +++ b/public/components/property/inputSearchRoomByOwner/inputSearchRoomByOwner.js @@ -0,0 +1,51 @@ +(function(vc, vm) { + + vc.extends({ + data: { + inputSearchRoomByOwnerInfo: { + rooms: [], + callComponent: '' + } + }, + _initMethod: function() { + + }, + _initEvent: function() { + vc.on('inputSearchRoomByOwner', 'searchRoom', function(_param) { + if (!_param.ownerName) { + return; + } + $that._loadRoomByOwnerInfo(_param.ownerName); + $that.inputSearchRoomByOwnerInfo.callComponent = _param.callComponent; + }); + }, + methods: { + _loadRoomByOwnerInfo: function(_ownerName) { + let param = { + params: { + page: 1, + row: 10, + ownerNameLike: _ownerName, + communityId: vc.getCurrentCommunity().communityId + } + } + vc.http.apiGet('/room.queryRoomsByOwner', + param, + function(json, res) { + let listRoomData = JSON.parse(json); + $that.inputSearchRoomByOwnerInfo.rooms = listRoomData.rooms; + }, + function(errInfo, error) { + console.log('请求失败处理'); + } + ); + }, + _inputSearchRoomChooseRoomByOwner: function(_room) { + vc.emit($that.inputSearchRoomByOwnerInfo.callComponent, "notifyRoomByOwner", _room); + $that.inputSearchRoomByOwnerInfo.rooms = []; + } + + } + }); + +})(window.vc, window.vc.component); \ No newline at end of file diff --git a/public/pages/property/roomCreateFee/roomCreateFee.html b/public/pages/property/roomCreateFee/roomCreateFee.html index 03e13cf53..f6bda3153 100755 --- a/public/pages/property/roomCreateFee/roomCreateFee.html +++ b/public/pages/property/roomCreateFee/roomCreateFee.html @@ -18,6 +18,49 @@
+
+
+
+
+
+ + + +
+
+
+
+
+
+
+
+ + +
+
+
+ +
+
+ + +
+
+ +
+
+
+
+
+
diff --git a/public/pages/property/roomCreateFee/roomCreateFee.js b/public/pages/property/roomCreateFee/roomCreateFee.js index 97b93c86c..4bb063251 100755 --- a/public/pages/property/roomCreateFee/roomCreateFee.js +++ b/public/pages/property/roomCreateFee/roomCreateFee.js @@ -22,7 +22,13 @@ ownerName: '', roomType: '', hireOwnerFee: '0', - urlOwnerId: '' + urlOwnerId: '', + conditions: { + state: '2008001', + roomNum: '', + roomId: '', + ownerName: '' + } }, currentPage: 1, }, @@ -34,9 +40,24 @@ _initEvent: function() { vc.on('roomCreateFee', 'selectRoom', function(_param) { vc.component.roomCreateFeeInfo.roomId = _param.roomId; + $that.roomCreateFeeInfo.conditions.roomId = _param.roomId; + $that.roomCreateFeeInfo.conditions.roomNum = '' vc.component.roomCreateFeeInfo.roomName = _param.roomName; vc.component._loadListRoomCreateFeeInfo(DEFAULT_PAGE, DEFAULT_ROW); }); + vc.on('roomCreateFee', 'notifyRoom', function(_room) { + $that.roomCreateFeeInfo.conditions.roomId = _room.roomId; + $that.roomCreateFeeInfo.conditions.roomNum = _room.floorNum + "-" + _room.unitNum + "-" + _room.roomNum; + $that.roomCreateFeeInfo.roomName = $that.roomCreateFeeInfo.conditions.roomNum; + vc.component._loadListRoomCreateFeeInfo(DEFAULT_PAGE, DEFAULT_ROW); + }); + vc.on('roomCreateFee', 'notifyRoomByOwner', function(_room) { + $that.roomCreateFeeInfo.conditions.roomId = _room.roomId; + $that.roomCreateFeeInfo.conditions.ownerName = _room.ownerName; + $that.roomCreateFeeInfo.roomName = _room.floorNum + "-" + _room.unitNum + "-" + _room.roomNum; + vc.component._loadListRoomCreateFeeInfo(DEFAULT_PAGE, DEFAULT_ROW); + }); + vc.on('pagination', 'page_event', function(_currentPage) { $that.updateCurrentPage(_currentPage); vc.component.listRoom(_currentPage, DEFAULT_ROW); @@ -127,12 +148,14 @@ return fee.squarePrice; }, _loadListRoomCreateFeeInfo: function(_page, _row) { - var param = { + + let param = { params: { page: _page, row: _row, communityId: vc.getCurrentCommunity().communityId, - payerObjId: vc.component.roomCreateFeeInfo.roomId + payerObjId: $that.roomCreateFeeInfo.conditions.roomId, + state: $that.roomCreateFeeInfo.conditions.state // ownerId: $that.roomCreateFeeInfo.urlOwnerId } }; @@ -234,6 +257,31 @@ ownerName: $that.roomCreateFeeInfo.ownerName }); }, + _inputRoom: function() { + if ($that.roomCreateFeeInfo.timer) { + clearTimeout($that.roomCreateFeeInfo.timer) + } + $that.roomCreateFeeInfo.timer = setTimeout(() => { + vc.emit('inputSearchRoomInfo', 'searchRoom', { + callComponent: 'roomCreateFee', + roomName: $that.roomCreateFeeInfo.conditions.roomNum + }); + }, 1500) + }, + _inputRoomByOwner: function() { + if ($that.roomCreateFeeInfo.timer) { + clearTimeout($that.roomCreateFeeInfo.timer) + } + $that.roomCreateFeeInfo.timer = setTimeout(() => { + vc.emit('inputSearchRoomByOwner', 'searchRoom', { + callComponent: 'roomCreateFee', + ownerName: $that.roomCreateFeeInfo.conditions.ownerName + }); + }, 1500) + }, + _queryRoomCreateFeeMethod: function() { + vc.component._loadListRoomCreateFeeInfo(DEFAULT_PAGE, DEFAULT_ROW); + } } }); })(window.vc); \ No newline at end of file diff --git a/public/pages/property/roomCreateFee1/roomCreateFee.html b/public/pages/property/roomCreateFee1/roomCreateFee.html index 7a081c888..56b3abe9a 100644 --- a/public/pages/property/roomCreateFee1/roomCreateFee.html +++ b/public/pages/property/roomCreateFee1/roomCreateFee.html @@ -129,31 +129,26 @@ {{room.link}} - - - {{room.idCard}} - - - {{room.roomId}} - - -
- -
- -
- -
-
- -
- + + + {{room.idCard}} + + + {{room.roomId}} + + +
+ +
+
+ +
+
+ +
+