Przeglądaj źródła

Merge pull request #277 from John-Hong/release-2.18.0

fix(KIP-12320): 【DE】【C端】临时停车。当有牌车和无牌车(进场时间更早)都在场内时,不会跳转到无牌车tab页下
Tron 1 rok temu
rodzic
commit
20536241e0

+ 3 - 0
src/pages/parkingFee/mixins/parkingFee.js

@@ -218,6 +218,9 @@ export default {
         if (vehicles.length) {
           // 判断是否存在无牌车
           const vehicleNo = vehicles[0].vehicleNo
+          if(vehicleNo.indexOf('临') > -1) {
+            throw new Error('设置默认参数')
+          }
           // 设置车牌类型
           this.setVehicleNoType(vehicleNo, vehicles)
           // 赋值

+ 5 - 5
src/pages/parkingFeeV2/mixins/parkingFee.js

@@ -829,6 +829,10 @@ export default {
         }
         if (vehicles.length) {
           // 判断是否存在无牌车
+          if(vehicles[0].vehicleNo.indexOf('临') > -1) {
+            this.isUnlicensed(vehicles)
+            throw new Error('设置默认参数')
+          }
           const vehicleNo = vehicles[0].vehicleNo
           // 设置车牌类型
           this.setVehicleNoType(vehicleNo, vehicles)
@@ -840,17 +844,13 @@ export default {
         }
       } catch (e) {
         // 设置默认参数
-        this.numArr  = '浙,A,,,,,'.split(',')
+        this.numArr = '浙,A,,,,,'.split(',')
       }
     },
     setVehicleNoType(vehicleNo, vehicles) {
-      this.isUnlicensed(vehicles)
       // const item = vehicles.filter(e => e.vehicleNo === vehicleNo)
       const item = vehicles
       if(item.length) {
-        if(item[0].vehicleNo.indexOf('临') > -1) {
-          return true
-        }
         // let label = LICENSE_PLATE_TYPE_ARR.filter(e => e.value == item[0].licensePlateType)
         // const index = ['燃油车牌', '新能源', '特殊车牌'].indexOf(label[0].name)
         const index = item[0].vehicleNo.length === 8 ? 1 : 0