diff --git a/public/components/staff/staffDetailRepair/staffDetailRepair.html b/public/components/staff/staffDetailRepair/staffDetailRepair.html index f740921c3..024b395b8 100644 --- a/public/components/staff/staffDetailRepair/staffDetailRepair.html +++ b/public/components/staff/staffDetailRepair/staffDetailRepair.html @@ -1,108 +1,96 @@ -
-
-
- -
-
- -
- +
+
+
- - +
+ + +
- - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + +
- - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + +
- {{room.floorNum}}-{{room.unitNum}}-{{room.roomNum}} - - {{room.layer}} - - {{room.roomSubTypeName}} - - {{room.builtUpArea}}/{{room.roomArea}} - - {{room.roomRent}} - - {{room.stateName}} - - {{room.roomOweFee || '0.00'}}(按天更新) - -
- -
-
- -
-
- -
-
{{ownerRepair.repairId}}{{ownerRepair.repairObjName}}{{ownerRepair.repairTypeName}}有偿服务无偿服务需要用料无需用料-{{ownerRepair.repairName}}{{ownerRepair.tel}}{{ownerRepair.appointmentTime}} + {{ownerRepair.stateName}}(定时任务处理) + + {{ownerRepair.stateName}} + +
+ +
+
- - {{staffDetailRepairInfo.allOweFeeAmount}} - +
- -
\ No newline at end of file diff --git a/public/components/staff/staffDetailRepair/staffDetailRepair.js b/public/components/staff/staffDetailRepair/staffDetailRepair.js index 4ccf608ac..d3ee98cf2 100644 --- a/public/components/staff/staffDetailRepair/staffDetailRepair.js +++ b/public/components/staff/staffDetailRepair/staffDetailRepair.js @@ -7,18 +7,17 @@ vc.extends({ data: { staffDetailRepairInfo: { - rooms: [], - ownerId:'', - roomNum: '', - allOweFeeAmount:'0' + ownerRepairs: [], + staffId:'', + undoOrder: 'undo', } }, _initMethod: function () { }, _initEvent: function () { - vc.on('staffDetailAttendance', 'switch', function (_data) { - $that.staffDetailAttendanceInfo.staffId = _data.staffId; - $that._loadStaffAttendances() + vc.on('staffDetailRepair', 'switch', function (_data) { + $that.staffDetailRepairInfo.staffId = _data.staffId; + $that._loadStaffDetailRepairData(DEFAULT_PAGE,DEFAULT_ROWS) }); vc.on('staffDetailRepair', 'paginationPlus', 'page_event', function (_currentPage) { @@ -33,20 +32,23 @@ let param = { params: { communityId: vc.getCurrentCommunity().communityId, - ownerId:$that.staffDetailRepairInfo.ownerId, - roomNum:$that.staffDetailRepairInfo.roomNum, + staffId:$that.staffDetailRepairInfo.staffId, page:_page, row:_row } }; + + let _url = "/ownerRepair.listUndoRepairsByStaff"; + if($that.staffDetailRepairInfo.undoOrder == 'do'){ + _url = "/ownerRepair.listFinishRepairsByStaff"; + } //发送get请求 - vc.http.apiGet('/room.queryRoomsByOwner', + vc.http.apiGet(_url, param, function (json) { var _roomInfo = JSON.parse(json); - vc.component.staffDetailRepairInfo.rooms = _roomInfo.rooms; - $that._computeOwnerRoomOweFeeAmount(); + vc.component.staffDetailRepairInfo.ownerRepairs = _roomInfo.data; vc.emit('staffDetailRepair', 'paginationPlus', 'init', { total: _roomInfo.records, dataCount: _roomInfo.total, @@ -62,45 +64,14 @@ _qureyStaffDetailRepair: function () { $that._loadStaffDetailRepairData(DEFAULT_PAGE, DEFAULT_ROWS); }, - - _computeOwnerRoomOweFeeAmount(){ - let _rooms = $that.staffDetailRepairInfo.rooms; - let _totalOweFeeAmount = 0; - $that.staffDetailRepairInfo.allOweFeeAmount = 0; - if(!_rooms ||_rooms.length <1){ - return ; - } - - _rooms.forEach(_room => { - if(_room.roomOweFee){ - _totalOweFeeAmount += parseFloat(_room.roomOweFee); - } - }); - - $that.staffDetailRepairInfo.allOweFeeAmount = _totalOweFeeAmount.toFixed(2); + _switchUndoOrder:function(_order){ + $that.staffDetailRepairInfo.undoOrder = _order; + $that._loadStaffDetailRepairData(DEFAULT_PAGE,DEFAULT_ROWS); }, - _openAddOwnerRoom: function () { - vc.jumpToPage("/#/pages/property/addOwnerRoomBinding?ownerId=" + $that.staffDetailRepairInfo.ownerId); - }, - ownerExitRoomModel: function(_room) { - vc.emit('ownerExitRoom', 'openExitRoomModel', { - ownerId: $that.staffDetailRepairInfo.ownerId, - roomId: _room.roomId - }); - }, - _toSimplifyAcceptance: function (_room) { - let _date = new Date(); - vc.saveData("JAVA110_IS_BACK", _date.getTime()); - vc.saveData('simplifyAcceptanceSearch', { - searchType: '1', - searchValue: _room.floorNum + "-" + _room.unitNum + "-" + _room.roomNum, - searchPlaceholder: '请输入房屋编号 楼栋-单元-房屋 如1-1-1', - }) - vc.jumpToPage('/#/pages/property/simplifyAcceptance?tab=业务受理'); - }, - _openEditRoomModel: function (_room) { - vc.emit('editRoom', 'openEditRoomModal', _room); + _openRepairDetail: function (_repairPool) { + vc.jumpToPage('/#/pages/property/ownerRepairDetail?repairId=' + _repairPool.repairId) }, + } }); })(window.vc); \ No newline at end of file diff --git a/public/css/vc.css b/public/css/vc.css index f3fe2e290..c35641d77 100644 --- a/public/css/vc.css +++ b/public/css/vc.css @@ -1018,4 +1018,4 @@ nav-link nav-link-breadcrumb active:active { text-align: center; text-overflow: ellipsis; white-space: normal; -} \ No newline at end of file +} diff --git a/public/pages/property/myRepairDispatchManage/myRepairDispatchManage.js b/public/pages/property/myRepairDispatchManage/myRepairDispatchManage.js index 7fb0897aa..cbbe06b7c 100755 --- a/public/pages/property/myRepairDispatchManage/myRepairDispatchManage.js +++ b/public/pages/property/myRepairDispatchManage/myRepairDispatchManage.js @@ -67,7 +67,7 @@ param.params.repairName = param.params.repairName.trim(); param.params.tel = param.params.tel.trim(); //发送get请求 - vc.http.apiGet('ownerRepair.listStaffFinishRepairs', + vc.http.apiGet('/ownerRepair.listStaffFinishRepairs', param, function (json, res) { var _myRepairDispatchInfo = JSON.parse(json);