Merge branch 'test' into dev_zyh

src/components/TransportMode/src/TransportMode.vue

@@ -141,15 +141,17 @@ const defaultTransport = () => {
       } else {
         searchTableQeuryTracking.value =
           JSON.parse(sessionStorage.getItem('searchTableQeuryTracking') as string) || {}
-        if (searchTableQeuryTracking.value.transport_mode.length !== 0) {
-          TransportData.data = searchTableQeuryTracking.value.transport_mode
-          searchTableQeuryTracking.value.transport_mode.forEach((item: any) => {
-            if (item == 'All') {
-              checkAll.value = true
-            } else {
-              checkAll.value = false
-            }
-          })
+        if (searchTableQeuryTracking.value.transport_mode != undefined) {
+          if (searchTableQeuryTracking.value.transport_mode.length !== 0) {
+            TransportData.data = searchTableQeuryTracking.value.transport_mode
+            searchTableQeuryTracking.value.transport_mode.forEach((item: any) => {
+              if (item == 'All') {
+                checkAll.value = true
+              } else {
+                checkAll.value = false
+              }
+            })
+          }
         } else {
           TransportData.data = []
           checkAll.value = false
@@ -180,15 +182,17 @@ const defaultTransport = () => {
     } else {
       searchTableQeury.value =
         JSON.parse(sessionStorage.getItem('searchTableQeury') as string) || {}
-      if (searchTableQeury.value.transport_mode.length !== 0) {
-        TransportData.data = searchTableQeury.value.transport_mode
-        searchTableQeury.value.transport_mode.forEach((item: any) => {
-          if (item == 'All') {
-            checkAll.value = true
-          } else {
-            checkAll.value = false
-          }
-        })
+      if (searchTableQeury.value.transport_mode !== undefined) {
+        if (searchTableQeury.value.transport_mode.length !== 0) {
+          TransportData.data = searchTableQeury.value.transport_mode
+          searchTableQeury.value.transport_mode.forEach((item: any) => {
+            if (item == 'All') {
+              checkAll.value = true
+            } else {
+              checkAll.value = false
+            }
+          })
+        }
       } else {
         TransportData.data = []
         checkAll.value = false

src/views/Booking/src/BookingView.vue

@@ -89,7 +89,7 @@ const FiltersSeach = (val: any, value: any) => {
 //TransportSearch
 const TransportSearch = (val: any) => {
   filterData.transportData = []
-  if (val.data) {
+  if (val.data.length != 0) {
     let str = `${val.title}:${val.data}`
     filterData.transportData.push(str)
   }
@@ -99,7 +99,7 @@ const TransportSearch = (val: any) => {
 // defaultTransport
 const defaultTransport = (val: any, value: any) => {
   filterData.transportData = []
-  if (val.data) {
+  if (val.data.length != 0) {
     let str = `${val.title}:${val.data}`
     filterData.transportData.push(str)
   }

src/views/Tracking/src/TrackingView.vue

@@ -154,7 +154,7 @@ const FiltersSeach = (val: any, value: any) => {
 //TransportSearch
 const TransportSearch = (val: any) => {
   filterData.transportData = []
-  if (val.data) {
+  if (val.data.length != 0) {
     let str = `${val.title}:${val.data}`
     filterData.transportData.push(str)
   }
@@ -164,7 +164,7 @@ const TransportSearch = (val: any) => {
 // defaultTransport
 const defaultTransport = (val: any, value: any) => {
   filterData.transportData = []
-  if (val.data) {
+  if (val.data.length !=0) {
     let str = `${val.title}:${val.data}`
     filterData.transportData.push(str)
   }
@@ -259,7 +259,6 @@ const DateRangeSearch = (val: any, value: any) => {
 }
 //MoreFiltersSearch
 const MoreFiltersSearch = (val: any, value: any) => {
-  console.log(val,value)
   filterData.morefiltersData = []
   if (Object.keys(value).length == 0) {
     delete searchTableQeuryTracking.shipper