style: 调整Destination delivery部分样式

src/views/DestinationDelivery/src/components/TableView/src/TableView.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref, nextTick, onMounted } from 'vue'
 import { type VxeGridInstance, type VxeGridProps } from 'vxe-table'
-import { autoWidth } from '@/utils/table'
+// import { autoWidth } from '@/utils/table'
 import { useRowClickStyle } from '@/hooks/rowClickStyle'
 import dayjs from 'dayjs'
 import { formatTimezone, formatNumber } from '@/utils/tools'
@@ -66,8 +66,9 @@ const getTableColumns = async () => {
         { type: 'checkbox', width: 50, fixed: 'left' },
         ...handleColumns(res.data.OperationTableColumns)
       ]
+      console.log('tableData.value.columns', tableData.value.columns)
       const index = tableData.value.columns.findIndex((item: any) => item.title === 'Action')
-      if (index !== -1) {
+      if (index === -1) {
         tableData.value.columns.push({
           title: 'Action',
           fixed: 'right',
@@ -79,7 +80,7 @@ const getTableColumns = async () => {
     }
   })
   nextTick(() => {
-    tableRef.value && autoWidth(tableData.value, tableRef.value)
+    // tableRef.value && autoWidth(tableData.value, tableRef.value)
     tableLoadingColumn.value = false
     selectedTableData.value = []
   })
@@ -126,7 +127,7 @@ const getTableData = async (isPageChange?: boolean) => {
     .finally(() => {
       selectedTableData.value = []
       nextTick(() => {
-        tableRef.value && autoWidth(tableData.value, tableRef.value)
+        // tableRef.value && autoWidth(tableData.value, tableRef.value)
         tableLoadingTableData.value = false
       })
     })
@@ -149,16 +150,16 @@ const SearchOperationLog = (val: any) => {
     .finally(() => {
       selectedTableData.value = []
       nextTick(() => {
-        tableRef.value && autoWidth(tableData.value, tableRef.value)
+        // tableRef.value && autoWidth(tableData.value, tableRef.value)
         tableLoadingTableData.value = false
       })
     })
 }
 onMounted(() => {
   Promise.all([getTableColumns(), getTableData(false)]).finally(() => {
-    nextTick(() => {
-      tableRef.value && autoWidth(tableData.value, tableRef.value)
-    })
+    // nextTick(() => {
+    //   tableRef.value && autoWidth(tableData.value, tableRef.value)
+    // })
   })
 })
 
@@ -253,9 +254,9 @@ const handleCustomizeColumns = () => {
 // 定制表格
 const customizeColumns = async () => {
   await getTableColumns()
-  nextTick(() => {
-    tableRef.value && autoWidth(tableData.value, tableRef.value)
-  })
+  // nextTick(() => {
+  //   tableRef.value && autoWidth(tableData.value, tableRef.value)
+  // })
 }
 
 const tableLoadingColumn = ref(false)

src/views/DestinationDelivery/src/components/TableView/src/components/BookingDetailDialog.vue

@@ -51,6 +51,7 @@ defineExpose({
     :close-on-click-modal="false"
     width="1000px"
     top="10vh"
+    v-if="visible"
   >
     <DetailStep :stepList="stepList" />
     <div class="booking-info">

src/views/DestinationDelivery/src/components/TableView/src/components/EmailDialog.vue

@@ -180,6 +180,7 @@ defineExpose({
     :close-on-click-modal="false"
     width="1000px"
     top="15vh"
+    v-if="visible"
   >
     <div class="email-view">
       <div class="email-path">

src/views/DestinationDelivery/src/components/TableView/src/components/ShipmentInforTable.vue

@@ -25,6 +25,8 @@ const tableData = ref<VxeGridProps<any>>({
   rowConfig: { isHover: true }
 })
 
+const tableLoadingTable = ref()
+const tableLoadingColumn = ref(false)
 const handleColumns = (columns: any) => {
   const newColumns = columns.map((item: any) => {
     let curColumn: any = {
@@ -70,6 +72,7 @@ watch(
 const tableOriginColumnsField = ref()
 // 获取表格列
 const getTableColumns = async () => {
+  tableLoadingColumn.value = true
   await $api.getOperationTableColumns().then((res: any) => {
     if (res.code === 200) {
       tableData.value.columns = [
@@ -89,6 +92,9 @@ const getTableColumns = async () => {
       tableOriginColumnsField.value = res.data.OperationTableColumns
     }
   })
+  nextTick(() => {
+    tableLoadingColumn.value = false
+  })
 }
 let searchdata: any = {}
 // 获得表格数据后赋值
@@ -111,6 +117,7 @@ const assignTableData = (data: any) => {
 // 获取表格数据
 const getTableData = async () => {
   const rc = -1
+  tableLoadingTable.value = true
   await $api
     .SearchOperationLog({
       cp: 1,
@@ -123,6 +130,9 @@ const getTableData = async () => {
         assignTableData(res.data)
       }
     })
+    .finally(() => {
+      tableLoadingTable.value = false
+    })
 }
 
 onMounted(() => {
@@ -135,8 +145,14 @@ useRowClickStyle(tableRef)
 <template>
   <div class="shipment-infor-table">
     <div class="label">Shipment Information</div>
-    <vxe-grid ref="tableRef" v-bind="tableData" height="240">
-      <template #empty>
+    <vxe-grid
+      v-vloading="tableLoadingTable || tableLoadingColumn"
+      ref="tableRef"
+      v-bind="tableData"
+      max-height="240"
+      min-height="120"
+    >
+      <template #empty v-if="!tableLoadingTable && tableData.data.length === 0">
         <div class="empty">No data</div>
       </template>
     </vxe-grid>