From 9bebb1b93e672edd189fe0c64ee931740c45bbf3 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Fri, 4 Sep 2020 17:05:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=B9=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/property/editFee/editFee.html | 38 +++++
public/components/property/editFee/editFee.js | 133 ++++++++++++++++++
.../property/listRoomFee/listRoomFee.html | 19 ++-
.../pages/property/listRoomFee/listRoomFee.js | 3 +
4 files changed, 187 insertions(+), 6 deletions(-)
create mode 100644 public/components/property/editFee/editFee.html
create mode 100644 public/components/property/editFee/editFee.js
diff --git a/public/components/property/editFee/editFee.html b/public/components/property/editFee/editFee.html
new file mode 100644
index 000000000..97cc739a4
--- /dev/null
+++ b/public/components/property/editFee/editFee.html
@@ -0,0 +1,38 @@
+
\ No newline at end of file
diff --git a/public/components/property/editFee/editFee.js b/public/components/property/editFee/editFee.js
new file mode 100644
index 000000000..9d8c9df4c
--- /dev/null
+++ b/public/components/property/editFee/editFee.js
@@ -0,0 +1,133 @@
+(function (vc) {
+
+ vc.extends({
+ data: {
+ editFeeInfo: {
+ feeId: '',
+ startTime: '',
+ endTime: ''
+ }
+ },
+ _initMethod: function () {
+ vc.component._initEditFeeDateInfo();
+
+ },
+ _initEvent: function () {
+ vc.on('editFee', 'openEditFeeModal',
+ function (_fee) {
+ vc.copyObject(_fee, $that.editFeeInfo);
+ $('#editFeeModel').modal('show');
+ });
+ },
+ methods: {
+ _initEditFeeDateInfo: function () {
+ $('.editFeeStartTime').datetimepicker({
+ language: 'zh-CN',
+ fontAwesome: 'fa',
+ format: 'yyyy-mm-dd hh:ii:ss',
+ initTime: true,
+ initialDate: new Date(),
+ autoClose: 1,
+ todayBtn: true
+
+ });
+ $('.editFeeStartTime').datetimepicker()
+ .on('changeDate', function (ev) {
+ var value = $(".editFeeStartTime").val();
+ vc.component.editFeeInfo.startTime = value;
+ });
+ $('.editFeeEndTime').datetimepicker({
+ language: 'zh-CN',
+ fontAwesome: 'fa',
+ format: 'yyyy-mm-dd hh:ii:ss',
+ initTime: true,
+ initialDate: new Date(),
+ autoClose: 1,
+ todayBtn: true
+ });
+ $('.editFeeEndTime').datetimepicker()
+ .on('changeDate', function (ev) {
+ var value = $(".editFeeEndTime").val();
+ var start = Date.parse(new Date(vc.component.editFeeInfo.startTime))
+ var end = Date.parse(new Date(value))
+ if (start - end >= 0) {
+ vc.toast("计费起始时间必须大于建账时间")
+ $(".editFeeEndTime").val('')
+ } else {
+ vc.component.editFeeInfo.endTime = value;
+ }
+ });
+ },
+ editFeeValidate() {
+ return vc.validate.validate({
+ editFeeInfo: vc.component.editFeeInfo
+ },
+ {
+ 'editFeeInfo.startTime': [{
+ limit: "required",
+ param: "",
+ errInfo: "建账时间不能为空"
+ },
+ {
+ limit: "dateTime",
+ param: "",
+ errInfo: "建账时间不是有效的时间格式"
+ },
+ ],
+ 'editFeeInfo.endTime': [{
+ limit: "required",
+ param: "",
+ errInfo: "计费起始时间不能为空"
+ },
+ {
+ limit: "dateTime",
+ param: "",
+ errInfo: "计费起始时间不是有效的时间格式"
+ },
+ ]
+
+ });
+ },
+ _doEidtFee: function () {
+
+ if (!vc.component.editFeeValidate()) {
+ vc.toast(vc.validate.errInfo);
+ return;
+ }
+ vc.component.editFeeInfo.communityId = vc.getCurrentCommunity().communityId;
+
+
+ vc.http.apiPost('fee.updateFee', JSON.stringify(vc.component.editFeeInfo), {
+ emulateJSON: true
+ },
+ function (json, res) {
+ //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+ if (res.status == 200) {
+ //关闭model
+ $('#editFeeModel').modal('hide');
+ vc.component.clearAddFeeConfigInfo();
+ vc.emit('listRoomFee','notify', {});
+
+ return;
+ }
+ vc.toast(json);
+
+ },
+ function (errInfo, error) {
+ console.log('请求失败处理');
+
+ vc.toast(errInfo);
+
+ });
+ },
+ clearAddFeeConfigInfo: function () {
+ vc.component.editFeeInfo = {
+ feeId: '',
+ startTime: '',
+ endTime: ''
+ };
+ }
+ }
+ });
+
+})(window.vc);
\ No newline at end of file
diff --git a/public/pages/property/listRoomFee/listRoomFee.html b/public/pages/property/listRoomFee/listRoomFee.html
index ef13d8bf6..e028b41e3 100644
--- a/public/pages/property/listRoomFee/listRoomFee.html
+++ b/public/pages/property/listRoomFee/listRoomFee.html
@@ -26,11 +26,11 @@
| 费用项目 |
费用标识 |
- 费用类型 |
- 房屋面积 |
- 单价 |
- 附加费/固定费 |
- 应收金额 |
+ 费用类型 |
+ 房屋面积 |
+ 单价 |
+ 附加费/固定费 |
+ 应收金额 |
建账时间 |
计费起始时间 |
计费结束时间 |
@@ -53,7 +53,9 @@
{{fee.deadlineTime}} |
{{fee.stateName}} |
-
+
|
@@ -74,4 +80,5 @@
+
\ No newline at end of file
diff --git a/public/pages/property/listRoomFee/listRoomFee.js b/public/pages/property/listRoomFee/listRoomFee.js
index 2aeb5b2df..5896f5e7f 100644
--- a/public/pages/property/listRoomFee/listRoomFee.js
+++ b/public/pages/property/listRoomFee/listRoomFee.js
@@ -63,6 +63,9 @@
_fee.builtUpArea=$that.listRoomCreateFeeInfo.builtUpArea;
vc.jumpToPage('/admin.html#/pages/property/payFeeOrder?'+vc.objToGetParam(_fee));
},
+ _editFee:function(_fee){
+ vc.emit('editFee', 'openEditFeeModal',_fee);
+ },
_payFeeHis:function(_fee){
_fee.builtUpArea=$that.listRoomCreateFeeInfo.builtUpArea;
vc.jumpToPage('/admin.html#/pages/property/propertyFee?'+vc.objToGetParam(_fee));