Merge branch 'dev' into dev_zyh

src/auto-imports.d.ts

@@ -3,7 +3,6 @@
 // @ts-nocheck
 // noinspection JSUnusedGlobalSymbols
 // Generated by unplugin-auto-import
-// biome-ignore lint: disable
 export {}
 declare global {
   const $api: typeof import('@/api/index')['default']
@@ -69,6 +68,6 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
   import('vue')
 }

src/components/DateRange/src/DateRange.vue

@@ -53,6 +53,7 @@ const props = defineProps({
 })
 let daterangeObj: any = {}
 const DateStart = ref()
+DateStart.value = []
 const DateEnd = ref()
 DateEnd.value = []
 const DateCreation = ref()

src/components/TransportMode/src/TransportMode.vue

@@ -79,9 +79,11 @@ const handleCheckedTransportChange = (value: any, checked: any, index: any) => {
 // 清除选中
 const clearList = () => {
   checkAll.value = false
-  TransportList.value.forEach((item: any) => {
-    item.checked = false
-  })
+  if (TransportList.value != undefined) {
+    TransportList.value.forEach((item: any) => {
+      item.checked = false
+    })
+  }
   changedata.value = ''
   checkedCount = []
   emit('clearTransportTags')

src/utils/axios.ts

@@ -57,6 +57,7 @@ class HttpAxios {
   _responseInterceptors = (response: AxiosResponse) => {
     if (response.status === 200) {
       if (response.data.code === 401 || response.data.code === 403) {
+        sessionStorage.clear()
         router.push('/login')
         const userStore = useUserStore()
         userStore.logout(false)

src/views/Booking/src/BookingView.vue

@@ -74,14 +74,12 @@ const handleClose = (tag: any) => {
   } else if (tag.includes('Voyage')) {
     delete searchTableQeury['f_voyage/m_voyage']
   }
-  BookingTable_ref.value.searchTableData(searchTableQeury)
   sessionStorage.setItem('searchTableQeury', JSON.stringify(searchTableQeury))
   getbookingdata()
 }
 // 筛选框查询
 const FiltersSeach = (val: any, value: any) => {
   searchTableQeury[val] = value
-  BookingTable_ref.value.searchTableData(searchTableQeury)
   sessionStorage.setItem('searchTableQeury', JSON.stringify(searchTableQeury))
   getbookingdata()
 }
@@ -129,7 +127,6 @@ const defaultDate = (val: any, value: any, data: any) => {
       BookingSearch.value = searchTableQeury._textSearch
     }
   }
-  BookingTable_ref.value.searchTableData(searchTableQeury)
   getbookingdata()
   renderTagsData()
 }
@@ -162,7 +159,6 @@ const DateRangeSearch = (val: any, value: any) => {
       searchTableQeury.created_time_end = value[key].data[1]
     }
   }
-  BookingTable_ref.value.searchTableData(searchTableQeury)
   sessionStorage.setItem('searchTableQeury', JSON.stringify(searchTableQeury))
   getbookingdata()
   renderTagsData()
@@ -213,8 +209,6 @@ const MoreFiltersSearch = (val: any, value: any) => {
       searchTableQeury['f_voyage/m_voyage'] = value[key]
     }
   }
-  // for(const key in value)
-  BookingTable_ref.value.searchTableData(searchTableQeury)
   sessionStorage.setItem('searchTableQeury', JSON.stringify(searchTableQeury))
   getbookingdata()
   renderTagsData()
@@ -278,7 +272,6 @@ const clearfilters = () => {
   emitter.emit('clearTag', 'Vessel')
   emitter.emit('clearTag', 'Voyage')
   searchTableQeury = {}
-  BookingTable_ref.value.searchTableData(searchTableQeury)
   sessionStorage.setItem('searchTableQeury', JSON.stringify(searchTableQeury))
   getbookingdata()
 }
@@ -335,7 +328,10 @@ const getbookingdata = () => {
       if (res.code === 200) {
         TransportListItem.value = res.data.TransportList
         TagsList.value = res.data.tagsList
-        if (BookingSearch.value != '') {
+        sessionStorage.setItem('BookingData', JSON.stringify(res.data))
+        BookingTable_ref.value.searchTableData()
+        // 查询没结果的话显示icon
+        if (BookingSearch.value != '' && BookingSearch.value != undefined) {
           if (res.data.searchData.length == 0) {
             isShowAlertIcon.value = true
           }
@@ -347,7 +343,6 @@ const getbookingdata = () => {
 }
 const changeTag = (val: any) => {
   searchTableQeury.filterTag = val
-  BookingTable_ref.value.searchTableData(searchTableQeury)
   sessionStorage.setItem('searchTableQeury', JSON.stringify(searchTableQeury))
   getbookingdata()
   filterTag.value = val
@@ -355,7 +350,6 @@ const changeTag = (val: any) => {
 // 点击search按钮
 const SearchInput = () => {
   searchTableQeury._textSearch = BookingSearch.value
-  BookingTable_ref.value.searchTableData(searchTableQeury)
   sessionStorage.setItem('searchTableQeury', JSON.stringify(searchTableQeury))
   getbookingdata()
 }

src/views/Booking/src/components/BookingTable/src/BookingTable.vue

@@ -134,34 +134,25 @@ const getTableData = async (isPageChange?: boolean) => {
     })
 }
 // 查询列表数据
-const searchTableData = (data: any) => {
+const searchTableData = () => {
   tableLoadingTableData.value = true
-  filterdataobj = data
-  $api
-    .getBookingTableData({
-      cp: pageInfo.value.pageNo,
-      ps: pageInfo.value.pageSize,
-      rc: -1,
-      other_filed: '',
-      ...data
-    })
-    .then((res: any) => {
-      if (res.code === 200) {
-        assignTableData(res.data)
-      }
-    })
-    .finally(() => {
+  if (sessionStorage.getItem('BookingData') != null) {
+    const data = JSON.parse(sessionStorage.getItem('BookingData') as string) || {}
+    assignTableData(data)
+    setTimeout(() => {
       selectedNumber.value = 0
       selectedTableData.value = []
       nextTick(() => {
         tableRef.value && autoWidth(bookingTable.value, tableRef.value)
         tableLoadingTableData.value = false
+        sessionStorage.removeItem('BookingData')
       })
-    })
+    }, 100)
+  }
 }
 
 onMounted(() => {
-  Promise.all([getTableColumns(), getTableData()]).finally(() => {
+  Promise.all([getTableColumns()]).finally(() => {
     nextTick(() => {
       tableRef.value && autoWidth(bookingTable.value, tableRef.value)
     })

src/views/Layout/src/components/Menu/MenuView.vue

@@ -115,12 +115,17 @@ const isVisible = ref(false)
 const emits = defineEmits(['changeVisible'])
 // 路由跳转函数
 const changeRouter = (path: any) => {
-  if (sessionStorage.getItem('searchTableQeury') == '{}') {
+  if (sessionStorage.getItem('searchTableQeury')) {
     sessionStorage.removeItem('searchTableQeury')
   }
-  if (sessionStorage.getItem('searchTableQeuryTracking') == '{}') {
+  if (sessionStorage.getItem('searchTableQeuryTracking')) {
     sessionStorage.removeItem('searchTableQeuryTracking')
   }
+  if (sessionStorage.getItem('clickParams')) {
+    sessionStorage.removeItem('clickParams')
+    sessionStorage.removeItem('reportList')
+    sessionStorage.removeItem('tagsList')
+  }
   isVisible.value = false
   emits('changeVisible', isVisible.value)
   isVisible.value = false

src/views/Tracking/src/TrackingView.vue

@@ -29,6 +29,15 @@ const handleClose = (tag: any) => {
   tagsData.value.splice(tagsData.value.indexOf(tag), 1)
   if (tag.includes('Transport')) {
     delete searchTableQeuryTracking.transport_mode
+  } else if (tag.includes('Day') || tag.includes('CO2e')) {
+    delete searchTableQeuryTracking._reportRef
+    delete searchTableQeuryTracking._reportType
+    delete searchTableQeuryTracking._reportRefe_date
+    delete searchTableQeuryTracking._reportRefb_date
+    delete searchTableQeuryTracking._reportStationType
+    delete searchTableQeuryTracking._reportDataType
+    delete searchTableQeuryTracking._reportStationType
+    filterData.dashboardData = []
   } else if (tag.includes('ETD')) {
     filterData.daterangeData.forEach((item: any, index: any) => {
       if (item.includes('ETD')) {
@@ -70,6 +79,8 @@ const handleClose = (tag: any) => {
     delete searchTableQeuryTracking.sales_rep
   } else if (tag.includes('Origin')) {
     delete searchTableQeuryTracking['shipper_city/consignee_city']
+    delete searchTableQeuryTracking._city_name
+    filterData.dashboardData = []
   } else if (tag.includes('Destination')) {
     delete searchTableQeuryTracking.final_desination
   } else if (tag.includes('Place of Receipt')) {
@@ -84,22 +95,13 @@ const handleClose = (tag: any) => {
     delete searchTableQeuryTracking['f_vessel/vessel']
   } else if (tag.includes('Voyage')) {
     delete searchTableQeuryTracking['f_voyage/voyage']
-  } else {
-    delete searchTableQeuryTracking._reportRef
-    delete searchTableQeuryTracking._reportRefe_date
-    delete searchTableQeuryTracking._reportRefb_date
-    delete searchTableQeuryTracking._reportStationType
-    delete searchTableQeuryTracking._reportDataType
-    delete searchTableQeuryTracking._reportStationType
   }
-  TrackingTable_ref.value.searchTableData(searchTableQeuryTracking)
   sessionStorage.setItem('searchTableQeuryTracking', JSON.stringify(searchTableQeuryTracking))
   Gettrackingdata()
 }
 // 筛选框查询
 const FiltersSeach = (val: any, value: any) => {
   searchTableQeuryTracking[val] = value
-  TrackingTable_ref.value.searchTableData(searchTableQeuryTracking)
   sessionStorage.setItem('searchTableQeuryTracking', JSON.stringify(searchTableQeuryTracking))
   Gettrackingdata()
 }
@@ -130,7 +132,6 @@ const defaultTransport = (val: any, value: any) => {
   } else {
     searchTableQeuryTracking = value
   }
-  renderTagsData()
 }
 //defaultDate
 const defaultDate = (val: any, value: any, data: any) => {
@@ -166,7 +167,6 @@ const defaultDate = (val: any, value: any, data: any) => {
     // 根据顶部搜索框的搜索结果赋值
     initDataByHeaderSearch()
   } else {
-    TrackingTable_ref.value.searchTableData(searchTableQeuryTracking)
     Gettrackingdata()
   }
   renderTagsData()
@@ -200,7 +200,6 @@ const DateRangeSearch = (val: any, value: any) => {
       searchTableQeuryTracking.created_time_end = value[key].data[1]
     }
   }
-  TrackingTable_ref.value.searchTableData(searchTableQeuryTracking)
   sessionStorage.setItem('searchTableQeuryTracking', JSON.stringify(searchTableQeuryTracking))
   Gettrackingdata()
   renderTagsData()
@@ -269,7 +268,6 @@ const MoreFiltersSearch = (val: any, value: any) => {
       searchTableQeuryTracking['f_voyage/voyage'] = value[key]
     }
   }
-  TrackingTable_ref.value.searchTableData(searchTableQeuryTracking)
   sessionStorage.setItem('searchTableQeuryTracking', JSON.stringify(searchTableQeuryTracking))
   Gettrackingdata()
   renderTagsData()
@@ -322,7 +320,6 @@ const defaultMorefilters = (val: any, value: any, data: any) => {
       searchTableQeuryTracking = data
     }
   }
-  renderTagsData()
 }
 const clearfilters = () => {
   TrackingSearch.value = ''
@@ -354,7 +351,6 @@ const clearfilters = () => {
   emitter.emit('clearTag', 'Vessel')
   emitter.emit('clearTag', 'Voyage')
   searchTableQeuryTracking = {}
-  TrackingTable_ref.value.searchTableData(searchTableQeuryTracking)
   sessionStorage.setItem('searchTableQeuryTracking', JSON.stringify(searchTableQeuryTracking))
   Gettrackingdata()
 }
@@ -466,6 +462,7 @@ interface ListItem {
 }
 const TagsList = ref<ListItem[]>([])
 const filterTag = ref(['All'])
+const isShowAlertIcon = ref(false)
 const Gettrackingdata = () => {
   $api
     .getTrackingTableData({
@@ -484,6 +481,16 @@ const Gettrackingdata = () => {
           ServiceList: res.data.ServiceList
         }
         sessionStorage.setItem('incotermsList', JSON.stringify(obj))
+        sessionStorage.setItem('TrackingData', JSON.stringify(res.data))
+        TrackingTable_ref.value.searchTableData()
+        // 查询没结果的话显示icon
+        if (TrackingSearch.value != '' && TrackingSearch.value != undefined) {
+          if (res.data.searchData.length == 0) {
+            isShowAlertIcon.value = true
+          }
+        } else {
+          isShowAlertIcon.value = false
+        }
       }
     })
 }
@@ -504,66 +511,13 @@ onMounted(() => {
       let str = `${data.title}:${data.name}`
       filterData.dashboardData.push(str)
     }
-    // else {
-    //   if (reportlist._reportStationType == 'shippr_uncode' && data.title.includes('Origin')) {
-    //     let str = `Origin: ${data.data}`
-    //     filterData.morefiltersData.push(str)
-    //     console.log(2, filterData.morefiltersData)
-    //   } else if (
-    //     reportlist._reportStationType == 'consignee_uncode' &&
-    //     data.title.includes('Destination')
-    //   ) {
-    //     let str = `Destination: ${data.data}`
-    //     filterData.morefiltersData.push(str)
-    //   } else {
-    //     let str = `${data.title}:${data.name}`
-    //     filterData.dashboardData.push(str)
-    //   }
-    // }
     sessionStorage.setItem('searchTableQeuryTracking', JSON.stringify(searchTableQeuryTracking))
     Gettrackingdata()
   }
-  // else {
-  //   if (sessionStorage.getItem('searchTableQeuryTracking') != null) {
-  //     const testTracking =
-  //       JSON.parse(sessionStorage.getItem('searchTableQeuryTracking') as string) || {}
-  //     if (testTracking._reportRef) {
-  //       const data = JSON.parse(sessionStorage.getItem('tagsList') as string) || {}
-  //       const reportlist = JSON.parse(sessionStorage.getItem('reportList') as string) || {}
-  //       console.log(searchTableQeuryTracking)
-  //       for (const key in reportlist) {
-  //         searchTableQeuryTracking[key] = reportlist[key]
-  //       }
-  //       if (reportlist._city_name == '') {
-  //         let str = `${data.title}:${data.name}`
-  //         filterData.dashboardData.push(str)
-  //         console.log(5, filterData.dashboardData)
-  //       } else {
-  //         if (reportlist._reportStationType == 'shippr_uncode' && data.title.includes('Origin')) {
-  //           let str = `Origin: ${data.data}`
-  //           filterData.morefiltersData.push(str)
-  //           console.log(6, filterData.dashboardData)
-  //         } else if (
-  //           reportlist._reportStationType == 'consignee_uncode' &&
-  //           data.title.includes('Destination')
-  //         ) {
-  //           let str = `Destination: ${data.data}`
-  //           filterData.morefiltersData.push(str)
-  //           console.log(7, filterData.dashboardData)
-  //         } else {
-  //           let str = `${data.title}:${data.name}`
-  //           filterData.dashboardData.push(str)
-  //           console.log(8, filterData.dashboardData)
-  //         }
-  //       }
-  //     }
-  //   }
-  // }
   renderTagsData()
 })
 const changeTag = (val: any) => {
   searchTableQeuryTracking.filterTag = val
-  TrackingTable_ref.value.searchTableData(searchTableQeuryTracking)
   filterTag.value = val
   sessionStorage.setItem('searchTableQeuryTracking', JSON.stringify(searchTableQeuryTracking))
   Gettrackingdata()
@@ -571,7 +525,6 @@ const changeTag = (val: any) => {
 // 点击search按钮
 const SearchInput = () => {
   searchTableQeuryTracking._textSearch = TrackingSearch.value
-  TrackingTable_ref.value.searchTableData(searchTableQeuryTracking)
   sessionStorage.setItem('searchTableQeuryTracking', JSON.stringify(searchTableQeuryTracking))
   Gettrackingdata()
 }
@@ -594,6 +547,22 @@ const SearchInput = () => {
               </svg>
             </span>
           </template>
+          <template #suffix>
+            <el-tooltip
+              v-if="isShowAlertIcon"
+              :offset="6"
+              popper-class="ShowAlerIcon"
+              effect="dark"
+              content="We support the following references number to find bookings:· Booking No./HAWB No./MAWB No./PO No./Carrier Booking No./Contract No./File No./Quote No."
+              placement="bottom"
+            >
+              <span class="iconfont_icon iconfont_icon_tip">
+                <svg class="iconfont" aria-hidden="true">
+                  <use xlink:href="#icon-icon_info_b"></use>
+                </svg>
+              </span>
+            </el-tooltip>
+          </template>
         </el-input>
       </div>
       <TransportMode

src/views/Tracking/src/components/TrackingTable/src/TrackingTable.vue

@@ -153,9 +153,6 @@ const getTableData = async (isPageChange?: boolean) => {
   ) {
     const data = JSON.parse(sessionStorage.getItem('clickParams') as string) || {}
     assignTableData(data)
-    setTimeout(() => {
-      sessionStorage.removeItem('clickParams')
-    }, 5000)
     nextTick(() => {
       tableRef.value && autoWidth(trackingTable.value, tableRef.value)
       tableLoadingTableData.value = false
@@ -188,28 +185,21 @@ const getTableData = async (isPageChange?: boolean) => {
 }
 
 // 查询列表数据
-const searchTableData = (data: any) => {
+const searchTableData = () => {
   tableLoadingTableData.value = true
-  filterdataobj = data
-  $api
-    .getTrackingTableData({
-      cp: pageInfo.value.pageNo,
-      ps: pageInfo.value.pageSize,
-      rc: -1,
-      other_filed: '',
-      ...data
-    })
-    .then((res: any) => {
-      if (res.code === 200) {
-        assignTableData(res.data)
-      }
-    })
-    .finally(() => {
-      tableRef.value && autoWidth(trackingTable.value, tableRef.value)
-      tableLoadingTableData.value = false
+  if (sessionStorage.getItem('TrackingData') != null) {
+    const data = JSON.parse(sessionStorage.getItem('TrackingData') as string) || {}
+    assignTableData(data)
+    setTimeout(() => {
       selectedNumber.value = 0
       selectedTableData.value = []
-    })
+      nextTick(() => {
+        tableRef.value && autoWidth(trackingTable.value, tableRef.value)
+        tableLoadingTableData.value = false
+        sessionStorage.removeItem('TrackingData')
+      })
+    }, 100)
+  }
 }
 
 onMounted(() => {