Merge branch 'dev' into dev_zyh

src/components/AutoSelect/src/AutoSelect.vue

@@ -44,6 +44,13 @@ watch(
     value.value = current
   }
 )
+watch(
+  () => props.ASSearchObj,
+  (current) => {
+    console.log(current)
+    MoreFiltersObj.value = current
+  }
+)
 const remoteMethod = (query: string) => {
   if (query) {
     loading.value = true

src/components/MoreFilters/src/MoreFilters.vue

@@ -3,7 +3,7 @@ import emitter from '@/utils/bus'
 import AutoSelect from '@/components/AutoSelect'
 import SelectAutoSelect from '@/components/SelectAutoSelect'
 import SelectTableSelect from '@/components/SelectTableSelect'
-import { ref, onMounted, onBeforeMount, computed } from 'vue'
+import { ref, onMounted, onBeforeMount, computed, watch } from 'vue'
 import SelectTable from '@/components/SelectTable/src/SelectTable.vue'
 
 onMounted(() => {
@@ -41,7 +41,6 @@ onMounted(() => {
       clearname(InputForm.value, 'General', 'Service')
     } 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'
@@ -771,9 +770,7 @@ const changeAutoSelectvessel = (val: any) => {
   changeAutoSelect(InputForm.value, val, 'InputForm', 'transportation', 'Vessel')
 }
 const changeAutoSelectvoyage = (val: any) => {
-  // changeAutoSelect(InputForm.value, val, 'InputForm', 'transportation', 'Voyage')
-  MoreFiltersObj.Voyage = val
-  MoreFiltersObj2.Voyage = val
+  changeAutoSelect(InputForm.value, val, 'InputForm', 'transportation', 'Voyage')
 }
 const check = (row: any, value: any, key1: any, key2: any) => {
   value[key1][key2] = row
@@ -1003,6 +1000,13 @@ const clickmorefilters = () => {
     SeiviceList.value = incotermsList.ServiceList
   }
 }
+const searchTableQeurytest = ref(props.searchTableQeury)
+watch(
+  () => props.searchTableQeury,
+  (current) => {
+    searchTableQeurytest.value = current
+  }
+)
 </script>
 <template>
   <div>
@@ -1056,7 +1060,7 @@ const clickmorefilters = () => {
             <AutoSelect
               ASType="contanct"
               ASSearchFiled="Shipper Name"
-              :ASSearchObj="props.searchTableQeury"
+              :ASSearchObj="searchTableQeurytest"
               :ASSearchMode="props.isShipment ? 'tracking' : 'booking'"
               @changeAutoSelect="changeAutoSelectshippername"
               :ASValue="InputForm.parties.Shippername"
@@ -1069,7 +1073,7 @@ const clickmorefilters = () => {
             <AutoSelect
               ASType="contanct"
               ASSearchFiled="Consignee Name"
-              :ASSearchObj="props.searchTableQeury"
+              :ASSearchObj="searchTableQeurytest"
               :ASSearchMode="props.isShipment ? 'tracking' : 'booking'"
               @changeAutoSelect="changeAutoSelectconsigneename"
               :ASValue="InputForm.parties.Consigneename"
@@ -1082,7 +1086,7 @@ const clickmorefilters = () => {
             :AddDateType="AddDateType"
             :ASSearchMode="props.isShipment ? 'tracking' : 'booking'"
             :DateTypeoptions="PartyTypeoptions"
-            :ASSearchObj="props.searchTableQeury"
+            :ASSearchObj="searchTableQeurytest"
             @changeAutoSelectAddType="changeAutoSelectAddType"
             @changeAutoSelect="changeAutoSelectVal"
             :selectedPartyTypeoptions="selectedPartyTypeoptions"
@@ -1108,7 +1112,7 @@ const clickmorefilters = () => {
             <div class="ETD_title">Origin</div>
             <SelectTable
               ASSearchFiled="Origin"
-              :ASSearchObj="props.searchTableQeury"
+              :ASSearchObj="searchTableQeurytest"
               :ASSearchMode="props.isShipment ? 'tracking' : 'booking'"
               :searchInput="InputForm.palces.Origin"
               @check="checkorigin"
@@ -1118,14 +1122,14 @@ const clickmorefilters = () => {
             <div class="ETD_title">Destination</div>
             <SelectTable
               ASSearchFiled="Destination"
-              :ASSearchObj="props.searchTableQeury"
+              :ASSearchObj="searchTableQeurytest"
               :ASSearchMode="props.isShipment ? 'tracking' : 'booking'"
               :searchInput="InputForm.palces.Destination"
               @check="checkdestination"
             />
           </div>
           <SelectTableSelect
-            :TablesearchTableQeury="props.searchTableQeury"
+            :TablesearchTableQeury="searchTableQeurytest"
             :TablesearchMode="props.isShipment ? 'tracking' : 'booking'"
             ref="placeSelectTableSelectRef"
             :AddDateType="AddDatePlaceType"
@@ -1158,7 +1162,7 @@ const clickmorefilters = () => {
             <AutoSelect
               ASType="vessel"
               ASSearchFiled="Vessel"
-              :ASSearchObj="props.searchTableQeury"
+              :ASSearchObj="searchTableQeurytest"
               :ASSearchMode="props.isShipment ? 'tracking' : 'booking'"
               @changeAutoSelect="changeAutoSelectvessel"
               :ASValue="InputForm.transportation.Vessel"
@@ -1170,7 +1174,7 @@ const clickmorefilters = () => {
             <div class="ETD_title">Voyage/Flight</div>
             <AutoSelect
               ASType="voyage"
-              :ASSearchObj="props.searchTableQeury"
+              :ASSearchObj="searchTableQeurytest"
               :ASSearchMode="props.isShipment ? 'tracking' : 'booking'"
               ASSearchFiled="Voyage/Flight"
               @changeAutoSelect="changeAutoSelectvoyage"

src/components/TransportMode/src/TransportMode.vue

@@ -79,7 +79,6 @@ const handleCheckedTransportChange = (value: any, checked: any, index: any) => {
 // 清除选中
 const clearList = () => {
   checkAll.value = false
-  console.log(TransportList.value)
   TransportList.value.forEach((item: any) => {
     item.checked = false
   })
@@ -103,7 +102,6 @@ const TransportSearch = (visible: any) => {
       checkedCount = [...map.keys()]
     }
   })
-  console.log(checkedCount)
   if (checkedCount.length == TransportList.value.length) {
     changedata.value = 'All'
   } else {

src/styles/theme.scss

@@ -53,10 +53,10 @@
   --color-tag-booked: #bf66ea;
   --color-tag-all: #ed6d00;
   --color-tag-cargo-received: #5963c0;
-  --color-tag-departure: #d9edfa;
+  --color-tag-departure: #0090e9;
   --color-tag-arrived: #01b7a1;
   --color-tag-completed: #5bb462;
-  --color-tag-Departed: #d9edfa;
+  --color-tag-Departed: #0090e9;
 
   --color-tag-confirmed-bg: #e8fbe4;
   --color-tag-cancelled-bg: #ebeef1;
@@ -64,10 +64,10 @@
   --color-tag-booked-bg: #f3e6fa;
   --color-tag-all-bg: #ffe5cf;
   --color-tag-cargo-received-bg: #eaecff;
-  --color-tag-departure-bg: #0090e9;
+  --color-tag-departure-bg: #d9edfa;
   --color-tag-arrived-bg: #e7faf8;
   --color-tag-completed-bg: #e8fbe4;
-  --color-tag-Departed-bg: #0090e9;
+  --color-tag-Departed-bg: #d9edfa;
 
   --color-border: #eaebed;
   --color-border-1: #e8eaee;

src/views/Dashboard/src/components/ScoringSystem.vue

@@ -143,6 +143,8 @@ smileAspects.value = [
 ]
 const closeDialog = () => {
   isShowAngry.value = false
+  innerVisible.value = false
+  dialogVisible.value = false
   isShowHappy.value = false
   isShowSmile.value = false
   isshowDetails_submit.value = false
@@ -154,6 +156,7 @@ const closeDialog = () => {
     item.radio = ''
   })
   buttonDisabled.value = true
+  inputdetails.value = ''
 }
 const mouseenter = (item: any) => {
   item.src = item.itemsrc