From 80d06874a17c1b3c1ef785bd151754af9ca24f42 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Sat, 21 Nov 2020 17:02:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=9A=E5=8A=A1=E5=8F=97?= =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../property/simplifyCarFee/simplifyCarFee.js | 17 ++++++++++++ .../simplifyOwnerAccessContol.js | 13 ++++++++-- .../simplifyOwnerCar/simplifyOwnerCar.js | 8 ++++++ .../simplifyOwnerComplaint.js | 11 +++++++- .../simplifyOwnerMember.js | 12 +++++++-- .../simplifyOwnerRepair.js | 11 +++++++- .../simplifyOwnerTransactionCar.js | 11 ++++++++ .../simplifyRoomFee/simplifyRoomFee.js | 15 +++++++++++ .../simplifyAcceptance/simplifyAcceptance.js | 26 +++++++++++++++++-- 9 files changed, 116 insertions(+), 8 deletions(-) diff --git a/public/components/property/simplifyCarFee/simplifyCarFee.js b/public/components/property/simplifyCarFee/simplifyCarFee.js index 5d717398b..a8819a4dd 100644 --- a/public/components/property/simplifyCarFee/simplifyCarFee.js +++ b/public/components/property/simplifyCarFee/simplifyCarFee.js @@ -23,6 +23,7 @@ _initEvent: function () { //切换 至费用页面 vc.on('simplifyCarFee', 'switch', function (_param) { + $that.clearSimplifyCarFeeInfo(); vc.copyObject(_param, $that.simplifyCarFeeInfo) $that._listOwnerCar() .then((data) => { @@ -166,7 +167,23 @@ $that.simplifyCarFeeInfo.num = _car.num; $that.simplifyCarFeeInfo.parkingName = _car.areaNum + '停车场' + _car.num + '停车位'; $that._listSimplifyCarFee(); + }, + clearSimplifyCarFeeInfo: function () { + $that.simplifyCarFeeInfo = { + fees: [], + ownerCars: [], + ownerId: '', + name: '', + carNum: '', + carId: '', + total: 0, + records: 1, + areaNum: '', + num: '', + parkingName: '' + } } + } }); diff --git a/public/components/property/simplifyOwnerAccessContol/simplifyOwnerAccessContol.js b/public/components/property/simplifyOwnerAccessContol/simplifyOwnerAccessContol.js index 0f1d2580e..06d420aa1 100644 --- a/public/components/property/simplifyOwnerAccessContol/simplifyOwnerAccessContol.js +++ b/public/components/property/simplifyOwnerAccessContol/simplifyOwnerAccessContol.js @@ -6,7 +6,7 @@ simplifyOwnerAccessContolInfo: { machineTranslates: [], ownerId: '', - roomId:'' + roomId: '' } }, _initMethod: function () { @@ -15,6 +15,7 @@ _initEvent: function () { //切换 至费用页面 vc.on('simplifyOwnerAccessContol', 'switch', function (_param) { + $that.clearSimplifyOwnerAccessContolInfo(); vc.copyObject(_param, $that.simplifyOwnerAccessContolInfo) $that._listSimplifyOwnerAccessContol(DEFAULT_PAGE, DEFAULT_ROWS); }); @@ -28,7 +29,7 @@ row: _row, communityId: vc.getCurrentCommunity().communityId, objId: $that.simplifyOwnerAccessContolInfo.ownerId, - typeCd:'8899' + typeCd: '8899' } } @@ -54,6 +55,14 @@ _openEditMachineTranslateModel: function (_machineTranslate) { vc.emit('editMachineTranslate', 'openEditMachineTranslateModal', _machineTranslate); }, + clearSimplifyOwnerAccessContolInfo: function () { + $that.simplifyOwnerAccessContolInfo = { + machineTranslates: [], + ownerId: '', + roomId: '' + } + } + } }); diff --git a/public/components/property/simplifyOwnerCar/simplifyOwnerCar.js b/public/components/property/simplifyOwnerCar/simplifyOwnerCar.js index 5e9d6247c..0ed44932e 100644 --- a/public/components/property/simplifyOwnerCar/simplifyOwnerCar.js +++ b/public/components/property/simplifyOwnerCar/simplifyOwnerCar.js @@ -14,6 +14,7 @@ _initEvent: function () { //切换 至费用页面 vc.on('simplifyOwnerCar', 'switch', function (_param) { + $that.clearSimplifyOwnerCarInfo(); vc.copyObject(_param, $that.simplifyOwnerCarInfo) $that._listSimplifyOwnerCar(DEFAULT_PAGE, DEFAULT_ROWS); }); @@ -74,7 +75,14 @@ }, _addCarParkingSpace: function (_car) { vc.jumpToPage('/admin.html#/pages/property/carAddParkingSpace?carId=' + _car.carId); + }, + clearSimplifyOwnerCarInfo: function () { + $that.simplifyOwnerCarInfo = { + ownerCars: [], + ownerId: '' + } } + } }); diff --git a/public/components/property/simplifyOwnerComplaint/simplifyOwnerComplaint.js b/public/components/property/simplifyOwnerComplaint/simplifyOwnerComplaint.js index 0a3f499a6..a5fa74be7 100644 --- a/public/components/property/simplifyOwnerComplaint/simplifyOwnerComplaint.js +++ b/public/components/property/simplifyOwnerComplaint/simplifyOwnerComplaint.js @@ -6,7 +6,7 @@ simplifyOwnerComplaintInfo: { complaints: [], ownerId: '', - roomId:'' + roomId: '' } }, _initMethod: function () { @@ -15,6 +15,7 @@ _initEvent: function () { //切换 至费用页面 vc.on('simplifyOwnerComplaint', 'switch', function (_param) { + $that.clearSimplifyOwnerComplaintInfo(); vc.copyObject(_param, $that.simplifyOwnerComplaintInfo) $that._listSimplifyOwnerComplaint(DEFAULT_PAGE, DEFAULT_ROWS); }); @@ -77,7 +78,15 @@ }, _openComplaintDetailModel: function (_complaint) { vc.emit('complaintDetail', 'openComplaintDetailModal', _complaint); + }, + clearSimplifyOwnerComplaintInfo: function () { + $that.simplifyOwnerComplaintInfo = { + complaints: [], + ownerId: '', + roomId: '' + } } + } }); diff --git a/public/components/property/simplifyOwnerMember/simplifyOwnerMember.js b/public/components/property/simplifyOwnerMember/simplifyOwnerMember.js index 215b6b8a4..51d76359c 100644 --- a/public/components/property/simplifyOwnerMember/simplifyOwnerMember.js +++ b/public/components/property/simplifyOwnerMember/simplifyOwnerMember.js @@ -14,6 +14,7 @@ _initEvent: function () { //切换 至费用页面 vc.on('simplifyOwnerMember', 'switch', function (_param) { + $that.clearSimplifyOwnerMemberInfo(); vc.copyObject(_param, $that.simplifyOwnerMemberInfo) $that._listSimplifyOwnerMember(DEFAULT_PAGE, DEFAULT_ROWS); @@ -45,8 +46,8 @@ console.log('请求失败处理'); }); }, - openAddMemberModel(){ - vc.emit('addOwner','openAddOwnerModal',vc.component.simplifyOwnerMemberInfo.ownerId + openAddMemberModel() { + vc.emit('addOwner', 'openAddOwnerModal', vc.component.simplifyOwnerMemberInfo.ownerId ); }, _openDeleteOwnerModel: function (_member) { @@ -57,6 +58,13 @@ _member.ownerId = vc.component.simplifyOwnerMemberInfo.ownerId; vc.emit('editOwner', 'openEditOwnerModal', _member); }, + clearSimplifyOwnerMemberInfo: function () { + $that.simplifyOwnerMemberInfo = { + members: [], + ownerId: '' + } + } + } }); diff --git a/public/components/property/simplifyOwnerRepair/simplifyOwnerRepair.js b/public/components/property/simplifyOwnerRepair/simplifyOwnerRepair.js index 19dd042d8..7ba6e19ae 100644 --- a/public/components/property/simplifyOwnerRepair/simplifyOwnerRepair.js +++ b/public/components/property/simplifyOwnerRepair/simplifyOwnerRepair.js @@ -6,7 +6,7 @@ simplifyOwnerRepairInfo: { repairs: [], ownerId: '', - roomId:'' + roomId: '' } }, _initMethod: function () { @@ -15,6 +15,7 @@ _initEvent: function () { //切换 至费用页面 vc.on('simplifyOwnerRepair', 'switch', function (_param) { + $that.clearSimplifyOwnerRepairInfo(); vc.copyObject(_param, $that.simplifyOwnerRepairInfo) $that._listSimplifyOwnerRepair(DEFAULT_PAGE, DEFAULT_ROWS); }); @@ -52,7 +53,15 @@ }, _openRepairDetail: function (_repairPool) { vc.jumpToPage('/admin.html#/pages/property/ownerRepairDetail?repairId=' + _repairPool.repairId) + }, + clearSimplifyOwnerRepairInfo: function () { + $that.simplifyOwnerRepairInfo = { + repairs: [], + ownerId: '', + roomId: '' + } } + } }); diff --git a/public/components/property/simplifyOwnerTransactionCar/simplifyOwnerTransactionCar.js b/public/components/property/simplifyOwnerTransactionCar/simplifyOwnerTransactionCar.js index 3e49afddf..7a0a771f1 100644 --- a/public/components/property/simplifyOwnerTransactionCar/simplifyOwnerTransactionCar.js +++ b/public/components/property/simplifyOwnerTransactionCar/simplifyOwnerTransactionCar.js @@ -16,6 +16,8 @@ _initEvent: function () { //切换 至费用页面 vc.on('simplifyOwnerTransactionCar', 'switch', function (_param) { + + $that.clearSimplifyOwnerTransactionCarInfo(); vc.copyObject(_param, $that.simplifyOwnerTransactionCarInfo) $that._listTransactionOwnerCar() .then((data) => { @@ -107,7 +109,16 @@ return; } $that._listSimplifyOwnerTransactionCar(); + }, + clearSimplifyOwnerTransactionCarInfo: function () { + $that.simplifyOwnerTransactionCarInfo = { + machineTranslates: [], + ownerId: '', + carId: '', + ownerCars: [] + } } + } }); diff --git a/public/components/property/simplifyRoomFee/simplifyRoomFee.js b/public/components/property/simplifyRoomFee/simplifyRoomFee.js index 67bd8fc7c..928fcc99e 100644 --- a/public/components/property/simplifyRoomFee/simplifyRoomFee.js +++ b/public/components/property/simplifyRoomFee/simplifyRoomFee.js @@ -23,6 +23,7 @@ _initEvent: function () { //切换 至费用页面 vc.on('simplifyRoomFee', 'switch', function (_param) { + $that.clearSimplifyRoomFeeInfo(); vc.copyObject(_param,$that.simplifyRoomFeeInfo) $that._listSimplifyRoomFee(DEFAULT_PAGE,DEFAULT_ROWS); }); @@ -134,6 +135,20 @@ feeId:_fee.feeId }); }, + clearSimplifyRoomFeeInfo:function(){ + $that. simplifyRoomFeeInfo= { + fees: [], + roomId:'', + roomName:'', + name:'', + roomName:'', + floorNum:'', + unitNum:'', + roomNum:'', + } + } + + } }); })(window.vc); diff --git a/public/pages/property/simplifyAcceptance/simplifyAcceptance.js b/public/pages/property/simplifyAcceptance/simplifyAcceptance.js index 90a7de755..85667584e 100644 --- a/public/pages/property/simplifyAcceptance/simplifyAcceptance.js +++ b/public/pages/property/simplifyAcceptance/simplifyAcceptance.js @@ -126,8 +126,30 @@ }, _clearData: function () { - $that.simplifyAcceptanceInfo.roomId = ''; - $that.simplifyAcceptanceInfo.ownerId = ''; + let _searchType = $that.simplifyAcceptanceInfo.searchType; + let _searchValue = $that.simplifyAcceptanceInfo.searchValue; + let _searchPlaceholder = $that.simplifyAcceptanceInfo.searchPlaceholder; + $that.simplifyAcceptanceInfo = { + searchType: _searchType, + searchValue: _searchValue, + searchPlaceholder: _searchPlaceholder, + ownerPhoto: '', + _currentTab: 'simplifyRoomFee', + roomId: '', + ownerId: '', + name: '', + idCard: '', + link: '', + createTime: '', + apartmentName: '', + floorNum: '', + unitNum: '', + roomNum: '', + builtUpArea: '', + feeCoefficient: '', + stateName: '', + roomName: '' + } } }