AmandaG 1 gadu atpakaļ
vecāks
revīzija
264e64b95a

+ 13 - 3
src/components/MoreFilters/src/MoreFilters.vue

@@ -5,6 +5,9 @@ import SelectAutoSelect from '@/components/SelectAutoSelect'
 import SelectTableSelect from '@/components/SelectTableSelect'
 import { ref, onMounted, onBeforeMount, computed } from 'vue'
 import SelectTable from '@/components/SelectTable/src/SelectTable.vue'
+import { useHeaderSearch } from '@/stores/modules/headerSearch'
+
+const headerSearch = useHeaderSearch()
 
 onMounted(() => {
   if (
@@ -994,9 +997,16 @@ const ServiceSearch = (val: any, value: any) => {
 const clickmorefilters = () => {
   drawer.value = true
   const incotermsList = JSON.parse(sessionStorage.getItem('incotermsList') as string) || {}
-  if (incotermsList) {
-    IncotermsList.value = incotermsList.IncotermsList
-    SeiviceList.value = incotermsList.ServiceList
+  const data = JSON.parse(localStorage.getItem('searchData'))
+  if (data) {
+    IncotermsList.value = data.IncotermsList
+    SeiviceList.value = data.ServiceList
+    headerSearch.clearSearchData()
+  } else {
+    if (incotermsList) {
+      IncotermsList.value = incotermsList.IncotermsList
+      SeiviceList.value = incotermsList.ServiceList
+    }
   }
 }
 </script>

+ 0 - 2
src/views/Tracking/src/TrackingView.vue

@@ -400,8 +400,6 @@ const initDataByHeaderSearch = () => {
     TrackingTable_ref.value.getSharedTableData()
     // 更新tagsList和TransportList
     TransportListItem.value = data.trackingData.TransportList
-    IncotermsList.value = data.trackingData.IncotermsList
-    ServiceList.value = data.trackingData.ServiceList
     TagsList.value = data.trackingData.tagsList
     headerSearch.clearSearchData()
     tagsData.value = []