From 3490da0da3a43d8571834c504dc230ffca2c5bb3 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Fri, 26 Feb 2021 16:25:27 +0800 Subject: [PATCH] zjiaru zidingyigognshi --- .../property/addFeeConfig/addFeeConfig.html | 55 ++++--- .../property/addFeeConfig/addFeeConfig.js | 28 ++-- .../property/editFeeConfig/editFeeConfig.html | 68 ++++++--- .../property/editFeeConfig/editFeeConfig.js | 134 ++++++++++-------- .../feeConfigManage/feeConfigManage.html | 8 +- 5 files changed, 179 insertions(+), 114 deletions(-) diff --git a/public/components/property/addFeeConfig/addFeeConfig.html b/public/components/property/addFeeConfig/addFeeConfig.html index 51b234dc6..0c69b3fe8 100644 --- a/public/components/property/addFeeConfig/addFeeConfig.html +++ b/public/components/property/addFeeConfig/addFeeConfig.html @@ -1,5 +1,5 @@
+ class="form-control addFeeConfigEndTime" name="endTime">
@@ -86,33 +86,56 @@
-
+
+ class="form-control">
-
+
+ placeholder="必填，请填写附加费用" class="form-control"> +
+
+
+
+ +
+ +
+
+
+ +
+
C 代表房屋对应小区面积
+
F 代表房屋对应楼栋面积
+
U 代表房屋对应单元面积
+
R 代表房屋面积
+
X 代表房屋收费系数（房屋管理中配置）
+
L 代表房屋层数
+
举例：电梯使用费 (层数-5)*每层单价+基础费用
+
公式：(L-5)*5 + 10
+
diff --git a/public/components/property/addFeeConfig/addFeeConfig.js b/public/components/property/addFeeConfig/addFeeConfig.js index 4c31663cd..db2be3f19 100644 --- a/public/components/property/addFeeConfig/addFeeConfig.js +++ b/public/components/property/addFeeConfig/addFeeConfig.js @@ -23,7 +23,8 @@ billTypes: [], billType: '', paymentCycle: '', - paymentCd: '' + paymentCd: '', + computingFormulaText:'' } }, _initMethod: function () { @@ -230,21 +231,27 @@ }); }, saveFeeConfigInfo: function () { - //收费项目去空 - vc.component.addFeeConfigInfo.feeName = vc.component.addFeeConfigInfo.feeName.trim(); - //缴费周期去空 - vc.component.addFeeConfigInfo.paymentCycle = vc.component.addFeeConfigInfo.paymentCycle.trim(); - //计费单价去空 - vc.component.addFeeConfigInfo.squarePrice = vc.component.addFeeConfigInfo.squarePrice.trim(); - //附加费用去空 - vc.component.addFeeConfigInfo.additionalAmount = vc.component.addFeeConfigInfo.additionalAmount.trim(); + //固定费用 if (vc.component.addFeeConfigInfo.computingFormula == '2002') { vc.component.addFeeConfigInfo.squarePrice = "0.00"; } + //自定义费用 + if (vc.component.addFeeConfigInfo.computingFormula == '7007') { + vc.component.addFeeConfigInfo.squarePrice = "0.00"; + vc.component.addFeeConfigInfo.additionalAmount = "0.00"; + } if (vc.component.addFeeConfigInfo.feeFlag == '2006012') { vc.component.addFeeConfigInfo.paymentCycle = '1'; } + //收费项目去空 + vc.component.addFeeConfigInfo.feeName = vc.component.addFeeConfigInfo.feeName.trim(); + //缴费周期去空 + vc.component.addFeeConfigInfo.paymentCycle = vc.component.addFeeConfigInfo.paymentCycle.trim(); + //计费单价去空 + vc.component.addFeeConfigInfo.squarePrice = vc.component.addFeeConfigInfo.squarePrice.trim(); + //附加费用去空 + vc.component.addFeeConfigInfo.additionalAmount = vc.component.addFeeConfigInfo.additionalAmount.trim(); if (!vc.component.addFeeConfigValidate()) { vc.toast(vc.validate.errInfo); return; @@ -297,7 +304,8 @@ billTypes: _billTypes, billType: '', paymentCycle: '', - paymentCd: '' + paymentCd: '', + computingFormulaText:'' }; } } diff --git a/public/components/property/editFeeConfig/editFeeConfig.html b/public/components/property/editFeeConfig/editFeeConfig.html index 04ba3fc92..f001eb61e 100644 --- a/public/components/property/editFeeConfig/editFeeConfig.html +++ b/public/components/property/editFeeConfig/editFeeConfig.html @@ -1,5 +1,5 @@
-
+ \ No newline at end of file diff --git a/public/components/property/editFeeConfig/editFeeConfig.js b/public/components/property/editFeeConfig/editFeeConfig.js index 8832083a7..cc3bdea2c 100644 --- a/public/components/property/editFeeConfig/editFeeConfig.js +++ b/public/components/property/editFeeConfig/editFeeConfig.js @@ -19,7 +19,8 @@ paymentCds: [], billType: '', paymentCycle: '', - paymentCd: '' + paymentCd: '', + computingFormulaText: '' } }, _initMethod: function () { @@ -102,96 +103,96 @@ }, editFeeConfigValidate: function () { return vc.validate.validate({ - editFeeConfigInfo: vc.component.editFeeConfigInfo - }, + editFeeConfigInfo: vc.component.editFeeConfigInfo + }, { 'editFeeConfigInfo.feeTypeCd': [{ limit: "required", param: "", errInfo: "费用类型不能为空" }, - { - limit: "num", - param: "", - errInfo: "费用类型格式错误" - }, + { + limit: "num", + param: "", + errInfo: "费用类型格式错误" + }, ], 'editFeeConfigInfo.feeName': [{ limit: "required", param: "", errInfo: "收费项目不能为空" }, - { - limit: "maxin", - param: "1,100", - errInfo: "收费项目不能超过100位" - }, + { + limit: "maxin", + param: "1,100", + errInfo: "收费项目不能超过100位" + }, ], 'editFeeConfigInfo.feeFlag': [{ limit: "required", param: "", errInfo: "费用标识不能为空" }, - { - limit: "num", - param: "", - errInfo: "费用类型格式错误" - }, + { + limit: "num", + param: "", + errInfo: "费用类型格式错误" + }, ], 'editFeeConfigInfo.startTime': [{ limit: "required", param: "", errInfo: "计费起始时间不能为空" }, - { - limit: "dateTime", - param: "", - errInfo: "计费起始时间不是有效的时间格式" - }, + { + limit: "dateTime", + param: "", + errInfo: "计费起始时间不是有效的时间格式" + }, ], 'editFeeConfigInfo.endTime': [{ limit: "required", param: "", errInfo: "计费终止时间不能为空" }, - { - limit: "dateTime", - param: "", - errInfo: "计费终止时间不是有效的时间格式" - }, + { + limit: "dateTime", + param: "", + errInfo: "计费终止时间不是有效的时间格式" + }, ], 'editFeeConfigInfo.computingFormula': [{ limit: "required", param: "", errInfo: "计算公式不能为空" }, - { - limit: "num", - param: "", - errInfo: "计算公式格式错误" - }, + { + limit: "num", + param: "", + errInfo: "计算公式格式错误" + }, ], 'editFeeConfigInfo.squarePrice': [{ limit: "required", param: "", errInfo: "计费单价不能为空" }, - { - limit: "moneyModulus", - param: "", - errInfo: "计费单价格式错误，如1.5000" - }, + { + limit: "moneyModulus", + param: "", + errInfo: "计费单价格式错误，如1.5000" + }, ], 'editFeeConfigInfo.additionalAmount': [{ limit: "required", param: "", errInfo: "附加费用不能为空" }, - { - limit: "moneyModulus", - param: "", - errInfo: "附加费用格式错误" - }, + { + limit: "moneyModulus", + param: "", + errInfo: "附加费用格式错误" + }, ], 'editFeeConfigInfo.configId': [{ limit: "required", @@ -208,26 +209,39 @@ param: "", errInfo: "缴费周期不能为空" }, - { - limit: "num", - param: "", - errInfo: "缴费周期必须为数字 单位月" - }, + { + limit: "num", + param: "", + errInfo: "缴费周期必须为数字 单位月" + }, ], 'editFeeConfigInfo.paymentCd': [{ limit: "required", param: "", errInfo: "付费类型不能为空" }, - { - limit: "num", - param: "", - errInfo: "付费类型格式错误" - }, + { + limit: "num", + param: "", + errInfo: "付费类型格式错误" + }, ] }); }, editFeeConfig: function () { + + //固定费用 + if (vc.component.editFeeConfigInfo.computingFormula == '2002') { + vc.component.editFeeConfigInfo.squarePrice = "0.00"; + } + //自定义费用 + if (vc.component.editFeeConfigInfo.computingFormula == '7007') { + vc.component.editFeeConfigInfo.squarePrice = "0.00"; + vc.component.editFeeConfigInfo.additionalAmount = "0.00"; + } + if (vc.component.editFeeConfigInfo.feeFlag == '2006012') { + vc.component.editFeeConfigInfo.paymentCycle = '1'; + } //收费项目去空 vc.component.editFeeConfigInfo.feeName = vc.component.editFeeConfigInfo.feeName.trim(); //计费单价去空 @@ -236,20 +250,13 @@ vc.component.editFeeConfigInfo.additionalAmount = vc.component.editFeeConfigInfo.additionalAmount.trim(); //缴费周期去空 vc.component.editFeeConfigInfo.paymentCycle = vc.component.editFeeConfigInfo.paymentCycle.trim(); - //固定费用 - if (vc.component.editFeeConfigInfo.computingFormula == '2002') { - vc.component.editFeeConfigInfo.squarePrice = "0.00"; - } - if (vc.component.editFeeConfigInfo.feeFlag == '2006012') { - vc.component.editFeeConfigInfo.paymentCycle = '1'; - } if (!vc.component.editFeeConfigValidate()) { vc.toast(vc.validate.errInfo); return; } vc.http.post('editFeeConfig', 'update', JSON.stringify(vc.component.editFeeConfigInfo), { - emulateJSON: true - }, + emulateJSON: true + }, function (json, res) { //vm.menus = vm.refreshMenuActive(JSON.parse(json),0); if (res.status == 200) { @@ -284,7 +291,8 @@ isDefault: '', paymentCycle: '', paymentCd: '', - billType: '' + billType: '', + computingFormulaText: '' }; vc.component.editFeeConfigInfo.feeTypeCds = _feeTypeCds; vc.component.editFeeConfigInfo.computingFormulas = _computingFormulas; diff --git a/public/pages/property/feeConfigManage/feeConfigManage.html b/public/pages/property/feeConfigManage/feeConfigManage.html index 5a0ddcbe0..0f83aefa5 100644 --- a/public/pages/property/feeConfigManage/feeConfigManage.html +++ b/public/pages/property/feeConfigManage/feeConfigManage.html @@ -105,8 +105,8 @@ - - + @@ -122,8 +122,8 @@ - - +
费用项ID费用项 费用类型 收费项目 费用标识
{{feeConfig.configId}}{{feeConfig.isDefault=='T'?'默认费用':'自定义费用'}} {{feeConfig.feeTypeCdName}} {{feeConfig.feeName}} {{feeConfig.feeFlagName}}