Merge branch 'dev_g' of United_Software/k_online_ui into dev

src/components/MoreFilters/src/MoreFilters.vue

@@ -39,16 +39,9 @@ onMounted(() => {
       clearname(InputForm.value, 'General', 'Incoterms')
     } else if (tag.includes('Service')) {
       clearname(InputForm.value, 'General', 'Service')
-    } else if (tag.includes('Vessel')) {
-      clearname(InputForm.value, 'transportation', 'Vessel')
-    } else if (tag.includes('Voyage')) {
-      clearname(InputForm.value, 'transportation', 'Voyage')
-    } else if (tag.includes('Origin')) {
-      clearname(InputForm.value, 'palces', 'Origin')
-    } else if (tag.includes('Destination')) {
-      clearname(InputForm.value, 'palces', 'Destination')
     } else if (tag.includes('Origin Agent')) {
       AddDateType.value = AddDateType.value.filter((item: any) => item.partyType !== 'Origin Agent')
+      console.log(AddDateType.value)
       delete MoreFiltersObj['Origin Agent']
       selectedPartyTypeoptions.value = selectedPartyTypeoptions.value.filter(
         (item: any) => item !== 'Origin Agent'
@@ -119,9 +112,17 @@ onMounted(() => {
       selectedPlacesTypeoptions.value = selectedPlacesTypeoptions.value.filter(
         (item: any) => item !== 'Place of Discharge'
       )
+    } else if (tag.includes('Origin')) {
+      clearname(InputForm.value, 'palces', 'Origin')
+    } else if (tag.includes('Destination')) {
+      clearname(InputForm.value, 'palces', 'Destination')
+    } else if (tag.includes('Vessel')) {
+      clearname(InputForm.value, 'transportation', 'Vessel')
+    } else if (tag.includes('Voyage')) {
+      clearname(InputForm.value, 'transportation', 'Voyage')
     }
   })
-  emitter.on('clearDaterangeObj', () => {
+  emitter.on('clearMoreFiltersObj', () => {
     clearMoreFiltersObj()
   })
 })
@@ -681,7 +682,7 @@ const changeAll = (value: any, countTotal: any, BadegTotal: any) => {
       }
     }
     if (key == 'Service') {
-      if (value[key] != 'Please Select Date Range' && value[key] != '') {
+      if (value[key] != 'Please Select Service' && value[key] != '') {
         countTotal.push(value[key])
       }
     }
@@ -887,7 +888,7 @@ const changeAutoSelectVal = (val: any, value: any, boolaen: any) => {
     isError.value = false
   }
   MoreFiltersObj = { ...MoreFiltersObj, ...val }
-  MoreFiltersObj2 = { ...MoreFiltersObj, ...val }
+  MoreFiltersObj2 = { ...MoreFiltersObj2, ...value }
   // for (const key in value) {
   //   MoreFiltersObj2[key] = value[key]
   // }
@@ -945,7 +946,7 @@ const clearrest = () => {
     },
     General: {
       Incoterms: 'Please Select Date Range',
-      Service: 'Please Select Date Range'
+      Service: 'Please Select Service'
     }
   }
   AddDateType.value = []
@@ -969,6 +970,8 @@ const clearname = (val: any, key1: any, key2: any) => {
     val[key1][key2] = ''
   } else if (key2 == 'Incoterms') {
     val[key1][key2] = 'Please Select Date Range'
+  } else if (key2 == 'Service') {
+    val[key1][key2] = 'Please Select Service'
   } else {
     val[key1][key2] = []
   }
@@ -1165,20 +1168,15 @@ const clickmorefilters = () => {
           </div>
           <div class="ETA">
             <div class="ETD_title">Voyage/Flight</div>
-            <el-input
-              placeholder="Please input voyage or flight no."
-              @change="changeAutoSelectvoyage(InputForm.transportation.Voyage)"
-              v-model="InputForm.transportation.Voyage"
-            ></el-input>
-            <!-- <AutoSelect
+            <AutoSelect
               ASType="voyage"
               :ASSearchObj="props.searchTableQeury"
-              :ASSearchMode="props.isShipment? 'tracking': 'booking'"
+              :ASSearchMode="props.isShipment ? 'tracking' : 'booking'"
               ASSearchFiled="Voyage/Flight"
               @changeAutoSelect="changeAutoSelectvoyage"
               :ASValue="InputForm.transportation.Voyage"
               ASPlaceholder="Please input Voyage or flight no."
-            ></AutoSelect> -->
+            ></AutoSelect>
           </div>
         </el-collapse-item>
         <!-- Others -->

src/components/MoreFilters/src/components/SelectValue.vue

@@ -118,9 +118,22 @@ const clickSeeAll = () => {
       :disabled="TransportList.length == 0"
     >
       <div class="el-dropdown-link">
-        <div v-if="Serval == 'Please Select Date Range' || Serval == ''" class="select_title">
+        <div
+          v-if="
+            props.title == 'Incoterms' && (Serval == 'Please Select Date Range' || Serval == '')
+          "
+          class="select_title"
+        >
           Please Select Date Range
         </div>
+        <div
+          v-else-if="
+            props.title == 'Service' && (Serval == 'Please Select Service' || Serval == '')
+          "
+          class="select_title"
+        >
+          Please Select Service
+        </div>
         <div v-else class="select_title_2">{{ Serval }}</div>
         <span class="iconfont_icon">
           <svg class="iconfont" aria-hidden="true">

src/views/Booking/src/BookingView.vue

@@ -369,12 +369,14 @@ const SearchInput = () => {
         </el-input>
       </div>
       <TransportMode
+        :isShipment="false"
         :TransportListItem="TransportListItem"
         @TransportSearch="TransportSearch"
         @defaultTransport="defaultTransport"
         @clearTransportTags="clearTransportTags"
       ></TransportMode>
       <DateRange
+        :isShipment="false"
         @DateRangeSearch="DateRangeSearch"
         @clearDaterangeTags="clearDaterangeTags"
         @defaultDate="defaultDate"