From 13bb94ec3f5969a77ec23c78f49ba92813d86b5d Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Wed, 28 Apr 2021 18:33:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simplifyContract/simplifyContract.html | 3 +- .../simplifyContract/simplifyContract.js | 10 +- .../tempImportRoomFee/tempImportRoomFee.js | 5 +- .../listContractFee/listContractFee.html | 124 +++++++++--------- .../listContractFee/listContractFee.js | 12 +- 5 files changed, 85 insertions(+), 69 deletions(-) diff --git a/public/components/property/simplifyContract/simplifyContract.html b/public/components/property/simplifyContract/simplifyContract.html index ae8a016a5..0dda2ef26 100644 --- a/public/components/property/simplifyContract/simplifyContract.html +++ b/public/components/property/simplifyContract/simplifyContract.html @@ -3,7 +3,8 @@
-
+
+ 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}}费用
+
+ data-page-size="10"> - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + - + + +
费用项目费用标识费用类型应收金额建账时间计费起始时间计费结束时间说明状态操作
费用项目费用标识费用类型应收金额建账时间计费起始时间计费结束时间说明状态操作
{{fee.feeName}}{{fee.feeFlagName}}{{fee.feeTypeCdName}}{{fee.amountOwed}}{{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}}
- 		{{fee.stateName}} - {{fee.feeName}}{{fee.feeFlagName}}{{fee.feeTypeCdName}}{{fee.amountOwed}}{{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}}
+ 		{{fee.stateName}} + - - + - -
@@ -104,4 +107,5 @@ +
\ 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('请求失败处理'); }