Merge branch 'dev_g' of United_Software/k_online_ui into dev

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>

src/views/Tracking/src/TrackingView.vue

@@ -400,9 +400,12 @@ 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
+    let obj = {
+      IncotermsList: data.trackingData.IncotermsList,
+      ServiceList: data.trackingData.ServiceList
+    }
+    sessionStorage.setItem('incotermsList', JSON.stringify(obj))
     headerSearch.clearSearchData()
     tagsData.value = []
     filterData.transportData = []