Merge remote-tracking branch 'origin/master'

src/components/orderInfo/index.vue

@@ -240,8 +240,11 @@ const ORDER_PAYTYPE = computed(() => {
   return $storeinitData.state.dictData["ORDER_PAYTYPE"] || [];
 });
 const VEHICLE_MODEL_TYPE = computed(() => {
-  return $storeinitData.state.dictData["VAN_TYPE"] || [];
+  return $storeinitData.state.dictData["VEHICLE_TYPE"] || [];
 });
+const USE_USER_TYPE = computed(() => {
+  return $storeinitData.state.dictData['USE_USER_TYPE'] || []
+})
 
 const NEW_CSMSN_APPLY_REASON = computed(() => {
   return $storeinitData.state.dictData["NEW_CSMSN_APPLY_REASON"] || [];
@@ -485,7 +488,7 @@ function init(data) {
     },
     {
       label: "车辆类型",
-      value: getDictLabel(vehicleTypes, data.carInfo?.vehicleType),
+      value: data.carInfo?.vehicleType,
     },
     {
       label: "客货类型",
@@ -513,7 +516,7 @@ function init(data) {
     },
     {
       label: "经营范围",
-      value: getDictLabel(jyfwList, data.carInfo?.useUserType),
+      value: getDictLabel(USE_USER_TYPE, data.carInfo?.useUserType),
     },
     { label: "车辆识别代号", value: data.carInfo?.vehicleVin },
     { label: "发动机号码", value: data.carInfo?.vehicleEngineNum },

src/store/tabValue.ts

@@ -41,6 +41,9 @@ export default createStore<any>({
       } else {
         const tabSign = context.getters.contains(value.data)
         const tabData = value.data.split(',')
+        if(tabData[0] == 'undefined' || tabData[1] == 'undefined'){
+          return
+        }
         if (tabSign !== -1) {
           //判断标签是否存在,存在则进行跳转
           context.commit('UpdateETV', tabSign + '')

src/views/onlineBusinessHall/automobileSeroice/selfServiceOrder/orderInfo.vue

@@ -170,9 +170,11 @@
         return $storeinitData.state.dictData['PAYMENT_STATE'] || []
     })
     const VEHICLE_MODEL_TYPE = computed(() => {
-        return $storeinitData.state.dictData['VEHICLE_MODEL_TYPE'] || []
+        return $storeinitData.state.dictData['VEHICLE_TYPE'] || []
+    })
+    const USE_USER_TYPE = computed(() => {
+      return $storeinitData.state.dictData['USE_USER_TYPE'] || []
     })
-
     const NEW_CSMSN_APPLY_REASON = computed(() => {
         return $storeinitData.state.dictData['NEW_CSMSN_APPLY_REASON'] || []
     })
@@ -275,14 +277,14 @@
         vehicleInfoList = [
             { label: '车牌号', value: data?.vehiclePlate },
             { label: '车牌颜色', value: getDictLabel(VEHICLE_COLOR_TYPE, data?.vehiclePlateColor) },
-            { label: '车辆类型', value: getDictLabel(vehicleTypes, data?.vehicleType) },
+            { label: '车辆类型', value: data?.vehicleType },
             { label: '客货类型', value: getDictLabel(VEHICLE_MODEL_TYPE, data?.vehicleClass) },
             { label: '车辆品牌', value: data?.orderInfoExt?.vehicleModel },
             { label: '所有人', value: data?.ownerName },
             { label: '行驶证主页', value: data?.orderInfoExt?.vehPosImgUrl, type: 'image', index: 4 },
             { label: '行驶证副页', value: data?.orderInfoExt?.vehNegImgUrl, type: 'image', index: 5 },
             { label: '车身45°照', value: data?.orderInfoExt?.vehBodyUrl, type: 'image', index: 6 },
-            { label: '经营范围', value: getDictLabel(jyfwList, data?.orderInfoExt?.useUserType) },
+            { label: '经营范围', value: getDictLabel(USE_USER_TYPE, data?.orderInfoExt?.useUserType) },
             { label: '车辆识别代号', value: data?.orderInfoExt?.vehicleVin },
             { label: '发动机号码', value: data?.orderInfoExt?.vehicleEngineNum },
             { label: '发证日期', value: data?.issueDate },

src/views/onlineBusinessHall/orderManagement/orderReview/orderInfo.vue

@@ -126,9 +126,6 @@
     const listData: any = ref([])
 
     //车辆类型
-    const vehicleTypes = computed(() => {
-        return $storeinitData.state.dictData['USE_USER_TYPE'] || []
-    })
     const EXPRESS_DELIVERY_COMPANY = computed(() => {
         return $storeinitData.state.dictData['EXPRESS_DELIVERY_COMPANY'] || []
     })
@@ -167,9 +164,11 @@
         return $storeinitData.state.dictData['PAYMENT_STATE'] || []
     })
     const VEHICLE_MODEL_TYPE = computed(() => {
-        return $storeinitData.state.dictData['VAN_TYPE'] || []
+        return $storeinitData.state.dictData['VEHICLE_TYPE'] || []
+    })
+    const USE_USER_TYPE = computed(() => {
+      return $storeinitData.state.dictData['USE_USER_TYPE'] || []
     })
-
     const NEW_CSMSN_APPLY_REASON = computed(() => {
         return $storeinitData.state.dictData['NEW_CSMSN_APPLY_REASON'] || []
     })
@@ -274,14 +273,14 @@
         vehicleInfoList = [
             { label: '车牌号', value: data.carInfo?.vehiclePlate },
             { label: '车牌颜色', value: getDictLabel(VEHICLE_COLOR_TYPE, data.carInfo?.vehiclePlateColor) },
-            { label: '车辆类型', value: getDictLabel(vehicleTypes, data.carInfo?.vehicleType) },
-            { label: '客货类型', value: getDictLabel(VEHICLE_MODEL_TYPE, data.carInfo?.vehicleClass) },
+            { label: '车辆类型', value: data.carInfo?.vehicleType},
+            { label: '收费车型', value: getDictLabel(VEHICLE_MODEL_TYPE, data.carInfo?.vehicleClass) },
             { label: '车辆品牌', value: data.carInfo?.vehicleModel },
             { label: '所有人', value: data.carInfo?.ownerName },
             { label: '行驶证主页', value: data.carInfo?.vehPosImgUrl, type: 'image', index: 4 },
             { label: '行驶证副页', value: data.carInfo?.vehNegImgUrl, type: 'image', index: 5 },
             { label: '车身45°照', value: data.carInfo?.vehBodyUrl, type: 'image', index: 6 },
-            { label: '经营范围', value: getDictLabel(jyfwList, data.carInfo?.useUserType) },
+            { label: '经营范围', value: getDictLabel(USE_USER_TYPE, data.carInfo?.useUserType) },
             { label: '车辆识别代号', value: data.carInfo?.vehicleVin },
             { label: '发动机号码', value: data.carInfo?.vehicleEngineNum },
             { label: '发证日期', value: data.carInfo?.issueDate },