From ec77e4f858d7ba70c6269a39de541b0da4b80ef0 Mon Sep 17 00:00:00 2001 From: wuxw <928255095@qq.com> Date: Tue, 6 Sep 2022 23:08:29 +0800 Subject: [PATCH 1/2] =?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 --- .../parkingAreaControlCarInouts.html | 7 +++++-- .../parkingAreaControlCarInouts.js | 16 +++++++++++++++- .../parkingAreaControlInCar.html | 5 ++++- .../parkingAreaControlInCar.js | 16 +++++++++++++++- .../parkingAreaControlVideo.js | 12 ++++++++++++ 5 files changed, 51 insertions(+), 5 deletions(-) diff --git a/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.html b/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.html index a634ed6b2..9a47d16c2 100644 --- a/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.html +++ b/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.html @@ -59,7 +59,8 @@ {{carIn.inoutId}} {{carIn.carInout == '3306'?'进场':'出场'}}({{carIn.stateName}}) - {{carIn.carNum}} + {{carIn.carNum}} + {{carIn.areaNum}} {{carIn.feeName}} @@ -72,7 +73,9 @@ - - {{carIn.payCharge}} + {{carIn.payCharge}}( + 收费出场) + {{carIn.remark}} diff --git a/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.js b/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.js index 1ad7c8561..dfa4905f5 100644 --- a/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.js +++ b/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.js @@ -13,7 +13,8 @@ carNum: '', startTime: '', endTime: '', - carType: '' + carType: '', + machineId:'' } }, _initMethod: function() { @@ -33,6 +34,9 @@ function(_currentPage) { vc.component._loadParkingAreaControlCarInouts(_currentPage, DEFAULT_ROWS); }); + vc.on('parkingAreaControlCarInouts', 'changeMachine',function(_data){ + $that.parkingAreaControlCarInoutsInfo.machineId = _data.machineId; + }) }, methods: { @@ -104,6 +108,16 @@ console.log('请求失败处理'); } ); + }, + _carInoutTempCarPayFee:function(carIn){ + vc.emit('parkingAreaControlCustomCarInout', 'open', { + type: "1102", //1101 手动入场 1102 手动出场 + carNum: carIn.carNum, + amount: carIn.payCharge, + payCharge: carIn.payCharge, + machineId:$that.parkingAreaControlCarInoutsInfo.machineId, + boxId: $that.parkingAreaControlCarInoutsInfo.boxId, + }) } } diff --git a/public/components/property/parkingAreaControlInCar/parkingAreaControlInCar.html b/public/components/property/parkingAreaControlInCar/parkingAreaControlInCar.html index 429767608..f6b00a1d7 100644 --- a/public/components/property/parkingAreaControlInCar/parkingAreaControlInCar.html +++ b/public/components/property/parkingAreaControlInCar/parkingAreaControlInCar.html @@ -71,7 +71,10 @@ {{carIn.min}} - {{carIn.payCharge}} + + {{carIn.payCharge}} + (收费出场) + - diff --git a/public/components/property/parkingAreaControlInCar/parkingAreaControlInCar.js b/public/components/property/parkingAreaControlInCar/parkingAreaControlInCar.js index 844537d3b..c32a09c64 100644 --- a/public/components/property/parkingAreaControlInCar/parkingAreaControlInCar.js +++ b/public/components/property/parkingAreaControlInCar/parkingAreaControlInCar.js @@ -15,7 +15,8 @@ endTime: '', updateCarNum: '', updateInoutId: '', - carType: '' + carType: '', + machineId:'' } }, _initMethod: function() { @@ -36,6 +37,9 @@ function(_currentPage) { vc.component._loadParkingAreaControlInCarData(_currentPage, DEFAULT_ROWS); }); + vc.on('parkingAreaControlInCar', 'changeMachine',function(_data){ + $that.parkingAreaControlInCarInfo.machineId = _data.machineId; + }) }, methods: { _loadParkingAreaControlInCarData: function(_page, _row) { @@ -143,6 +147,16 @@ vc.toast(errInfo); }); + }, + _carInTempCarPayFee:function(car){ + vc.emit('parkingAreaControlCustomCarInout', 'open', { + type: "1102", //1101 手动入场 1102 手动出场 + carNum: carIn.carNum, + amount: carIn.payCharge, + payCharge: carIn.payCharge, + machineId: $that.parkingAreaControlInCarInfo.machineId, + boxId: $that.parkingAreaControlInCarInfo.boxId, + }) } } }); diff --git a/public/components/property/parkingAreaControlVideo/parkingAreaControlVideo.js b/public/components/property/parkingAreaControlVideo/parkingAreaControlVideo.js index d8a407bce..5bf8a1ace 100644 --- a/public/components/property/parkingAreaControlVideo/parkingAreaControlVideo.js +++ b/public/components/property/parkingAreaControlVideo/parkingAreaControlVideo.js @@ -122,6 +122,18 @@ boxId: $that.parkingAreaControlVideoInfo.boxId }); + vc.emit('parkingAreaControlInCar', 'changeMachine', { + machineId: _outMachineId, + boxId: $that.parkingAreaControlVideoInfo.boxId + }); + + vc.emit('parkingAreaControlCarInouts', 'changeMachine', { + machineId: _outMachineId, + boxId: $that.parkingAreaControlVideoInfo.boxId + }); + + + let paId = ""; $that.parkingAreaControlVideoInfo.outMachines.forEach((item) => { if (item.machineId == _outMachineId) { From 56a74e7bc50395f70b4033a71efbf702b1f8534e Mon Sep 17 00:00:00 2001 From: wuxw <928255095@qq.com> Date: Thu, 8 Sep 2022 00:30:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=88=E5=90=8C?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../property/contractCreateFeeAdd/contractCreateFeeAdd.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/components/property/contractCreateFeeAdd/contractCreateFeeAdd.js b/public/components/property/contractCreateFeeAdd/contractCreateFeeAdd.js index a4e3f6d59..789fb6027 100755 --- a/public/components/property/contractCreateFeeAdd/contractCreateFeeAdd.js +++ b/public/components/property/contractCreateFeeAdd/contractCreateFeeAdd.js @@ -106,17 +106,17 @@ }, function(json, res) { //vm.menus = vm.refreshMenuActive(JSON.parse(json),0); - if (res.status == 200) { + let _json = JSON.parse(json); + if (_json.code == 0) { //关闭model - var _json = JSON.parse(json); $('#contractCreateFeeAddModel').modal('hide'); $that.clearAddFeeConfigInfo(); - vc.toast("创建收费成功，总共[" + _json.totalRoom + "]合同，成功[" + _json.successRoom + "],失败[" + _json.errorRoom + "]", 8000); + vc.toast("创建收费成功，总共[" + _json.data.totalRoom + "]合同，成功[" + _json.data.successRoom + "],失败[" + _json.data.errorRoom + "]", 8000); vc.emit('listContractFee', 'notify', {}); vc.emit('simplifyContractFee', 'notify', {}); return; } - vc.toast(json); + vc.toast(_json.msg); }, function(errInfo, error) { console.log('请求失败处理');