|
|
@@ -147,7 +147,7 @@
|
|
|
// title: res.msg,
|
|
|
// type: 'success',
|
|
|
// });
|
|
|
- this.roadspaceList = res.data;
|
|
|
+ this.roadspaceList = res.data.rows;
|
|
|
console.log('handleGetRoadspace',res)
|
|
|
}).catch(err=>{
|
|
|
if(err.errMsg){
|
|
|
@@ -164,14 +164,46 @@
|
|
|
console.log('handleGetRoadspace ',err)
|
|
|
});
|
|
|
},
|
|
|
- roadspaceClick(orderInfo){
|
|
|
- this.confirmData = orderInfo;
|
|
|
+ roadspaceClick(item){
|
|
|
+ this.confirmData = item;
|
|
|
this.confirmData.vehicleColor = 0;
|
|
|
this.confirmData.vehicleType = 0;
|
|
|
- this.actionShow = true;
|
|
|
- this.orderInfo = orderInfo;
|
|
|
- this.spaceId = orderInfo.id;
|
|
|
- console.log('orderInfo',orderInfo);
|
|
|
+ this.orderInfo = item;
|
|
|
+ this.spaceId = item.id;
|
|
|
+ if(!item.vehicleNo){
|
|
|
+ //无车牌打开补全车牌信息
|
|
|
+ let that = this;
|
|
|
+ ocr.ocrVehicleNo((ret) => {
|
|
|
+ if (ret.success){
|
|
|
+ that.confirmData.vehicleNo = ret.vehicleNo;
|
|
|
+ that.confirmData.carImg = 'data:image/png;base64,' + ret.imageBase64;
|
|
|
+ this.$u.api.tencentBase64Upload({
|
|
|
+ base64: ret.imageBase64,
|
|
|
+ suffix: 'png'
|
|
|
+ })
|
|
|
+ .then(res=>{
|
|
|
+ this.confirmPop = true;
|
|
|
+ that.confirmData.vehicleImage = res.data.url;
|
|
|
+ }).catch(err=>{});
|
|
|
+ }else {
|
|
|
+ plus.nativeUI.toast('识别失败');
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }else {
|
|
|
+ //信息完整打开出场页面
|
|
|
+ const d = new Date();
|
|
|
+ this.$u.route({
|
|
|
+ url: 'pages/getout/getoutpage/getoutpage',
|
|
|
+ params: {
|
|
|
+ orderID:item.id,
|
|
|
+ orderInTime:item.inTime,
|
|
|
+ orderOutTime:`${d.getFullYear()}-${((d.getMonth()+1)>=10?+(d.getMonth()+1):"0"+(d.getMonth()+1))}-${((d.getDate())>=10?d.getDate():'0'+d.getDate())} ${d.getHours()>=10?d.getHours():'0'+d.getHours()}:${d.getMinutes()>=10?d.getMinutes():'0'+d.getMinutes()}:${d.getSeconds()>=10?d.getSeconds():'0'+d.getSeconds()}`,
|
|
|
+ orderSpaceName:item.spaceName,
|
|
|
+ orderVehicleNo:item.vehicleNo
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
},
|
|
|
actionClick(e){
|
|
|
console.log('actionClick',e);
|
aleyds