+
diff --git a/public/components/property/simplifyContract/simplifyContract.js b/public/components/property/simplifyContract/simplifyContract.js
index 48f4f0308..c4b2f73da 100644
--- a/public/components/property/simplifyContract/simplifyContract.js
+++ b/public/components/property/simplifyContract/simplifyContract.js
@@ -7,8 +7,8 @@
vc.extends({
data: {
contractInfo: {
- roomId: '',
- roomName: '',
+ ownerId: '',
+ ownerName: '',
contracts: [],
total: 0,
records: 1,
@@ -32,7 +32,7 @@
return;
}
$that.clearContractInfoInfo();
- vc.copyObject(_param, $that.simplifyRoomFeeInfo);
+ vc.copyObject(_param, $that.contractInfo);
$that.contractInfo.conditions.objId = _param.ownerId;
$that._listContractInfo(DEFAULT_PAGE, DEFAULT_ROWS);
});
@@ -83,8 +83,8 @@
},
clearContractInfoInfo: function () {
$that.contractInfo = {
- roomId: '',
- roomName: '',
+ ownerId: '',
+ ownerName: '',
contracts: [],
total: 0,
records: 1,
diff --git a/public/components/property/tempImportRoomFee/tempImportRoomFee.js b/public/components/property/tempImportRoomFee/tempImportRoomFee.js
index a50cf6e0d..1f70684bc 100755
--- a/public/components/property/tempImportRoomFee/tempImportRoomFee.js
+++ b/public/components/property/tempImportRoomFee/tempImportRoomFee.js
@@ -5,6 +5,7 @@
tempImportRoomFeeInfo: {
communityId: vc.getCurrentCommunity().communityId,
feeTypeCd: '',
+ objType: '',
feeTypeCds: [],
feeName: '',
objName: '',
@@ -37,6 +38,7 @@
$that.clearTempImportRoomFeeInfo();
$that.tempImportRoomFeeInfo.objId = _room.roomId;
$that.tempImportRoomFeeInfo.objName = _room.roomName;
+ $that.tempImportRoomFeeInfo.objType = _room.objType;
$('#tempImportRoomFeeModel').modal('show');
});
@@ -135,7 +137,7 @@
vc.component.tempImportRoomFeeInfo.communityId = vc.getCurrentCommunity().communityId;
vc.http.post(
- 'importRoomFee','importTempData',
+ 'importRoomFee', 'importTempData',
JSON.stringify(vc.component.tempImportRoomFeeInfo),
{
emulateJSON: true
@@ -148,6 +150,7 @@
$('#tempImportRoomFeeModel').modal('hide');
vc.emit('listRoomFee', 'notify', {});
vc.emit('simplifyRoomFee', 'notify', {});
+ vc.emit('listContractFee', 'notify', {});
}
vc.message(_json.msg);
},
diff --git a/public/pages/property/listContractFee/listContractFee.html b/public/pages/property/listContractFee/listContractFee.html
index a8fdc7617..e519e5c0d 100755
--- a/public/pages/property/listContractFee/listContractFee.html
+++ b/public/pages/property/listContractFee/listContractFee.html
@@ -6,86 +6,89 @@
{{listContractFeeInfo.contractName}}费用
+
\ No newline at end of file
diff --git a/public/pages/property/listContractFee/listContractFee.js b/public/pages/property/listContractFee/listContractFee.js
index 8bc9e1b12..5b808d3a6 100755
--- a/public/pages/property/listContractFee/listContractFee.js
+++ b/public/pages/property/listContractFee/listContractFee.js
@@ -27,7 +27,7 @@
if (vc.notNull(vc.getParam('ownerId'))) {
$that.listContractFeeInfo.urlOwnerId = vc.getParam("ownerId");
}
-
+
vc.component._loadListContractFeeInfo(DEFAULT_PAGE, DEFAULT_ROWS);
},
_initEvent: function () {
@@ -68,6 +68,14 @@
}
);
},
+ _openTempImportContractFeeModal: function () {
+ vc.emit('tempImportRoomFee', 'openImportRoomFeeModal', {
+ roomId: $that.listContractFeeInfo.contractId,
+ objType: '7777',
+ roomName: $that.listContractFeeInfo.contractName,
+ ownerName: $that.listContractFeeInfo.ownerName
+ })
+ },
_payFee: function (_fee) {
_fee.contractName = $that.listContractFeeInfo.contractName;
_fee.payerObjName = $that.listContractFeeInfo.contractName;
@@ -151,7 +159,7 @@
return;
}
vc.copyObject(listRoomData.data[0], $that.listContractFeeInfo);
-
+
}, function (errInfo, error) {
console.log('请求失败处理');
}