Merge branch 'dev' into dev_zyh

src/views/Booking/src/BookingView.vue

@@ -318,6 +318,7 @@ const filterTag = ref(['All'])
 const isShowAlertIcon = ref(false)
 const getbookingdata = () => {
   tableLoadingTableData.value = true
+  BookingTable_ref.value.getLoadingData(tableLoadingTableData.value)
   $api
     .getBookingTableData({
       cp: BookingTable_ref.value.pageInfo.pageNo,
@@ -444,7 +445,6 @@ const SearchInput = () => {
   <BookingTable
     :height="containerHeight"
     :tagsData="tagsData"
-    :tableLoadingTableData="tableLoadingTableData"
     ref="BookingTable_ref"
   ></BookingTable>
 </template>

src/views/Booking/src/components/BookingTable/src/BookingTable.vue

@@ -17,20 +17,13 @@ const props = defineProps({
   tagsData: {
     type: Array,
     default: () => []
-  },
-  tableLoadingTableData: {
-    type: Boolean,
-    default: () => false
   }
 })
 
-const tableLoadingTable = ref(props.tableLoadingTableData)
-watch(
-  () => props.tableLoadingTableData,
-  (current) => {
-    tableLoadingTable.value = current
-  }
-)
+const tableLoadingTable = ref()
+const getLoadingData = (data: any) => {
+  tableLoadingTable.value = data
+}
 // 表格展示列的原始字段
 const tableOriginColumnsField = ref()
 const handleColumns = (columns: any, status?: string) => {
@@ -404,6 +397,7 @@ const handleCheckAllChange = ({ records }: any) => {
 }
 defineExpose({
   searchTableData,
+  getLoadingData,
   pageInfo
 })
 </script>

src/views/Tracking/src/TrackingView.vue

@@ -59,9 +59,9 @@ const handleClose = (tag: any) => {
     delete searchTableQeuryTracking.created_time_start
     delete searchTableQeuryTracking.created_time_end
   } else if (tag.includes('Shippername')) {
-    delete searchTableQeuryTracking.shipper_city
+    delete searchTableQeuryTracking.shipper
   } else if (tag.includes('Consigneename')) {
-    delete searchTableQeuryTracking.consignee_city
+    delete searchTableQeuryTracking.consignee
   } else if (tag.includes('Service')) {
     delete searchTableQeuryTracking.service
   } else if (tag.includes('Incoterms')) {
@@ -79,11 +79,11 @@ const handleClose = (tag: any) => {
   } else if (tag.includes('Sales')) {
     delete searchTableQeuryTracking.sales_rep
   } else if (tag.includes('Origin')) {
-    delete searchTableQeuryTracking['shipper_city/consignee_city']
+    delete searchTableQeuryTracking.shipper_city
     delete searchTableQeuryTracking._city_name
     filterData.dashboardData = []
   } else if (tag.includes('Destination')) {
-    delete searchTableQeuryTracking.final_desination
+    delete searchTableQeuryTracking.consignee_city
   } else if (tag.includes('Place of Receipt')) {
     delete searchTableQeuryTracking.place_of_receipt_exp
   } else if (tag.includes('Port of Loading')) {
@@ -209,8 +209,8 @@ const DateRangeSearch = (val: any, value: any) => {
 const MoreFiltersSearch = (val: any, value: any) => {
   filterData.morefiltersData = []
   if (Object.keys(value).length == 0) {
-    delete searchTableQeuryTracking.shipper_city
-    delete searchTableQeuryTracking.consignee_city
+    delete searchTableQeuryTracking.shipper
+    delete searchTableQeuryTracking.consignee
     delete searchTableQeuryTracking.service
     delete searchTableQeuryTracking.incoterms
     delete searchTableQeuryTracking.notify_party
@@ -219,11 +219,11 @@ const MoreFiltersSearch = (val: any, value: any) => {
     delete searchTableQeuryTracking.agent
     delete searchTableQeuryTracking.sales_rep
     delete searchTableQeuryTracking.dest_op
-    delete searchTableQeuryTracking.final_desination
+    delete searchTableQeuryTracking.consignee_city
     delete searchTableQeuryTracking.place_of_receipt_exp
     delete searchTableQeuryTracking.place_of_delivery_exp
     delete searchTableQeuryTracking.port_of_discharge
-    delete searchTableQeuryTracking['shipper_city/consignee_city']
+    delete searchTableQeuryTracking.shipper_city
     delete searchTableQeuryTracking['port_of_loading/fport_of_loading_un']
     delete searchTableQeuryTracking['f_vessel/vessel']
     delete searchTableQeuryTracking['f_voyage/voyage']
@@ -232,9 +232,9 @@ const MoreFiltersSearch = (val: any, value: any) => {
     let str = `${key}:${val[key]}`
     filterData.morefiltersData.push(str)
     if (key == 'Shippername') {
-      searchTableQeuryTracking.shipper_city = value[key]
+      searchTableQeuryTracking.shipper = value[key]
     } else if (key == 'Consigneename') {
-      searchTableQeuryTracking.consignee_city = value[key]
+      searchTableQeuryTracking.consignee = value[key]
     } else if (key == 'Service') {
       searchTableQeuryTracking.service = value[key]
     } else if (key == 'Incoterms') {
@@ -252,11 +252,11 @@ const MoreFiltersSearch = (val: any, value: any) => {
     } else if (key == 'Sales') {
       searchTableQeuryTracking.sales_rep = value[key]
     } else if (key == 'Destination') {
-      searchTableQeuryTracking.final_desination = value[key]
+      searchTableQeuryTracking.consignee_city = value[key]
     } else if (key == 'Place of Receipt') {
       searchTableQeuryTracking.place_of_receipt_exp = value[key]
     } else if (key == 'Origin') {
-      searchTableQeuryTracking['shipper_city/consignee_city'] = value[key]
+      searchTableQeuryTracking.shipper_city = value[key]
     } else if (key == 'Port of Loading') {
       searchTableQeuryTracking['port_of_loading/fport_of_loading_un'] = value[key]
     } else if (key == 'Place of delivery') {
@@ -280,9 +280,9 @@ const defaultMorefilters = (val: any, value: any, data: any) => {
     filterData.morefiltersData.push(str)
     for (const key in val) {
       if (key == 'Shippername') {
-        searchTableQeuryTracking.shipper_city = value[key]
+        searchTableQeuryTracking.shipper = value[key]
       } else if (key == 'Consigneename') {
-        searchTableQeuryTracking.consignee_city = value[key]
+        searchTableQeuryTracking.consignee = value[key]
       } else if (key == 'Service') {
         searchTableQeuryTracking.service = value[key]
       } else if (key == 'Incoterms') {
@@ -300,9 +300,9 @@ const defaultMorefilters = (val: any, value: any, data: any) => {
       } else if (key == 'Sales') {
         searchTableQeuryTracking.sales_rep = value[key]
       } else if (key == 'Origin') {
-        searchTableQeuryTracking['shipper_city/consignee_city'] = value[key]
+        searchTableQeuryTracking.shipper_city = value[key]
       } else if (key == 'Destination') {
-        searchTableQeuryTracking.final_desination = value[key]
+        searchTableQeuryTracking.consignee_city = value[key]
       } else if (key == 'Place of Receipt') {
         searchTableQeuryTracking.place_of_receipt_exp = value[key]
       } else if (key == 'Port of Loading') {
@@ -466,6 +466,7 @@ const filterTag = ref(['All'])
 const isShowAlertIcon = ref(false)
 const Gettrackingdata = () => {
   tableLoadingTableData.value = true
+  TrackingTable_ref.value.getLoadingData(tableLoadingTableData.value)
   $api
     .getTrackingTableData({
       cp: TrackingTable_ref.value.pageInfo.pageNo,
@@ -619,7 +620,6 @@ const SearchInput = () => {
   <TrackingTable
     :height="containerHeight"
     :tagsData="tagsData"
-    :tableLoadingTableData="tableLoadingTableData"
     ref="TrackingTable_ref"
   ></TrackingTable>
 </template>

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

@@ -16,19 +16,12 @@ const props = defineProps({
   tagsData: {
     type: Array,
     default: () => []
-  },
-  tableLoadingTableData: {
-    type: Boolean,
-    default: () => false
   }
 })
-const tableLoadingTable = ref(props.tableLoadingTableData)
-watch(
-  () => props.tableLoadingTableData,
-  (current) => {
-    tableLoadingTable.value = current
-  }
-)
+const tableLoadingTable = ref()
+const getLoadingData = (data: any) => {
+  tableLoadingTable.value = data
+}
 // 表格展示列的原始字段
 const tableOriginColumnsField = ref()
 const handleColumns = (columns: any, status?: string) => {
@@ -155,8 +148,8 @@ const getSharedTableData = () => {
 
 // 获取表格数据
 const getTableData = async (isPageChange?: boolean) => {
-  const rc = isPageChange ? pageInfo.value.total : -1
   tableLoadingTable.value = true
+  const rc = isPageChange ? pageInfo.value.total : -1
   if (
     sessionStorage.getItem('clickParams') != null &&
     sessionStorage.getItem('clickParams') != '{}'
@@ -470,6 +463,7 @@ const handleVGM = (row) => {
 defineExpose({
   searchTableData,
   getSharedTableData,
+  getLoadingData,
   pageInfo
 })
 </script>