AmandaG преди 1 година
родител
ревизия
457fa60ca8

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

@@ -5,9 +5,6 @@ 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 (
@@ -997,16 +994,9 @@ const ServiceSearch = (val: any, value: any) => {
 const clickmorefilters = () => {
   drawer.value = true
   const incotermsList = JSON.parse(sessionStorage.getItem('incotermsList') as string) || {}
-  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
-    }
+  if (incotermsList) {
+    IncotermsList.value = incotermsList.IncotermsList
+    SeiviceList.value = incotermsList.ServiceList
   }
 }
 </script>

+ 10 - 1
src/components/MoreFilters/src/components/SelectValue.vue

@@ -110,7 +110,7 @@ const clickSeeAll = () => {
 }
 </script>
 <template>
-  <div class="select">
+  <div class="select" :class="{ isDisabled: TransportList.length == 0 }">
     <el-dropdown
       ref="dropdown1"
       trigger="click"
@@ -318,4 +318,13 @@ const clickSeeAll = () => {
 .seeall {
   max-height: fit-content;
 }
+.isDisabled {
+  background-color: #f5f7fa;
+  color: #a8abb2;
+  cursor: not-allowed;
+  box-shadow: none !important;
+}
+.isDisabled:hover {
+  border-color: var(--color-border);
+}
 </style>

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

@@ -401,6 +401,11 @@ const initDataByHeaderSearch = () => {
     // 更新tagsList和TransportList
     TransportListItem.value = data.trackingData.TransportList
     TagsList.value = data.trackingData.tagsList
+    let obj = {
+      IncotermsList: data.trackingData.IncotermsList,
+      ServiceList: data.trackingData.ServiceList
+    }
+    sessionStorage.setItem('incotermsList', JSON.stringify(obj))
     headerSearch.clearSearchData()
     tagsData.value = []
     filterData.transportData = []