From f01d8d42af6f92951d0c726888e849d7e8ee8f6c Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Fri, 26 Mar 2021 12:23:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=8D=E5=AF=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 8 +- .../complaintManage/complaintManage.html | 4 +- .../myRepairDispatchManage.html | 6 +- .../myRepairDispatchManage.js | 162 +++++++++--------- .../repairDispatchManage.html | 6 +- .../repairDispatchManage.js | 4 + 6 files changed, 99 insertions(+), 91 deletions(-) diff --git a/app.js b/app.js index a1ec5b097..366efffb1 100644 --- a/app.js +++ b/app.js @@ -36,11 +36,11 @@ let opts = { //app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts)); -//app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts)); -//app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts)); +app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts)); +app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts)); -app.use('/callComponent',proxy('http://127.0.0.1:8012',opts)); -app.use('/app',proxy('http://127.0.0.1:8012',opts)); +//app.use('/callComponent',proxy('http://127.0.0.1:8012',opts)); +//app.use('/app',proxy('http://127.0.0.1:8012',opts)); //app.use('/callComponent',proxy('http://192.168.1.16:8012',opts)); //app.use('/app',proxy('http://192.168.1.16:8012',opts)); diff --git a/public/pages/common/complaintManage/complaintManage.html b/public/pages/common/complaintManage/complaintManage.html index 991054c8d..c10d3cb92 100644 --- a/public/pages/common/complaintManage/complaintManage.html +++ b/public/pages/common/complaintManage/complaintManage.html @@ -53,8 +53,8 @@
diff --git a/public/pages/property/myRepairDispatchManage/myRepairDispatchManage.html b/public/pages/property/myRepairDispatchManage/myRepairDispatchManage.html index a0cbe2bb6..4bd25eebb 100644 --- a/public/pages/property/myRepairDispatchManage/myRepairDispatchManage.html +++ b/public/pages/property/myRepairDispatchManage/myRepairDispatchManage.html @@ -47,9 +47,9 @@
diff --git a/public/pages/property/myRepairDispatchManage/myRepairDispatchManage.js b/public/pages/property/myRepairDispatchManage/myRepairDispatchManage.js index 5cb1e7b8c..df824e79f 100644 --- a/public/pages/property/myRepairDispatchManage/myRepairDispatchManage.js +++ b/public/pages/property/myRepairDispatchManage/myRepairDispatchManage.js @@ -1,132 +1,136 @@ /** 入驻小区 **/ -(function(vc){ +(function (vc) { var DEFAULT_PAGE = 1; var DEFAULT_ROWS = 10; vc.extends({ - data:{ - myRepairDispatchInfo:{ - ownerRepairs:[], - total:0, - records:1, - moreCondition:false, - repairName:'', - currentRepairId:'', - conditions:{ - pageFlag:'myRepairDispatch', - repairId:'', - repairName:'', - tel:'', - repairType:'', - roomId:'', - roomName:'', - ownerId:'', - state:'' + data: { + myRepairDispatchInfo: { + ownerRepairs: [], + total: 0, + records: 1, + moreCondition: false, + repairName: '', + currentRepairId: '', + states: [], + conditions: { + pageFlag: 'myRepairDispatch', + repairId: '', + repairName: '', + tel: '', + repairType: '', + roomId: '', + roomName: '', + ownerId: '', + state: '' } } }, - _initMethod:function(){ + _initMethod: function () { + vc.getDict('r_repair_pool', "state", function (_data) { + vc.component.myRepairDispatchInfo.states = _data; + }); vc.component._listOwnerRepairs(DEFAULT_PAGE, DEFAULT_ROWS); }, - _initEvent:function(){ - - vc.on('myRepairDispatch','listOwnerRepair',function(_param){ - vc.component._listOwnerRepairs(DEFAULT_PAGE, DEFAULT_ROWS); + _initEvent: function () { + + vc.on('myRepairDispatch', 'listOwnerRepair', function (_param) { + vc.component._listOwnerRepairs(DEFAULT_PAGE, DEFAULT_ROWS); }); - vc.on('pagination','page_event',function(_currentPage){ - vc.component._listOwnerRepairs(_currentPage,DEFAULT_ROWS); + vc.on('pagination', 'page_event', function (_currentPage) { + vc.component._listOwnerRepairs(_currentPage, DEFAULT_ROWS); }); - vc.on('myRepairDispatch','notifyData',function(_param){ + vc.on('myRepairDispatch', 'notifyData', function (_param) { vc.component._closeRepairDispatchOrder(_param); }); }, - methods:{ + methods: { - _listOwnerRepairs:function(_page, _rows){ + _listOwnerRepairs: function (_page, _rows) { vc.component.myRepairDispatchInfo.conditions.page = _page; vc.component.myRepairDispatchInfo.conditions.row = _rows; vc.component.myRepairDispatchInfo.conditions.communityId = vc.getCurrentCommunity().communityId; var param = { - params:vc.component.myRepairDispatchInfo.conditions - }; + params: vc.component.myRepairDispatchInfo.conditions + }; - //发送get请求 - vc.http.apiGet('ownerRepair.listStaffFinishRepairs', - param, - function(json,res){ - var _myRepairDispatchInfo=JSON.parse(json); - vc.component.myRepairDispatchInfo.total = _myRepairDispatchInfo.total; - vc.component.myRepairDispatchInfo.records = _myRepairDispatchInfo.records; - vc.component.myRepairDispatchInfo.ownerRepairs = _myRepairDispatchInfo.data; - vc.emit('pagination','init',{ - total:vc.component.myRepairDispatchInfo.records, - currentPage:_page - }); - },function(errInfo,error){ - console.log('请求失败处理'); - } - ); + //发送get请求 + vc.http.apiGet('ownerRepair.listStaffFinishRepairs', + param, + function (json, res) { + var _myRepairDispatchInfo = JSON.parse(json); + vc.component.myRepairDispatchInfo.total = _myRepairDispatchInfo.total; + vc.component.myRepairDispatchInfo.records = _myRepairDispatchInfo.records; + vc.component.myRepairDispatchInfo.ownerRepairs = _myRepairDispatchInfo.data; + vc.emit('pagination', 'init', { + total: vc.component.myRepairDispatchInfo.records, + currentPage: _page + }); + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); }, - _openDealRepair:function(_ownerRepair){ + _openDealRepair: function (_ownerRepair) { vc.component.myRepairDispatchInfo.currentRepairId = _ownerRepair.repairId; - vc.emit('closeOrder','openCloseOrderModal',{}); + vc.emit('closeOrder', 'openCloseOrderModal', {}); }, - _moreCondition:function(){ - if(vc.component.myRepairDispatchInfo.moreCondition){ + _moreCondition: function () { + if (vc.component.myRepairDispatchInfo.moreCondition) { vc.component.myRepairDispatchInfo.moreCondition = false; - }else{ + } else { vc.component.myRepairDispatchInfo.moreCondition = true; } }, _openRepairDetail: function (_repairPool) { vc.jumpToPage('/admin.html#/pages/property/ownerRepairDetail?repairId=' + _repairPool.repairId) }, - _closeRepairDispatchOrder:function(_orderInfo){ + _closeRepairDispatchOrder: function (_orderInfo) { var _repairDispatchParam = { - repairId:vc.component.myRepairDispatchInfo.currentRepairId, - context:_orderInfo.remark, - communityId:vc.getCurrentCommunity().communityId + repairId: vc.component.myRepairDispatchInfo.currentRepairId, + context: _orderInfo.remark, + communityId: vc.getCurrentCommunity().communityId }; - if(_orderInfo.state == '1100'){ + if (_orderInfo.state == '1100') { _repairDispatchParam.state = '10002'; - }else{ + } else { _repairDispatchParam.state = '10003'; } - vc.http.post( - 'myRepairDispatch', - 'closeOrder', - JSON.stringify(_repairDispatchParam), - { - emulateJSON:true + vc.http.post( + 'myRepairDispatch', + 'closeOrder', + JSON.stringify(_repairDispatchParam), + { + emulateJSON: true }, - function(json,res){ - //vm.menus = vm.refreshMenuActive(JSON.parse(json),0); - if(res.status == 200){ - //关闭model - vc.component._listOwnerRepairs(DEFAULT_PAGE, DEFAULT_ROWS); - return ; - } - vc.toast(json); + function (json, res) { + //vm.menus = vm.refreshMenuActive(JSON.parse(json),0); + if (res.status == 200) { + //关闭model + vc.component._listOwnerRepairs(DEFAULT_PAGE, DEFAULT_ROWS); + return; + } + vc.toast(json); }, - function(errInfo,error){ - console.log('请求失败处理'); + function (errInfo, error) { + console.log('请求失败处理'); - vc.toast(errInfo); + vc.toast(errInfo); }); }, - _openDispatchRepairDetail:function(_ownerRepair){ - vc.emit('ownerRepairDetail','openOwnerRepairDetailModal',_ownerRepair); + _openDispatchRepairDetail: function (_ownerRepair) { + vc.emit('ownerRepairDetail', 'openOwnerRepairDetailModal', _ownerRepair); }, - _queryMyRepairDispatchMethod:function(){ + _queryMyRepairDispatchMethod: function () { vc.component._listOwnerRepairs(DEFAULT_PAGE, DEFAULT_ROWS); } - + } }); })(window.vc); diff --git a/public/pages/property/repairDispatchManage/repairDispatchManage.html b/public/pages/property/repairDispatchManage/repairDispatchManage.html index 770329bca..98fc7c285 100644 --- a/public/pages/property/repairDispatchManage/repairDispatchManage.html +++ b/public/pages/property/repairDispatchManage/repairDispatchManage.html @@ -49,9 +49,9 @@
diff --git a/public/pages/property/repairDispatchManage/repairDispatchManage.js b/public/pages/property/repairDispatchManage/repairDispatchManage.js index 05d9a1ca6..3421d6bba 100644 --- a/public/pages/property/repairDispatchManage/repairDispatchManage.js +++ b/public/pages/property/repairDispatchManage/repairDispatchManage.js @@ -12,6 +12,7 @@ records: 1, moreCondition: false, repairName: '', + states: [], conditions: { repairId: '', repairName: '', @@ -25,6 +26,9 @@ } }, _initMethod: function () { + vc.getDict('r_repair_pool', "state", function (_data) { + vc.component.repairDispatchManageInfo.states = _data; + }); vc.component._listOwnerRepairs(DEFAULT_PAGE, DEFAULT_ROWS); //vc.component._validateParam(); }, From 9d43d6a33db6505bf2fcbb315c0ae075ce88bce8 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Fri, 26 Mar 2021 17:00:31 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=B5=E8=AF=9D?= =?UTF-8?q?=E6=8A=A5=E4=BF=AE=E7=8A=B6=E6=80=81=E4=B8=8D=E5=AF=B9=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/property/ownerRepairManage/ownerRepairManage.html | 6 +++--- .../pages/property/ownerRepairManage/ownerRepairManage.js | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/public/pages/property/ownerRepairManage/ownerRepairManage.html b/public/pages/property/ownerRepairManage/ownerRepairManage.html index 42e12d9f7..e2b1e4eb6 100644 --- a/public/pages/property/ownerRepairManage/ownerRepairManage.html +++ b/public/pages/property/ownerRepairManage/ownerRepairManage.html @@ -52,9 +52,9 @@
diff --git a/public/pages/property/ownerRepairManage/ownerRepairManage.js b/public/pages/property/ownerRepairManage/ownerRepairManage.js index 9d6509472..1f84eb0a7 100644 --- a/public/pages/property/ownerRepairManage/ownerRepairManage.js +++ b/public/pages/property/ownerRepairManage/ownerRepairManage.js @@ -12,6 +12,7 @@ records: 1, moreCondition: false, repairName: '', + states: [], conditions: { repairId: '', repairName: '', @@ -26,6 +27,9 @@ _initMethod: function () { //vc.component._listOwnerRepairs(DEFAULT_PAGE, DEFAULT_ROWS); //vc.component._validateParam(); + vc.getDict('r_repair_pool', "state", function (_data) { + vc.component.ownerRepairManageInfo.states = _data; + }); vc.component._listOwnerRepairs(DEFAULT_PAGE, DEFAULT_ROWS); }, _initEvent: function () { From 2b5d41fd670c69303365b70562cea1172520d243 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Fri, 26 Mar 2021 17:12:15 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8F=96=E6=95=B4=20=E5=8A=A0=E5=85=A5=20?= =?UTF-8?q?=E5=90=91=E4=B8=8B=E5=8F=96=E6=95=B4=E5=92=8C=20=E5=9B=9B?= =?UTF-8?q?=E9=A6=96=E4=BA=94=E5=85=A5=E5=8F=96=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/pages/property/payFeeOrder/payFeeOrder.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/public/pages/property/payFeeOrder/payFeeOrder.js b/public/pages/property/payFeeOrder/payFeeOrder.js index 276759e23..7f2352795 100644 --- a/public/pages/property/payFeeOrder/payFeeOrder.js +++ b/public/pages/property/payFeeOrder/payFeeOrder.js @@ -269,7 +269,11 @@ return $that._mathToFixed1(num); } else if ($that.payFeeOrderInfo.toFixedSign == 3) { return $that._mathCeil(num); - } else { + }else if ($that.payFeeOrderInfo.toFixedSign == 4) { + return $that._mathFloor(num); + }else if ($that.payFeeOrderInfo.toFixedSign == 5) { + return $that._mathRound(num); + } else { return $that._mathToFixed2(num); } }, @@ -301,6 +305,12 @@ _mathFloor: function (_price) { return Math.floor(_price); }, + /** + * 四首五入取整 + */ + _mathRound: function (_price) { + return Math.round(_price); + }, /** * 保留小数点后一位 */ From 85e6e61dbaed0c6df754ed5328854103ff700aa6 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Sun, 28 Mar 2021 01:52:07 +0800 Subject: [PATCH 4/4] =?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 --- public/pages/property/payFeeOrder/payFeeOrder.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/pages/property/payFeeOrder/payFeeOrder.js b/public/pages/property/payFeeOrder/payFeeOrder.js index 7f2352795..68ad52a51 100644 --- a/public/pages/property/payFeeOrder/payFeeOrder.js +++ b/public/pages/property/payFeeOrder/payFeeOrder.js @@ -345,7 +345,7 @@ // 由于返回的键与档期那页面自定义的键不一致，单独赋值toFiexedSign let toFixedSign = listRoomData.data.val; // 防止后台设置有误 - if (toFixedSign == 1 || toFixedSign == 2 || toFixedSign == 3) { + if (toFixedSign == 1 || toFixedSign == 2 || toFixedSign == 3 || toFixedSign == 4 || toFixedSign == 5) { $that.payFeeOrderInfo.toFixedSign = toFixedSign; } vc.emit('payFeeOrder', 'initData', listRoomData.data);