Kaynağa Gözat

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

fix(KIP-12320): 【DE】【C端】临时停车。当有牌车和无牌车(进场时间更早)都在场内时,不会跳转到无牌车tab页下
Tron 1 yıl önce
ebeveyn
işleme
17b8827c2e

+ 8 - 20
src/pages/parkingFee/mixins/parkingFee.js

@@ -213,37 +213,25 @@ export default {
         // const userVehicles = await getVehicles(this.kipUserId)
         if (!vehicles.length) {
           throw new Error('设置默认参数')
-          // vehicles = userVehicles.content
         }
-        if (vehicles.length) {
-          // 判断是否存在无牌车
-          const vehicleNo = vehicles[0].vehicleNo
-          if(vehicleNo.indexOf('临') > -1) {
-            throw new Error('设置默认参数')
-          }
-          // 设置车牌类型
-          this.setVehicleNoType(vehicleNo, vehicles)
-          // 赋值
-          this.numArr = vehicles[0].vehicleNo.split('');
-          this.vehicleNumber = vehicles[0].vehicleNo;
-        } else {
+        // 判断是否存在无牌车
+        const vehicleNo = vehicles[0].vehicleNo
+        if(vehicleNo.indexOf('临') > -1) {
           throw new Error('设置默认参数')
         }
+        // 设置车牌类型
+        this.setVehicleNoType(vehicleNo, vehicles)
+        // 赋值
+        this.numArr = vehicles[0].vehicleNo.split('');
+        this.vehicleNumber = vehicles[0].vehicleNo;
       } catch (e) {
         // 设置默认参数
         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
         this.$refs['k-tab'].changeTab(index)
         return true

+ 1 - 1
src/pages/parkingFee/parkingFee.vue

@@ -46,7 +46,7 @@
                 <div class="search_tip_1" :style="{paddingTop: supportUnlicensed? '0': '32px'}">
                   <div class="title">车辆类型</div>
                   <!-- 删除-KIP-11259 -->
-                  <k-tab type="fill" @change="toggleType" :tabs="['普通车牌', '新能源', '特殊车牌']" />
+                  <k-tab ref="k-tab" type="fill" @change="toggleType" :tabs="['普通车牌', '新能源', '特殊车牌']" />
                   <!-- KIP-11258 <k-tab :defaultCurrent="currentTabType" type="fill" @change="toggleType" :tabs="['燃油车牌', '新能源', '特殊车牌']" /> -->
                 </div>
                 <!-- <div class="search_tip">