From 52a24e95a08d26a290105c237dac43ea29fed013 Mon Sep 17 00:00:00 2001 From: xiaogang <905166056@qq.com> Date: Thu, 4 Feb 2021 17:26:33 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E6=8A=A5=E4=BF=AE?= =?UTF-8?q?=E6=8A=A5=E8=A1=A82=E3=80=81=E5=88=9B=E5=BB=BA=E8=B4=B9?= =?UTF-8?q?=E7=94=A8=20=E8=B4=B9=E7=94=A8=E7=B1=BB=E5=9E=8B=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roomCreateFeeAdd/roomCreateFeeAdd.js | 8 +- .../applicationKeyManage.html | 9 +- .../property/reportRepair/reportRepair.html | 126 ++++++++++ .../property/reportRepair/reportRepair.js | 218 ++++++++++++++++++ .../property/roomCreateFee/roomCreateFee.html | 2 +- 5 files changed, 356 insertions(+), 7 deletions(-) create mode 100644 public/pages/property/reportRepair/reportRepair.html create mode 100644 public/pages/property/reportRepair/reportRepair.js diff --git a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js index fe5b679ea..69a9e1f38 100644 --- a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js +++ b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js @@ -24,7 +24,13 @@ _initMethod: function () { $that._initRoomCreateFeeAddInfo(); vc.getDict('pay_fee_config', "fee_type_cd", function (_data) { - $that.roomCreateFeeAddInfo.feeTypeCds = _data; + var _datanew=[]; + _data.forEach((item, index) => { + if(item.statusCd!="888800010015" && item.statusCd!="888800010016" ){ + _datanew.push(item); + } + }); + $that.roomCreateFeeAddInfo.feeTypeCds = _datanew; }); }, _initEvent: function () { diff --git a/public/pages/property/applicationKeyManage/applicationKeyManage.html b/public/pages/property/applicationKeyManage/applicationKeyManage.html index afd80c1eb..2844cd73c 100644 --- a/public/pages/property/applicationKeyManage/applicationKeyManage.html +++ b/public/pages/property/applicationKeyManage/applicationKeyManage.html @@ -1,4 +1,4 @@ -
+
@@ -6,8 +6,8 @@
查询条件
@@ -132,8 +132,7 @@
+ callBackFunction="">
diff --git a/public/pages/property/reportRepair/reportRepair.html b/public/pages/property/reportRepair/reportRepair.html new file mode 100644 index 000000000..8c041fd0f --- /dev/null +++ b/public/pages/property/reportRepair/reportRepair.html @@ -0,0 +1,126 @@ +
+
+
+
+
+
查询条件
+
+ +
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+ + +
+
+
+
+ +
+ +
+ +
+
+
+
+
+
+
+
+
+
+
报修汇总表
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
报修编号员工ID员工姓名处理中(条)派单(条)转单(条)退单(条)已完结(条)
{{index+1}}{{repair.staffId}}{{repair.staffName}}{{repair.dealAmount}}{{repair.dispatchAmount}}{{repair.transferOrderAmount}}{{repair.chargebackAmount}}{{repair.statementAmount}}
+
    +
    + + +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/public/pages/property/reportRepair/reportRepair.js b/public/pages/property/reportRepair/reportRepair.js new file mode 100644 index 000000000..e5a6ca520 --- /dev/null +++ b/public/pages/property/reportRepair/reportRepair.js @@ -0,0 +1,218 @@ +/** + 入驻小区 + **/ +(function (vc) { + var DEFAULT_PAGE = 1; + var DEFAULT_ROWS = 10; + vc.extends({ + data: { + reportRepairInfo: { + repairs: [], + total: 0, + records: 1, + moreCondition: false, + title: '', + states: '', + repairUsers: '', + conditions: { + staffId: '', + staffName: '', + state: '', + stateName: '', + amount: '', + beginStartTime: '', + beginEndTime: '', + finishStartTime: '', + finishEndTime: '' + } + } + }, + _initMethod: function () { + vc.component._initDate(); + vc.component._listRepairs(DEFAULT_PAGE, DEFAULT_ROWS); + //关联字典表费用类型 + vc.getDict('r_repair_user', "state", function (_data) { + vc.component.reportRepairInfo.states = _data; + }); + }, + _initEvent: function () { + vc.on('pagination', 'page_event', function (_currentPage) { + vc.component._listRepairs(_currentPage, DEFAULT_ROWS); + }); + }, + methods: { + _initDate: function () { + $(".begin_start_time").datetimepicker({ + minView: "month", + language: 'zh-CN', + fontAwesome: 'fa', + format: 'yyyy-mm-dd', + initTime: true, + initialDate: new Date(), + autoClose: 1, + todayBtn: true + }); + $(".begin_end_time").datetimepicker({ + minView: "month", + language: 'zh-CN', + fontAwesome: 'fa', + format: 'yyyy-mm-dd', + initTime: true, + initialDate: new Date(), + autoClose: 1, + todayBtn: true + }); + $(".finish_start_time").datetimepicker({ + minView: "month", + language: 'zh-CN', + fontAwesome: 'fa', + format: 'yyyy-mm-dd', + initTime: true, + initialDate: new Date(), + autoClose: 1, + todayBtn: true + }); + $(".finish_end_time").datetimepicker({ + minView: "month", + language: 'zh-CN', + fontAwesome: 'fa', + format: 'yyyy-mm-dd', + initTime: true, + initialDate: new Date(), + autoClose: 1, + todayBtn: true + }); + $('.begin_start_time').datetimepicker() + .on('changeDate', function (ev) { + var value = $(".begin_start_time").val(); + vc.component.reportRepairInfo.conditions.beginStartTime = value; + }); + $('.begin_end_time').datetimepicker() + .on('changeDate', function (ev) { + var value = $(".begin_end_time").val(); + vc.component.reportRepairInfo.conditions.beginEndTime = value; + let start = Date.parse(new Date($that.reportRepairInfo.conditions.beginStartTime)) + let end = Date.parse(new Date($that.reportRepairInfo.conditions.beginEndTime)) + if (start - end > 0) { + vc.toast("结束时间必须大于开始时间") + $that.reportRepairInfo.conditions.beginEndTime = ''; + } + }); + $('.finish_start_time').datetimepicker() + .on('changeDate', function (ev) { + var value = $(".finish_start_time").val(); + vc.component.reportRepairInfo.conditions.finishStartTime = value; + }); + $('.finish_end_time').datetimepicker() + .on('changeDate', function (ev) { + var value = $(".finish_end_time").val(); + vc.component.reportRepairInfo.conditions.finishEndTime = value; + let start = Date.parse(new Date($that.reportRepairInfo.conditions.finishStartTime)) + let end = Date.parse(new Date($that.reportRepairInfo.conditions.finishEndTime)) + if (start - end > 0) { + vc.toast("结束时间必须大于开始时间") + $that.reportRepairInfo.conditions.finishEndTime = ''; + } + }); + //防止多次点击时间插件失去焦点 + document.getElementsByName('beginStartTime')[0].addEventListener('click', myfunc) + + function myfunc(e) { + e.currentTarget.blur(); + } + + document.getElementsByName("beginEndTime")[0].addEventListener('click', myfunc) + + function myfunc(e) { + e.currentTarget.blur(); + } + + document.getElementsByName('finishStartTime')[0].addEventListener('click', myfunc) + + function myfunc(e) { + e.currentTarget.blur(); + } + + document.getElementsByName("finishEndTime")[0].addEventListener('click', myfunc) + + function myfunc(e) { + e.currentTarget.blur(); + } + }, + //查询 + _queryMethod: function () { + vc.component._listRepairs(DEFAULT_PAGE, DEFAULT_ROWS); + }, + //查询方法 + _listRepairs: function (_page, _rows) { + vc.component.reportRepairInfo.conditions.page = _page; + vc.component.reportRepairInfo.conditions.row = _rows; + vc.component.reportRepairInfo.conditions.communityId = vc.getCurrentCommunity().communityId; + var param = { + params: vc.component.reportRepairInfo.conditions + }; + //发送get请求 + vc.http.apiGet('/reportFeeMonthStatistics/queryRepair', + param, + function (json, res) { + var _reportRepairInfo = JSON.parse(json); + console.log("here is _reportRepairInfo") + console.log(_reportRepairInfo) + vc.component.reportRepairInfo.total = _reportRepairInfo.total; + vc.component.reportRepairInfo.records = _reportRepairInfo.records; + vc.component.reportRepairInfo.repairs = _reportRepairInfo.data; + vc.component.reportRepairInfo.repairUsers = _reportRepairInfo.sumTotal; + vc.emit('pagination', 'init', { + total: vc.component.reportRepairInfo.records, + currentPage: _page, + dataCount: vc.component.reportRepairInfo.total + }); + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); + }, + //重置 + _resetMethod: function (_page, _rows) { + vc.component._resetListRepairs(DEFAULT_PAGE, DEFAULT_ROWS); + }, + _resetListRepairs: function (_page, _rows) { + vc.component.reportRepairInfo.conditions.staffId = ""; + vc.component.reportRepairInfo.conditions.staffName = ""; + vc.component.reportRepairInfo.conditions.beginStartTime = ""; + vc.component.reportRepairInfo.conditions.beginEndTime = ""; + vc.component.reportRepairInfo.conditions.finishStartTime = ""; + vc.component.reportRepairInfo.conditions.finishEndTime = ""; + vc.component.reportRepairInfo.conditions.state = ""; + vc.component.reportRepairInfo.conditions.stateName = ""; + var param = { + params: vc.component.reportRepairInfo.conditions + }; + //发送get请求 + vc.http.apiGet('/reportFeeMonthStatistics/queryRepair', + param, + function (json, res) { + var _reportRepairInfo = JSON.parse(json); + vc.component.reportRepairInfo.total = _reportRepairInfo.total; + vc.component.reportRepairInfo.records = _reportRepairInfo.records; + vc.component.reportRepairInfo.repairs = _reportRepairInfo.data; + vc.emit('pagination', 'init', { + total: vc.component.reportRepairInfo.records, + currentPage: _page, + dataCount: vc.component.reportRepairInfo.total + }); + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); + }, + _moreCondition: function () { + if (vc.component.reportRepairInfo.moreCondition) { + vc.component.reportRepairInfo.moreCondition = false; + } else { + vc.component.reportRepairInfo.moreCondition = true; + } + } + } + }); +})(window.vc); diff --git a/public/pages/property/roomCreateFee/roomCreateFee.html b/public/pages/property/roomCreateFee/roomCreateFee.html index 50deea226..71029ae0c 100644 --- a/public/pages/property/roomCreateFee/roomCreateFee.html +++ b/public/pages/property/roomCreateFee/roomCreateFee.html @@ -66,7 +66,7 @@
    -
    +