Merge branch 'dev' into dev_zyh

src/views/Booking/src/BookingView.vue

@@ -13,6 +13,7 @@ const filterRef: Ref<HTMLElement | null> = ref(null)
 const containerHeight = useCalculatingHeight(document.documentElement, 246, [filterRef])
 
 const BookingSearch = ref()
+const tableLoadingTableData = ref(false)
 let searchTableQeury: any = {}
 const filterData = reactive({
   transportData: [] as Array<string>,
@@ -316,6 +317,7 @@ const TagsList = ref<ListItem[]>([])
 const filterTag = ref(['All'])
 const isShowAlertIcon = ref(false)
 const getbookingdata = () => {
+  tableLoadingTableData.value = true
   $api
     .getBookingTableData({
       cp: BookingTable_ref.value.pageInfo.pageNo,
@@ -329,7 +331,7 @@ const getbookingdata = () => {
         TransportListItem.value = res.data.TransportList
         TagsList.value = res.data.tagsList
         sessionStorage.setItem('BookingData', JSON.stringify(res.data))
-        BookingTable_ref.value.searchTableData()
+        BookingTable_ref.value.searchTableData(searchTableQeury)
         // 查询没结果的话显示icon
         if (BookingSearch.value != '' && BookingSearch.value != undefined) {
           if (res.data.searchData.length == 0) {
@@ -442,6 +444,7 @@ const SearchInput = () => {
   <BookingTable
     :height="containerHeight"
     :tagsData="tagsData"
+    :tableLoadingTableData="tableLoadingTableData"
     ref="BookingTable_ref"
   ></BookingTable>
 </template>

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

@@ -5,6 +5,7 @@ import DownloadDialog from './components/DownloadDialog.vue'
 import { autoWidth } from '@/utils/table'
 import { useRowClickStyle } from '@/hooks/rowClickStyle'
 import dayjs from 'dayjs'
+import { ref, watch, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
 
 const router = useRouter()
@@ -16,9 +17,20 @@ 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 tableOriginColumnsField = ref()
 const handleColumns = (columns: any, status?: string) => {
@@ -90,7 +102,7 @@ const getTableColumns = async () => {
 const pageInfo = ref({ pageNo: 1, pageSize: 100, total: 0 })
 const curTableData = ref([])
 const tempSearch = ref()
-let filterdataobj: any = {}
+const filterdataobj = ref()
 // 获得表格数据后赋值
 const assignTableData = (data: any) => {
   bookingTable.value.data = data.searchData || []
@@ -108,16 +120,14 @@ const assignTableData = (data: any) => {
   }, 1000)
 }
 // 获取表格数据
-const getTableData = async (isPageChange?: boolean) => {
-  const rc = isPageChange ? pageInfo.value.total : -1
-  tableLoadingTableData.value = true
-  await $api
+const getTableData = () => {
+  $api
     .getBookingTableData({
       cp: pageInfo.value.pageNo,
       ps: pageInfo.value.pageSize,
-      rc,
+      rc: -1,
       other_filed: '',
-      ...filterdataobj
+      ...filterdataobj.value
     })
     .then((res: any) => {
       if (res.code === 200) {
@@ -129,13 +139,13 @@ const getTableData = async (isPageChange?: boolean) => {
       selectedTableData.value = []
       nextTick(() => {
         tableRef.value && autoWidth(bookingTable.value, tableRef.value)
-        tableLoadingTableData.value = false
+        tableLoadingTable.value = false
       })
     })
 }
 // 查询列表数据
-const searchTableData = () => {
-  tableLoadingTableData.value = true
+const searchTableData = (data: any) => {
+  filterdataobj.value = data
   if (sessionStorage.getItem('BookingData') != null) {
     const data = JSON.parse(sessionStorage.getItem('BookingData') as string) || {}
     assignTableData(data)
@@ -144,7 +154,7 @@ const searchTableData = () => {
       selectedTableData.value = []
       nextTick(() => {
         tableRef.value && autoWidth(bookingTable.value, tableRef.value)
-        tableLoadingTableData.value = false
+        tableLoadingTable.value = false
         sessionStorage.removeItem('BookingData')
       })
     }, 100)
@@ -333,7 +343,6 @@ const exportTable = (status: number) => {
 }
 
 const tableLoadingColumn = ref(false)
-const tableLoadingTableData = ref(false)
 
 const CustomizeColumnsRef = ref()
 // 打开定制表格弹窗
@@ -420,7 +429,7 @@ defineExpose({
     </div>
     <vxe-grid
       ref="tableRef"
-      v-vloading="tableLoadingTableData || tableLoadingColumn"
+      v-vloading="tableLoadingTable || tableLoadingColumn"
       :height="props.height"
       :style="{ border: 'none' }"
       v-bind="bookingTable"
@@ -429,7 +438,7 @@ defineExpose({
       @checkbox-all="handleCheckAllChange"
     >
       <!-- 空数据时的插槽 -->
-      <template #empty v-if="!tableLoadingTableData && bookingTable.data.length === 0">
+      <template #empty v-if="!tableLoadingTable && bookingTable.data.length === 0">
         <VEmpty>
           <template #suggestion>
             <p style="color: var(--color-neutral-3)">
@@ -478,8 +487,8 @@ defineExpose({
           background
           layout="sizes, prev, pager, next"
           :total="pageInfo.total"
-          @size-change="getTableData(true)"
-          @current-change="getTableData(true)"
+          @size-change="getTableData"
+          @current-change="getTableData"
         />
       </div>
     </div>

src/views/Dashboard/src/DashboardView.vue

@@ -123,10 +123,17 @@ const ETDobj = reactive({
   download_name: ''
 })
 const GetETDEcharts = () => {
+  const currentDate = new Date()
+  let tenyear: any = 0
+  if (currentDate.getMonth() - 11 < 0) {
+    tenyear = currentDate.getFullYear() - 1
+  } else {
+    tenyear = currentDate.getFullYear()
+  }
   $api
     .GetETDEcharts({
-      b_date: '',
-      e_date: ''
+      b_date: currentDate.getMonth() + 1 + '/' + currentDate.getFullYear(),
+      e_date: currentDate.getMonth() + 3 + '/' + tenyear
     })
     .then((res: any) => {
       if (res.code === 200) {
@@ -151,7 +158,7 @@ const GetKPIEcharts = () => {
     })
     .then((res: any) => {
       if (res.code === 200) {
-        KPIobj.ETD_Title = `{a|${res.data.title1}}{b|${res.data.title2})}`
+        KPIobj.ETD_Title = `{a|${res.data.title1}}{b|${res.data.title2}}`
         KPIobj.ETDList = res.data.ETDList
         KPIobj.ETD_Radius = res.data.ETD_Radius
         KPIobj.download_name = res.data.download_name
@@ -172,7 +179,7 @@ const GetKPIArrivalEcharts = () => {
     })
     .then((res: any) => {
       if (res.code === 200) {
-        Arrivalobj.ETD_Title = `{a|${res.data.title1}}{b|${res.data.title2})}`
+        Arrivalobj.ETD_Title = `{a|${res.data.title1}}{b|${res.data.title2}}`
         Arrivalobj.ETDList = res.data.ETDList
         Arrivalobj.ETD_Radius = res.data.ETD_Radius
         Arrivalobj.download_name = res.data.download_name
@@ -193,7 +200,7 @@ const GetPendingEcharts = () => {
     })
     .then((res: any) => {
       if (res.code === 200) {
-        Pendingobj.ETD_Title = `{a|${res.data.title1}}{b|${res.data.title2})}`
+        Pendingobj.ETD_Title = `{a|${res.data.title1}}{b|${res.data.title2}}`
         Pendingobj.ETDList = res.data.ETDList
         Pendingobj.ETD_Radius = res.data.ETD_Radius
         Pendingobj.download_name = res.data.download_name
@@ -214,7 +221,7 @@ const GetPendingArrivalEcharts = () => {
     })
     .then((res: any) => {
       if (res.code === 200) {
-        PendingArrivalobj.ETD_Title = `{a|${res.data.title1}}{b|${res.data.title2})}`
+        PendingArrivalobj.ETD_Title = `{a|${res.data.title1}}{b|${res.data.title2}}`
         PendingArrivalobj.ETDList = res.data.ETDList
         PendingArrivalobj.ETD_Radius = res.data.ETD_Radius
         PendingArrivalobj.download_name = res.data.download_name
@@ -232,11 +239,18 @@ const containerObj = reactive({
 })
 const containerType = ref([])
 const GetContainerCountEcharts = (val: any) => {
+  const currentDate = new Date()
+  let tenyear: any = 0
+  if (currentDate.getMonth() - 11 < 0) {
+    tenyear = currentDate.getFullYear() - 1
+  } else {
+    tenyear = currentDate.getFullYear()
+  }
   containerType.value = []
   $api
     .GetContainerCountEcharts({
-      b_date: '',
-      e_date: '',
+      b_date: currentDate.getMonth() + 1 + '/' + currentDate.getFullYear(),
+      e_date: currentDate.getMonth() + 3 + '/' + tenyear,
       ...val
     })
     .then((res: any) => {

src/views/Dashboard/src/components/RecentStatus.vue

@@ -129,7 +129,7 @@ const formatDate = (date: string) => {
       <div class="recent-content-right">
         <VTag :type="item.type" style="margin-bottom: 4px">{{ item.type }}</VTag>
         <div class="right_text">{{ item.Arrived }}</div>
-        <div class="startStation_time">
+        <div class="startStation_time" v-if="item.Time != null">
           {{ formatDate(item.Time) }}&nbsp;&nbsp;{{ item.timezone }}
         </div>
       </div>

src/views/OperationLog/src/components/BookingTable/src/BookingTable.vue

@@ -52,7 +52,7 @@ const handleColumns = (columns: any, status?: string) => {
       curColumn = {
         ...curColumn,
         formatter: ({ cellValue }: any) =>
-          cellValue ? dayjs(cellValue).format('MMM-YYYY-DD HH:mm:ss') : '--'
+          cellValue ? dayjs(cellValue).format('YYYY/MM/DD HH:mm:ss') : '--'
       }
     }
     return curColumn

src/views/Tracking/src/TrackingView.vue

@@ -16,6 +16,7 @@ const filterRef: Ref<HTMLElement | null> = ref(null)
 const containerHeight = useCalculatingHeight(document.documentElement, 246, [filterRef])
 
 const TrackingSearch = ref()
+const tableLoadingTableData = ref(false)
 let searchTableQeuryTracking: any = {}
 const filterData = reactive({
   transportData: [] as Array<string>,
@@ -58,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
+    delete searchTableQeuryTracking.shipper_city
   } else if (tag.includes('Consigneename')) {
-    delete searchTableQeuryTracking.consignee
+    delete searchTableQeuryTracking.consignee_city
   } else if (tag.includes('Service')) {
     delete searchTableQeuryTracking.service
   } else if (tag.includes('Incoterms')) {
@@ -208,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
-    delete searchTableQeuryTracking.consignee
+    delete searchTableQeuryTracking.shipper_city
+    delete searchTableQeuryTracking.consignee_city
     delete searchTableQeuryTracking.service
     delete searchTableQeuryTracking.incoterms
     delete searchTableQeuryTracking.notify_party
@@ -231,9 +232,9 @@ const MoreFiltersSearch = (val: any, value: any) => {
     let str = `${key}:${val[key]}`
     filterData.morefiltersData.push(str)
     if (key == 'Shippername') {
-      searchTableQeuryTracking.shipper = value[key]
+      searchTableQeuryTracking.shipper_city = value[key]
     } else if (key == 'Consigneename') {
-      searchTableQeuryTracking.consignee = value[key]
+      searchTableQeuryTracking.consignee_city = value[key]
     } else if (key == 'Service') {
       searchTableQeuryTracking.service = value[key]
     } else if (key == 'Incoterms') {
@@ -279,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 = value[key]
+        searchTableQeuryTracking.shipper_city = value[key]
       } else if (key == 'Consigneename') {
-        searchTableQeuryTracking.consignee = value[key]
+        searchTableQeuryTracking.consignee_city = value[key]
       } else if (key == 'Service') {
         searchTableQeuryTracking.service = value[key]
       } else if (key == 'Incoterms') {
@@ -464,6 +465,7 @@ const TagsList = ref<ListItem[]>([])
 const filterTag = ref(['All'])
 const isShowAlertIcon = ref(false)
 const Gettrackingdata = () => {
+  tableLoadingTableData.value = true
   $api
     .getTrackingTableData({
       cp: TrackingTable_ref.value.pageInfo.pageNo,
@@ -482,7 +484,7 @@ const Gettrackingdata = () => {
         }
         sessionStorage.setItem('incotermsList', JSON.stringify(obj))
         sessionStorage.setItem('TrackingData', JSON.stringify(res.data))
-        TrackingTable_ref.value.searchTableData()
+        TrackingTable_ref.value.searchTableData(searchTableQeuryTracking)
         // 查询没结果的话显示icon
         if (TrackingSearch.value != '' && TrackingSearch.value != undefined) {
           if (res.data.searchData.length == 0) {
@@ -617,6 +619,7 @@ const SearchInput = () => {
   <TrackingTable
     :height="containerHeight"
     :tagsData="tagsData"
+    :tableLoadingTableData="tableLoadingTableData"
     ref="TrackingTable_ref"
   ></TrackingTable>
 </template>

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

@@ -4,6 +4,7 @@ import { autoWidth } from '@/utils/table'
 import { useRowClickStyle } from '@/hooks/rowClickStyle'
 import dayjs from 'dayjs'
 import { useRouter } from 'vue-router'
+import { ref, watch, onMounted } from 'vue'
 import { transportationMode } from '@/components/TransportationMode'
 
 const router = useRouter()
@@ -15,9 +16,19 @@ 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 tableOriginColumnsField = ref()
 const handleColumns = (columns: any, status?: string) => {
@@ -126,7 +137,7 @@ const assignTableData = (data: any) => {
   }, 1000)
 }
 
-let filterdataobj: any = {}
+const filterdataobj = ref()
 const getSharedTableData = () => {
   const trackingData = JSON.parse(localStorage.getItem('searchData'))?.trackingData
   if (trackingData) {
@@ -145,7 +156,6 @@ const getSharedTableData = () => {
 // 获取表格数据
 const getTableData = async (isPageChange?: boolean) => {
   const rc = isPageChange ? pageInfo.value.total : -1
-  tableLoadingTableData.value = true
 
   if (
     sessionStorage.getItem('clickParams') != null &&
@@ -155,7 +165,7 @@ const getTableData = async (isPageChange?: boolean) => {
     assignTableData(data)
     nextTick(() => {
       tableRef.value && autoWidth(trackingTable.value, tableRef.value)
-      tableLoadingTableData.value = false
+      tableLoadingTable.value = false
       selectedNumber.value = 0
       selectedTableData.value = []
     })
@@ -166,7 +176,7 @@ const getTableData = async (isPageChange?: boolean) => {
         ps: pageInfo.value.pageSize,
         rc,
         other_filed: '',
-        ...filterdataobj
+        ...filterdataobj.value
       })
       .then((res: any) => {
         if (res.code === 200) {
@@ -176,7 +186,7 @@ const getTableData = async (isPageChange?: boolean) => {
       .finally(() => {
         nextTick(() => {
           tableRef.value && autoWidth(trackingTable.value, tableRef.value)
-          tableLoadingTableData.value = false
+          tableLoadingTable.value = false
         })
         selectedNumber.value = 0
         selectedTableData.value = []
@@ -185,8 +195,8 @@ const getTableData = async (isPageChange?: boolean) => {
 }
 
 // 查询列表数据
-const searchTableData = () => {
-  tableLoadingTableData.value = true
+const searchTableData = (data: any) => {
+  filterdataobj.value = data
   if (sessionStorage.getItem('TrackingData') != null) {
     const data = JSON.parse(sessionStorage.getItem('TrackingData') as string) || {}
     assignTableData(data)
@@ -195,7 +205,7 @@ const searchTableData = () => {
       selectedTableData.value = []
       nextTick(() => {
         tableRef.value && autoWidth(trackingTable.value, tableRef.value)
-        tableLoadingTableData.value = false
+        tableLoadingTable.value = false
         sessionStorage.removeItem('TrackingData')
       })
     }, 100)
@@ -389,7 +399,6 @@ const exportTable = (status: number) => {
 }
 
 const tableLoadingColumn = ref(false)
-const tableLoadingTableData = ref(false)
 
 const CustomizeColumnsRef = ref()
 // 打开定制表格弹窗
@@ -487,7 +496,7 @@ defineExpose({
 
     <vxe-grid
       ref="tableRef"
-      v-vloading="tableLoadingColumn || tableLoadingTableData"
+      v-vloading="tableLoadingColumn || tableLoadingTable"
       :height="props.height"
       :style="{ border: 'none' }"
       v-bind="trackingTable"
@@ -496,7 +505,7 @@ defineExpose({
       @checkbox-all="handleCheckAllChange"
     >
       <!-- 空数据时的插槽 -->
-      <template #empty v-if="!tableLoadingTableData && trackingTable.data.length === 0">
+      <template #empty v-if="!tableLoadingTable && trackingTable.data.length === 0">
         <VEmpty>
           <template #suggestion>
             <p>We support the following references number to find tracking:</p>