diff --git a/public/components/admin/addContract/addContract.js b/public/components/admin/addContract/addContract.js
index ce2563312..dcbf9d649 100644
--- a/public/components/admin/addContract/addContract.js
+++ b/public/components/admin/addContract/addContract.js
@@ -29,8 +29,8 @@
roomId: '',
ownerName: '',
link: '',
- objType:'1111',
- objId:'-1'
+ objType: '1111',
+ objId: '-1'
}
},
_initMethod: function () {
@@ -50,7 +50,7 @@
},
_initEvent: function () {
vc.on('addContract', 'openAddContractModal', function (_param) {
- vc.copyObject(_param,$that.addContractInfo);
+ vc.copyObject(_param, $that.addContractInfo);
$('#addContractModel').modal('show');
});
$('#addContractModel').on('show.bs.modal', function (e) {
@@ -271,7 +271,7 @@
$('#addContractModel').modal('hide');
vc.component.clearAddContractInfo();
vc.emit('contractManage', 'listContract', {});
-
+ vc.emit('rentingPoolManage', 'listRentingPool', {});
return;
}
vc.message(_json.msg);
@@ -308,8 +308,8 @@
roomId: '',
ownerName: '',
link: '',
- objId:'-1',
- objType:'1111'
+ objId: '-1',
+ objType: '1111'
};
},
_loadAddContractType: function () {
diff --git a/public/pages/admin/rentingHistoryManage/rentingHistoryManage.html b/public/pages/admin/rentingHistoryManage/rentingHistoryManage.html
new file mode 100644
index 000000000..fe46b6c50
--- /dev/null
+++ b/public/pages/admin/rentingHistoryManage/rentingHistoryManage.html
@@ -0,0 +1,108 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/public/pages/admin/rentingHistoryManage/rentingHistoryManage.js b/public/pages/admin/rentingHistoryManage/rentingHistoryManage.js
new file mode 100644
index 000000000..595b90f8f
--- /dev/null
+++ b/public/pages/admin/rentingHistoryManage/rentingHistoryManage.js
@@ -0,0 +1,79 @@
+/**
+ 入驻小区
+**/
+(function (vc) {
+ var DEFAULT_PAGE = 1;
+ var DEFAULT_ROWS = 10;
+ vc.extends({
+ data: {
+ rentingPoolManageInfo: {
+ rentingPools: [],
+ total: 0,
+ records: 1,
+ moreCondition: false,
+ rentingId: '',
+ conditions: {
+ rentingTitle: '',
+ paymentType: '',
+ ownerName: '',
+ state: '6'
+ }
+ }
+ },
+ _initMethod: function () {
+ vc.component._listRentingPools(DEFAULT_PAGE, DEFAULT_ROWS);
+ },
+ _initEvent: function () {
+
+ vc.on('rentingPoolManage', 'listRentingPool', function (_param) {
+ vc.component._listRentingPools(DEFAULT_PAGE, DEFAULT_ROWS);
+ });
+
+ vc.on('pagination', 'page_event', function (_currentPage) {
+ vc.component._listRentingPools(_currentPage, DEFAULT_ROWS);
+ });
+ },
+ methods: {
+ _listRentingPools: function (_page, _rows) {
+
+ vc.component.rentingPoolManageInfo.conditions.page = _page;
+ vc.component.rentingPoolManageInfo.conditions.row = _rows;
+ vc.component.rentingPoolManageInfo.conditions.communityId = vc.getCurrentCommunity().communityId;
+ var param = {
+ params: vc.component.rentingPoolManageInfo.conditions
+ };
+
+ //发送get请求
+ vc.http.apiGet('/renting/queryRentingPool',
+ param,
+ function (json, res) {
+ var _rentingPoolManageInfo = JSON.parse(json);
+ vc.component.rentingPoolManageInfo.total = _rentingPoolManageInfo.total;
+ vc.component.rentingPoolManageInfo.records = _rentingPoolManageInfo.records;
+ vc.component.rentingPoolManageInfo.rentingPools = _rentingPoolManageInfo.data;
+ vc.emit('pagination', 'init', {
+ total: vc.component.rentingPoolManageInfo.records,
+ currentPage: _page
+ });
+ }, function (errInfo, error) {
+ console.log('请求失败处理');
+ }
+ );
+ },
+ _queryRentingPoolMethod: function () {
+ vc.component._listRentingPools(DEFAULT_PAGE, DEFAULT_ROWS);
+
+ },
+ _moreCondition: function () {
+ if (vc.component.rentingPoolManageInfo.moreCondition) {
+ vc.component.rentingPoolManageInfo.moreCondition = false;
+ } else {
+ vc.component.rentingPoolManageInfo.moreCondition = true;
+ }
+ },
+ _toRentingHistory:function(rentingPool){
+
+ }
+ }
+ });
+})(window.vc);
diff --git a/public/pages/admin/rentingPoolManage/rentingPoolManage.js b/public/pages/admin/rentingPoolManage/rentingPoolManage.js
index 850d095db..e92530008 100644
--- a/public/pages/admin/rentingPoolManage/rentingPoolManage.js
+++ b/public/pages/admin/rentingPoolManage/rentingPoolManage.js
@@ -122,6 +122,7 @@
ownerName: _rentingPool.ownerName,
link: _rentingPool.ownerTel,
objId: _rentingPool.roomId,
+ objType: '3333',
allNum: _rentingPool.roomName,
partyB:_flow.useName,
bContacts:_flow.useName,