Merge branch 'dev_g' of United_Software/k_online_ui into dev

src/auto-imports.d.ts

@@ -3,7 +3,6 @@
 // @ts-nocheck
 // noinspection JSUnusedGlobalSymbols
 // Generated by unplugin-auto-import
-// biome-ignore lint: disable
 export {}
 declare global {
   const $api: typeof import('@/api/index')['default']

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 } from 'vue'
+import { ref, onMounted, onBeforeMount, computed } from 'vue'
 import SelectTable from '@/components/SelectTable/src/SelectTable.vue'
 
 onMounted(() => {
@@ -38,6 +38,26 @@ onMounted(() => {
       selectedPartyTypeoptions.value = selectedPartyTypeoptions.value.filter(
         (item: any) => item !== 'Destination Agent'
       )
+    } else if (tag.includes('Notify Party')) {
+      AddDateType.value = AddDateType.value.filter((item: any) => item.partyType !== 'Notify Party')
+      delete MoreFiltersObj['Notify Party']
+      selectedPartyTypeoptions.value = selectedPartyTypeoptions.value.filter(
+        (item: any) => item !== 'Notify Party'
+      )
+    } else if (tag.includes('Bill to')) {
+      AddDateType.value = AddDateType.value.filter((item: any) => item.partyType !== 'Bill to')
+      delete MoreFiltersObj['Bill to']
+      selectedPartyTypeoptions.value = selectedPartyTypeoptions.value.filter(
+        (item: any) => item !== 'Bill to'
+      )
+    } else if (tag.includes('Destination Operator')) {
+      AddDateType.value = AddDateType.value.filter(
+        (item: any) => item.partyType !== 'Destination Operator'
+      )
+      delete MoreFiltersObj['Destination Operator']
+      selectedPartyTypeoptions.value = selectedPartyTypeoptions.value.filter(
+        (item: any) => item !== 'Destination Operator'
+      )
     } else if (tag.includes('Sales')) {
       AddDateType.value = AddDateType.value.filter((item: any) => item.partyType !== 'Sales')
       delete MoreFiltersObj['Sales']
@@ -68,6 +88,14 @@ onMounted(() => {
       selectedPlacesTypeoptions.value = selectedPlacesTypeoptions.value.filter(
         (item: any) => item !== 'Place of delivery'
       )
+    } else if (tag.includes('Place of Discharge')) {
+      AddDatePlaceType.value = AddDatePlaceType.value.filter(
+        (item: any) => item.placesType !== 'Place of Discharge'
+      )
+      delete MoreFiltersObj['Place of Discharge']
+      selectedPlacesTypeoptions.value = selectedPlacesTypeoptions.value.filter(
+        (item: any) => item !== 'Place of Discharge'
+      )
     }
   })
   emitter.on('clearDaterangeObj', () => {
@@ -93,34 +121,93 @@ interface PlacesTypeItem {
 }
 const AddDateType = ref<TypeItem[]>([])
 const AddDatePlaceType = ref<PlacesTypeItem[]>([])
-const PartyTypeoptions = ref([
-  {
-    value: 'Origin Agent',
-    label: 'Origin Agent'
-  },
-  {
-    value: 'Destination Agent',
-    label: 'Destination Agent'
-  },
-  {
-    value: 'Sales',
-    label: 'Sales'
+
+const props = defineProps({
+  isShipment: Boolean
+})
+const PartyTypeoptions = computed(() => {
+  if (props.isShipment) {
+    return [
+      {
+        value: 'Notify Party',
+        label: 'Notify Party'
+      },
+      {
+        value: 'Bill to',
+        label: 'Bill to'
+      },
+      {
+        value: 'Origin Agent',
+        label: 'Origin Agent'
+      },
+      {
+        value: 'Destination Agent',
+        label: 'Destination Agent'
+      },
+      {
+        value: 'Destination Operator',
+        label: 'Destination Operator'
+      },
+      {
+        value: 'Sales',
+        label: 'Sales'
+      }
+    ]
+  } else {
+    return [
+      {
+        value: 'Origin Agent',
+        label: 'Origin Agent'
+      },
+      {
+        value: 'Destination Agent',
+        label: 'Destination Agent'
+      },
+      {
+        value: 'Sales',
+        label: 'Sales'
+      }
+    ]
   }
-])
-const PlaceTypeoptions = ref([
-  {
-    value: 'Place of Receipt',
-    label: 'Place of Receipt'
-  },
-  {
-    value: 'Port of Loading',
-    label: 'Port of Loading'
-  },
-  {
-    value: 'Place of delivery',
-    label: 'Place of delivery'
+})
+
+const PlaceTypeoptions = computed(() => {
+  if (props.isShipment) {
+    return [
+      {
+        value: 'Place of Receipt',
+        label: 'Place of Receipt'
+      },
+      {
+        value: 'Port of Loading',
+        label: 'Port of Loading'
+      },
+      {
+        value: 'Place of Discharge',
+        label: 'Place of Discharge'
+      },
+      {
+        value: 'Place of delivery',
+        label: 'Place of delivery'
+      }
+    ]
+  } else {
+    return [
+      {
+        value: 'Place of Receipt',
+        label: 'Place of Receipt'
+      },
+      {
+        value: 'Port of Loading',
+        label: 'Port of Loading'
+      },
+      {
+        value: 'Place of delivery',
+        label: 'Place of delivery'
+      }
+    ]
   }
-])
+})
 
 const partSelectTableSelectRef = ref(null)
 const placeSelectTableSelectRef = ref(null)
@@ -155,9 +242,6 @@ const InputForm = ref({
     Service: ''
   }
 })
-const props = defineProps({
-  isShipment: Boolean
-})
 
 const AddType = (item: any) => {
   if (item == 'party') {
@@ -479,13 +563,15 @@ const SeiviceList = ref([
     checked: false
   }
 ])
-const IncotermsSearch = (val: any) => {
+const IncotermsSearch = (val: any, value: any) => {
   InputForm.value.General.Incoterms = val.data
   MoreFiltersObj[val.title] = val.data
+  MoreFiltersObj2[val.title] = value
 }
-const ServiceSearch = (val: any) => {
+const ServiceSearch = (val: any, value: any) => {
   InputForm.value.General.Service = val.data
   MoreFiltersObj[val.title] = val.data
+  MoreFiltersObj2[val.title] = value
 }
 </script>
 <template>

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

@@ -90,19 +90,22 @@ const clearList = () => {
 }
 const emit = defineEmits(['generalSearch'])
 const changedata = ref()
+const changedata2 = ref()
 //点击搜索
 const TransportSearch = (visible: any) => {
   if (checkedCount.length == TransportList.value.length) {
     changedata.value = 'All'
+    changedata2.value = 'All'
   } else {
     changedata.value = checkedCount.join(', ')
+    changedata2.value = checkedCount
   }
   const TransportData = {
     title: Title.value,
     data: changedata.value
   }
   Serval.value = changedata.value
-  emit('generalSearch', TransportData)
+  emit('generalSearch', TransportData, changedata2.value)
   if (!dropdown1.value) return
   if (visible) {
     dropdown1.value.handleClose()

src/views/Booking/src/BookingView.vue

@@ -24,6 +24,43 @@ const tagsData: any = ref([])
 const handleClose = (tag: any) => {
   emitter.emit('clearTag', tag)
   tagsData.value.splice(tagsData.value.indexOf(tag), 1)
+  if (tag.includes('Transport')) {
+    delete searchTableQeury.transport_mode
+  } else if (tag.includes('ETD')) {
+    delete searchTableQeury.m_etd_start
+    delete searchTableQeury.m_etd_end
+  } else if (tag.includes('ETA')) {
+    delete searchTableQeury.f_eta_start
+    delete searchTableQeury.f_eta_end
+  } else if (tag.includes('Creation')) {
+    delete searchTableQeury.created_time_start
+    delete searchTableQeury.created_time_end
+  } else if (tag.includes('shippername')) {
+    delete searchTableQeury.shipper
+  } else if (tag.includes('consigneename')) {
+    delete searchTableQeury.consignee
+  } else if (tag.includes('Origin Agent')) {
+    delete searchTableQeury.origin
+  } else if (tag.includes('Destination Agent')) {
+    delete searchTableQeury.agent
+  } else if (tag.includes('Sales')) {
+    delete searchTableQeury.sales_rep
+  } else if (tag.includes('origin')) {
+    delete searchTableQeury.from_station
+  } else if (tag.includes('destination')) {
+    delete searchTableQeury['final_desination/final_desination_exp']
+  } else if (tag.includes('Place of Receipt')) {
+    delete searchTableQeury.place_of_receipt
+  } else if (tag.includes('Place of Loading')) {
+    delete searchTableQeury['fport_of_loading/fport_of_loading_exp']
+  } else if (tag.includes('Place of delivery')) {
+    delete searchTableQeury['place_of_delivery/place_of_delivery_exp']
+  } else if (tag.includes('vessel')) {
+    delete searchTableQeury.vessel
+  } else if (tag.includes('voyage')) {
+    delete searchTableQeury['f_voyage/m_voyage']
+  }
+  BookingTable_ref.value.searchTableData(searchTableQeury)
 }
 // 筛选框查询
 const FiltersSeach = (val: any, value: any) => {
@@ -102,12 +139,25 @@ const clearfilters = () => {
   tagsData.value = []
   filterData.transportData = []
   filterData.daterangeData = []
+  filterData.morefiltersData = []
   emitter.emit('clearTag', 'Transport Mode')
   emitter.emit('clearTag', 'ETD')
   emitter.emit('clearTag', 'ETA')
   emitter.emit('clearTag', 'Creation Time')
   emitter.emit('clearTag', 'shippername')
   emitter.emit('clearTag', 'consigneename')
+  emitter.emit('clearTag', 'Origin Agent')
+  emitter.emit('clearTag', 'Destination Agent')
+  emitter.emit('clearTag', 'Sales')
+  emitter.emit('clearTag', 'origin')
+  emitter.emit('clearTag', 'destination')
+  emitter.emit('clearTag', 'Place of Receipt')
+  emitter.emit('clearTag', 'Port of Loading')
+  emitter.emit('clearTag', 'Port of delivery')
+  emitter.emit('clearTag', 'vessel')
+  emitter.emit('clearTag', 'voyage')
+  searchTableQeury = {}
+  BookingTable_ref.value.searchTableData(searchTableQeury)
 }
 const renderTagsData = () => {
   tagsData.value = []
@@ -152,7 +202,7 @@ onMounted(() => {
   setTimeout(() => {
     TransportListItem.value = BookingTable_ref.value.TransportListItem
     TagsList.value = BookingTable_ref.value.TagsList
-  }, 1000)
+  }, 2000)
 })
 const changeTag = (val: any) => {
   searchTableQeury.filterTag = val
@@ -164,6 +214,34 @@ const SearchInput = () => {
   searchTableQeury._textSearch = BookingSearch.value
   BookingTable_ref.value.searchTableData(searchTableQeury)
 }
+const propsPartyTypeoptions = ref([
+  {
+    value: 'Origin Agent',
+    label: 'Origin Agent'
+  },
+  {
+    value: 'Destination Agent',
+    label: 'Destination Agent'
+  },
+  {
+    value: 'Sales',
+    label: 'Sales'
+  }
+])
+const propsPlaceTypeoptions = ref([
+  {
+    value: 'Place of Receipt',
+    label: 'Place of Receipt'
+  },
+  {
+    value: 'Port of Loading',
+    label: 'Port of Loading'
+  },
+  {
+    value: 'Place of delivery',
+    label: 'Place of delivery'
+  }
+])
 </script>
 
 <template>
@@ -198,6 +276,8 @@ const SearchInput = () => {
         :isShipment="false"
         @MoreFiltersSearch="MoreFiltersSearch"
         @clearMoreFiltersTags="clearMoreFiltersTags"
+        :propsPartyTypeoptions="propsPartyTypeoptions"
+        :propsPlaceTypeoptions="propsPlaceTypeoptions"
       ></MoreFilters>
       <el-button class="el-button--dark" style="margin-left: 8px" @click="SearchInput"
         >Search</el-button

src/views/Dashboard/src/components/BarChart.vue

@@ -187,6 +187,11 @@ const initChart = () => {
   window.addEventListener('resize', () => {
     bar_chart.resize()
   })
+  // 监听点击事件
+  bar_chart.on('click', function (params) {
+    // params 包含了点击事件的数据
+    console.log('1111', params) // 获取点击的数据
+  })
 }
 </script>
 

src/views/Dashboard/src/components/PieChart.vue

@@ -171,6 +171,11 @@ const initChart = () => {
   window.addEventListener('resize', () => {
     pie_chart.resize()
   })
+  // 监听点击事件
+  pie_chart.on('click', function (params) {
+    // params 包含了点击事件的数据
+    console.log(params.data) // 获取点击的数据
+  })
 }
 </script>
 

src/views/Dashboard/src/components/SellerChart.vue

@@ -169,6 +169,11 @@ const initChart = () => {
   window.addEventListener('resize', () => {
     seller_chart.resize()
   })
+  // 监听点击事件
+  seller_chart.on('click', function (params) {
+    // params 包含了点击事件的数据
+    console.log(params) // 获取点击的数据
+  })
 }
 </script>
 

src/views/Dashboard/src/components/TopMap.vue

@@ -1,17 +1,18 @@
 <script setup lang="ts">
 import { onMounted, ref } from 'vue'
 import L from 'leaflet'
-onMounted(() => {
-  init()
-})
 const map = ref(null)
 const init = () => {
-  map.value = L.map('map').setView([51.505, -0.09], 13)
+  map.value = L.map('map').setView([51.505, -0.09], 4)
 
-  L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+  L.tileLayer('https://map.kerryapex.com/osm_tiles/{z}/{x}/{y}.png', {
     attribution: '&copy; OpenStreetMap contributors'
   }).addTo(map.value)
 }
+
+onMounted(() => {
+  init()
+})
 </script>
 <template>
   <div id="map" style="height: 272px"></div>

src/views/Tracking/src/TrackingView.vue

@@ -24,6 +24,55 @@ const tagsData: any = ref([])
 const handleClose = (tag: any) => {
   emitter.emit('clearTag', tag)
   tagsData.value.splice(tagsData.value.indexOf(tag), 1)
+  if (tag.includes('Transport')) {
+    delete searchTableQeury.transport_mode
+  } else if (tag.includes('ETD')) {
+    delete searchTableQeury.etd_start
+    delete searchTableQeury.etd_end
+  } else if (tag.includes('ETA')) {
+    delete searchTableQeury.f_eta_start
+    delete searchTableQeury.f_eta_end
+  } else if (tag.includes('Creation')) {
+    delete searchTableQeury.created_time_start
+    delete searchTableQeury.created_time_end
+  } else if (tag.includes('shippername')) {
+    delete searchTableQeury.shipper
+  } else if (tag.includes('consigneename')) {
+    delete searchTableQeury.consignee
+  } else if (tag.includes('Service')) {
+    delete searchTableQeury.service
+  } else if (tag.includes('Incoterms')) {
+    delete searchTableQeury.incoterms
+  } else if (tag.includes('Notify Party')) {
+    delete searchTableQeury.notify_party
+  } else if (tag.includes('Bill to')) {
+    delete searchTableQeury.billto
+  } else if (tag.includes('Origin Agent')) {
+    delete searchTableQeury.origin
+  } else if (tag.includes('Destination Agent')) {
+    delete searchTableQeury.agent
+  } else if (tag.includes('Destination Operator')) {
+    delete searchTableQeury.dest_op
+  } else if (tag.includes('Sales')) {
+    delete searchTableQeury.sales_rep
+  } else if (tag.includes('origin')) {
+    delete searchTableQeury.from_station
+  } else if (tag.includes('destination')) {
+    delete searchTableQeury.final_desination
+  } else if (tag.includes('Place of Receipt')) {
+    delete searchTableQeury.place_of_receipt_exp
+  } else if (tag.includes('Place of Loading')) {
+    delete searchTableQeury.port_of_loading
+  } else if (tag.includes('Place of delivery')) {
+    delete searchTableQeury.place_of_delivery_exp
+  } else if (tag.includes('Place of Discharge')) {
+    delete searchTableQeury.port_of_discharge
+  } else if (tag.includes('vessel')) {
+    delete searchTableQeury['f_vessel/vessel']
+  } else if (tag.includes('voyage')) {
+    delete searchTableQeury['f_voyage/voyage']
+  }
+  TrackingTable_ref.value.searchTableData(searchTableQeury)
 }
 // 筛选框查询
 const FiltersSeach = (val: any, value: any) => {
@@ -49,8 +98,8 @@ const DateRangeSearch = (val: any, value: any) => {
   }
   for (const key in value) {
     if (key == 'ETD') {
-      searchTableQeury.m_etd_start = value[key].data[0]
-      searchTableQeury.m_etd_end = value[key].data[1]
+      searchTableQeury.etd_start = value[key].data[0]
+      searchTableQeury.etd_end = value[key].data[1]
     } else if (key == 'ETA') {
       searchTableQeury.f_eta_start = value[key].data[0]
       searchTableQeury.f_eta_end = value[key].data[1]
@@ -63,33 +112,48 @@ const DateRangeSearch = (val: any, value: any) => {
   renderTagsData()
 }
 //MoreFiltersSearch
-const MoreFiltersSearch = (val: any) => {
+const MoreFiltersSearch = (val: any, value: any) => {
+  console.log(value)
   filterData.morefiltersData = []
   for (const key in val) {
     let str = `${key}:${val[key]}`
     filterData.morefiltersData.push(str)
     if (key == 'shippername') {
-      searchTableQeury.shipper = val[key]
+      searchTableQeury.shipper = value[key]
     } else if (key == 'consigneename') {
-      searchTableQeury.consignee = val[key]
+      searchTableQeury.consignee = value[key]
+    } else if (key == 'Service') {
+      searchTableQeury.service = value[key]
+    } else if (key == 'Incoterms') {
+      searchTableQeury.incoterms = value[key]
+    } else if (key == 'Notify Party') {
+      searchTableQeury.notify_party = value[key]
+    } else if (key == 'Bill to') {
+      searchTableQeury.billto = value[key]
     } else if (key == 'Origin Agent') {
-      searchTableQeury.origin = val[key]
+      searchTableQeury.origin = value[key]
     } else if (key == 'Destination Agent') {
-      searchTableQeury.agent = val[key]
+      searchTableQeury.agent = value[key]
+    } else if (key == 'Destination Operator') {
+      searchTableQeury.dest_op = value[key]
     } else if (key == 'Sales') {
-      searchTableQeury.sales_rep = val[key]
+      searchTableQeury.sales_rep = value[key]
     } else if (key == 'destination') {
-      searchTableQeury['final_desination/final_desination_exp'] = val[key]
+      searchTableQeury.final_desination = val[key]
     } else if (key == 'Place of Receipt') {
-      searchTableQeury.place_of_receipt = val[key]
+      searchTableQeury.place_of_receipt_exp = val[key]
+    } else if (key == 'origin') {
+      searchTableQeury.from_station = val[key]
     } else if (key == 'Port of Loading') {
-      searchTableQeury['fport_of_loading/fport_of_loading_exp'] = val[key]
+      searchTableQeury.port_of_loading = val[key]
     } else if (key == 'Port of delivery') {
-      searchTableQeury['place_of_delivery/place_of_delivery_exp'] = val[key]
+      searchTableQeury.place_of_delivery_exp = val[key]
+    } else if (key == 'Port of Discharge') {
+      searchTableQeury.port_of_discharge = val[key]
     } else if (key == 'vessel') {
-      searchTableQeury.vessel = val[key]
+      searchTableQeury['f_vessel/vessel'] = value[key]
     } else if (key == 'voyage') {
-      searchTableQeury['f_voyage/m_voyage'] = val[key]
+      searchTableQeury['f_voyage/voyage'] = value[key]
     }
   }
   TrackingTable_ref.value.searchTableData(searchTableQeury)
@@ -99,12 +163,31 @@ const clearfilters = () => {
   tagsData.value = []
   filterData.transportData = []
   filterData.daterangeData = []
+  filterData.morefiltersData = []
   emitter.emit('clearTag', 'Transport Mode')
   emitter.emit('clearTag', 'ETD')
   emitter.emit('clearTag', 'ETA')
   emitter.emit('clearTag', 'Creation Time')
   emitter.emit('clearTag', 'shippername')
   emitter.emit('clearTag', 'consigneename')
+  emitter.emit('clearTag', 'Service')
+  emitter.emit('clearTag', 'Incoterms')
+  emitter.emit('clearTag', 'Notify Party')
+  emitter.emit('clearTag', 'Bill to')
+  emitter.emit('clearTag', 'Origin Agent')
+  emitter.emit('clearTag', 'Destination Agent')
+  emitter.emit('clearTag', 'Destination Operator')
+  emitter.emit('clearTag', 'Sales')
+  emitter.emit('clearTag', 'origin')
+  emitter.emit('clearTag', 'destination')
+  emitter.emit('clearTag', 'Place of Receipt')
+  emitter.emit('clearTag', 'Port of Loading')
+  emitter.emit('clearTag', 'Port of delivery')
+  emitter.emit('clearTag', 'Port of Discharge')
+  emitter.emit('clearTag', 'vessel')
+  emitter.emit('clearTag', 'voyage')
+  searchTableQeury = {}
+  TrackingTable_ref.value.searchTableData(searchTableQeury)
 }
 const renderTagsData = () => {
   tagsData.value = []
@@ -149,7 +232,7 @@ onMounted(() => {
   setTimeout(() => {
     TransportListItem.value = TrackingTable_ref.value.TransportListItem
     TagsList.value = TrackingTable_ref.value.TagsList
-  }, 1000)
+  }, 2000)
 })
 const changeTag = (val: any) => {
   searchTableQeury.filterTag = val

src/views/Tracking/src/components/TrackingTable/src/TrackingTable.vue

@@ -126,12 +126,11 @@ const searchTableData = (data: any) => {
   console.log(data)
   filterdataobj = data
   $api
-    .getBookingTableData({
+    .getTrackingTableData({
       cp: pageInfo.value.pageNo,
       ps: pageInfo.value.pageSize,
       rc: -1,
       other_filed: '',
-      _textSearch: '',
       ...data
     })
     .then((res: any) => {
@@ -158,14 +157,7 @@ const trackingTable = ref<VxeGridProps<any>>({
   border: true,
   round: true,
   columns: [],
-  data: [
-    {
-      trackingNo: '1234567890',
-      mode: 'Air',
-      trackingStatus: 'Cancelled',
-      origin
-    }
-  ],
+  data: [],
   scrollY: { enabled: true, oSize: 20, gt: 30 },
   stripe: true,
   emptyText: ' ',
@@ -266,7 +258,7 @@ const customizeColumns = async () => {
 const handleCellDblclick = ({ row }: any) => {
   router.push({
     path: '/tracking/detail',
-    query: { a: row.__serial_no, _schemas: row.__schemas }
+    query: { a: row.__serial_no, _schemas: row._schemas }
   })
 }
 // 点击link字段是时
@@ -274,12 +266,12 @@ const handleLinkClick = (row: any, column: any) => {
   if (column.field === 'booking_no') {
     router.push({
       path: '/booking/detail',
-      query: { a: row.__serial_no, _schemas: row.__schemas }
+      query: { a: row.__serial_no, _schemas: row._schemas }
     })
   } else if (column.field === 'h_bol') {
     router.push({
       path: '/tracking/detail',
-      query: { a: row.__serial_no, _schemas: row.__schemas }
+      query: { a: row.__serial_no, _schemas: row._schemas }
     })
   }
 }
@@ -433,4 +425,4 @@ defineExpose({
     visibility: hidden;
   }
 }
-</style>
+</style>